murdle/fluxer
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(presence): custom status propagation (#55)

Browse Source
This commit is contained in:
hampus-fluxer 2026-01-06 05:55:06 +01:00 committed by GitHub
parent 1662839211
commit b4ed5456a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
fluxer_gateway/src/presence/presence.erl
View File

@ -110,6 +110,10 @@ handle_call({dispatch, EventAtom, Data}, _From, State) ->
false -> false ->
{reply, ok, State} {reply, ok, State}
end; end;
user_settings_update ->
NewState = handle_user_settings_update(Data, State),
FinalState = force_publish_global_presence(NewState),
{reply, ok, FinalState};
message_create -> message_create ->
HasMobile = lists:any( HasMobile = lists:any(
fun(Session) -> fun(Session) ->
@ -194,6 +198,10 @@ handle_cast({dispatch, Event, Data}, State) ->
false -> false ->
{noreply, State} {noreply, State}
end; end;
user_settings_update ->
NewState = handle_user_settings_update(Data, State),
FinalState = force_publish_global_presence(NewState),
{noreply, FinalState};
message_create -> message_create ->
HasMobile = lists:any( HasMobile = lists:any(
fun(Session) -> fun(Session) ->
@ -399,11 +407,25 @@ publish_global_if_needed({noreply, NewState}) ->
{noreply, FinalState}. {noreply, FinalState}.
publish_global_presence(_Sessions, State) -> publish_global_presence(_Sessions, State) ->
UserId = maps:get(user_id, State), {Payload, CurrentExternal, ExternalStatus} = build_presence_external(State),
LastPublished = maps:get(last_published_presence, State, undefined),
case presence_changed(LastPublished, CurrentExternal) of
true ->
publish_presence_payload(State, Payload, CurrentExternal, ExternalStatus);
false ->
State
end.
force_publish_global_presence(State) ->
{Payload, CurrentExternal, ExternalStatus} = build_presence_external(State),
publish_presence_payload(State, Payload, CurrentExternal, ExternalStatus).
build_presence_external(State) ->
Payload = build_presence_payload(State), Payload = build_presence_payload(State),
ExternalStatus = maps:get(<<"status">>, Payload), ExternalStatus = maps:get(<<"status">>, Payload, <<"offline">>),
Mobile = maps:get(<<"mobile">>, Payload), Mobile = maps:get(<<"mobile">>, Payload, false),
Afk = maps:get(<<"afk">>, Payload), Afk = maps:get(<<"afk">>, Payload, false),
CustomStatus = maps:get(<<"custom_status">>, Payload, null), CustomStatus = maps:get(<<"custom_status">>, Payload, null),
CurrentExternal = #{ CurrentExternal = #{
status => ExternalStatus, status => ExternalStatus,
@ -411,21 +433,18 @@ publish_global_presence(_Sessions, State) ->
afk => Afk, afk => Afk,
custom_status => CustomStatus custom_status => CustomStatus
}, },
LastPublished = maps:get(last_published_presence, State, undefined), {Payload, CurrentExternal, ExternalStatus}.
case presence_changed(LastPublished, CurrentExternal) of publish_presence_payload(State, Payload, CurrentExternal, ExternalStatus) ->
true -> UserId = maps:get(user_id, State),
case ExternalStatus of case ExternalStatus of
<<"offline">> -> <<"offline">> ->
presence_cache:delete(UserId); presence_cache:delete(UserId);
_ -> _ ->
presence_cache:put(UserId, Payload) presence_cache:put(UserId, Payload)
end, end,
presence_bus:publish(UserId, Payload), presence_bus:publish(UserId, Payload),
maps:put(last_published_presence, CurrentExternal, State); maps:put(last_published_presence, CurrentExternal, State).
false ->
State
end.
presence_changed(undefined, _Current) -> presence_changed(undefined, _Current) ->
true; true;
@ -724,6 +743,22 @@ custom_status_comparator(Map) when is_map(Map) ->
<<"emoji_name">> => field_or_null(Map, <<"emoji_name">>) <<"emoji_name">> => field_or_null(Map, <<"emoji_name">>)
}. }.
handle_user_settings_update(Data, State) ->
case maps:find(<<"custom_status">>, Data) of
error ->
State;
{ok, CustomStatus} ->
Normalized = normalize_state_custom_status(CustomStatus),
maps:put(custom_status, Normalized, State)
end.
normalize_state_custom_status(null) ->
null;
normalize_state_custom_status(Map) when is_map(Map) ->
Map;
normalize_state_custom_status(_) ->
null.
field_or_null(Map, Key) -> field_or_null(Map, Key) ->
case maps:get(Key, Map, undefined) of case maps:get(Key, Map, undefined) of
undefined -> null; undefined -> null;