giles
086c576d48
Some checks failed
Test, Build, and Deploy / test-build-deploy (push) Failing after 44s
New next/kernel/delivery.erl computes the audience-resolved
deduplicated recipient list for an outbound activity.
delivery_set/2(Activity, KernelState)
delivery_set/3(Activity, KernelState, FollowerGraph)
Returns a deduplicated list of ActorId atoms. Step 8 will
resolve each entry to {PeerInstanceUrl, ActorId} via the
peer-actors cache.
Sources unioned then deduped:
- :to field (single ActorId or list, atoms or audience symbols)
- :cc field (same shape)
- audience-symbol expansion:
followers -> sender's followers from follower_graph
public -> [] for v2 (Step 7b layers known-peer-instance set)
Self-delivery suppressed every time the sender's ActorId appears
in the set.
Module lives in its own file (not inside outbox.erl) so Step 8's
delivery-queue gen_server has a clean home alongside it.
17/17 in next/tests/delivery_set.sh covering:
- empty activity -> []
- single :to atom + list :to recipients
- :to + :cc unioned
- self-suppression
- duplicate / cross-field dedup
- followers symbol expands via follower_graph state
- empty follower-graph -> []
- public v2 placeholder -> []
- mixed explicit + followers
- collect_recipients raw flat
- suppress_self drops every match
- dedup preserves first-occurrence order
- expand_audience pass-through for plain ActorId
Conformance 761/761. 86/86 across 6 Step-7-adjacent suites
(follower_graph, follow_lifecycle, auto_accept, inbox,
nx_kernel_multi, outbox_publish).
85 lines
2.8 KiB
Erlang
85 lines
2.8 KiB
Erlang
-module(delivery).
|
|
-export([delivery_set/2, delivery_set/3,
|
|
collect_recipients/1, suppress_self/2, dedup/1,
|
|
expand_audience/3]).
|
|
|
|
%% Audience-resolving delivery set computation per design §13.4.
|
|
%%
|
|
%% delivery_set/2(Activity, KernelState) returns a sorted, deduped
|
|
%% list of ActorId atoms — every actor the outgoing Activity needs
|
|
%% to be POSTed to. Sources:
|
|
%% - Activity's `:to` field (single ActorId or list)
|
|
%% - Activity's `:cc` field (single ActorId or list)
|
|
%% - audience-symbol expansion of `public` and `followers`
|
|
%%
|
|
%% Self-delivery (the publishing actor reading their own activity
|
|
%% on a peer's behalf) is suppressed.
|
|
%%
|
|
%% Output for Step 7a is the bare ActorId list; Step 8 will resolve
|
|
%% each entry to `{PeerInstanceUrl, ActorId}` via the peer-actors
|
|
%% cache.
|
|
|
|
delivery_set(Activity, KernelState) ->
|
|
delivery_set(Activity, KernelState, follower_graph:new()).
|
|
|
|
delivery_set(Activity, KernelState, FollowerGraph) ->
|
|
Self = sender(Activity),
|
|
Raw = collect_recipients(Activity),
|
|
Expanded = expand_all(Raw, Self, KernelState, FollowerGraph),
|
|
Suppressed = suppress_self(Expanded, Self),
|
|
dedup(Suppressed).
|
|
|
|
%% collect_recipients/1 — flat list from :to + :cc, normalised so
|
|
%% each element is either an ActorId atom or an audience symbol
|
|
%% (`public` / `followers`).
|
|
|
|
collect_recipients(Activity) ->
|
|
To = envelope_field_list(to, Activity),
|
|
Cc = envelope_field_list(cc, Activity),
|
|
To ++ Cc.
|
|
|
|
envelope_field_list(Field, Activity) ->
|
|
case envelope:get_field(Field, Activity) of
|
|
not_found -> [];
|
|
{ok, V} when is_list(V) -> V;
|
|
{ok, V} -> [V]
|
|
end.
|
|
|
|
%% expand_audience/3 — Step 7b. `followers` -> the sender's
|
|
%% followers proplist entry from a follower_graph state.
|
|
%% `public` for v2 expands to []. Step 7c layers a peer-instance
|
|
%% known-set on top for real Public delivery. Other symbols /
|
|
%% explicit ActorIds pass through unchanged.
|
|
|
|
expand_audience(public, _Sender, _Graph) -> [];
|
|
expand_audience(followers, Sender, Graph) ->
|
|
follower_graph:followers(Sender, Graph);
|
|
expand_audience(X, _Sender, _Graph) -> [X].
|
|
|
|
expand_all([], _Self, _State, _Graph) -> [];
|
|
expand_all([X | Rest], Self, State, Graph) ->
|
|
expand_audience(X, Self, Graph) ++ expand_all(Rest, Self, State, Graph).
|
|
|
|
suppress_self([], _Self) -> [];
|
|
suppress_self([Self | Rest], Self) -> suppress_self(Rest, Self);
|
|
suppress_self([X | Rest], Self) -> [X | suppress_self(Rest, Self)].
|
|
|
|
dedup(L) -> dedup_acc(L, []).
|
|
|
|
dedup_acc([], Acc) -> Acc;
|
|
dedup_acc([X | Rest], Acc) ->
|
|
case contains(X, Acc) of
|
|
true -> dedup_acc(Rest, Acc);
|
|
false -> dedup_acc(Rest, Acc ++ [X])
|
|
end.
|
|
|
|
contains(_, []) -> false;
|
|
contains(X, [X | _]) -> true;
|
|
contains(X, [_ | Rest]) -> contains(X, Rest).
|
|
|
|
sender(Activity) ->
|
|
case envelope:get_field(actor, Activity) of
|
|
{ok, A} -> A;
|
|
_ -> nil
|
|
end.
|