Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Fix support to retract a MUC room message

Browse Source 
Now this works as expected
https://xmpp.org/extensions/xep-0425.html#example-4
This commit is contained in:
Badlop 2023-08-07 12:32:36 +02:00
parent 7683691f5a
commit ff24700156
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod_mam.erl
View File

@ -354,11 +354,15 @@ remove_mam_for_user_with_peer(User, Server, Peer) ->
{error, <<"Invalid peer JID">>}
end.
-spec remove_message_from_archive(User :: binary(), Server :: binary(), StanzaId :: integer()) ->
-spec remove_message_from_archive(
User :: binary() | {User :: binary(), Host :: binary()},
Server :: binary(), StanzaId :: integer()) ->
ok | {error, binary()}.
remove_message_from_archive(User, Server, StanzaId) ->
remove_message_from_archive(User, Server, StanzaId) when is_binary(User) ->
remove_message_from_archive({User, Server}, Server, StanzaId);
remove_message_from_archive({User, Host}, Server, StanzaId) ->
Mod = gen_mod:db_mod(Server, ?MODULE),
case Mod:remove_from_archive(User, Server, StanzaId) of
case Mod:remove_from_archive(User, Host, StanzaId) of
ok ->
ok;
{error, Bin} when is_binary(Bin) ->

12
src/mod_muc_room.erl
View File

@ -1130,7 +1130,8 @@ process_groupchat_message(#message{from = From, lang = Lang} = Packet, StateData
-spec check_message_for_retractions(Packet :: message(), State :: state()) -> state().
check_message_for_retractions(Packet,
#state{config = Config, jid = JID, server_host = Server} = State) ->
#state{config = Config, room = Room, host = Host,
server_host = Server} = State) ->
case xmpp:get_subtag(Packet, #fasten_apply_to{}) of
#fasten_apply_to{id = ID} = F ->
case xmpp:get_subtag(F, #message_retract{}) of
@ -1140,8 +1141,7 @@ check_message_for_retractions(Packet,
{NewState, StanzaId} when is_integer(StanzaId) ->
case Config#config.mam of
true ->
JIDs = jid:encode(JID),
mod_mam:remove_message_from_archive(JIDs, Server, StanzaId),
mod_mam:remove_message_from_archive({Room, Host}, Server, StanzaId),
NewState;
_ ->
NewState
@ -5140,7 +5140,8 @@ process_iq_moderate(_From, #iq{type = get}, _ApplyTo, _Moderate, _StateData) ->
process_iq_moderate(From, #iq{type = set, lang = Lang},
#fasten_apply_to{id = Id},
#message_moderate{reason = Reason},
#state{config = Config, jid = JID, server_host = Server} = StateData) ->
#state{config = Config, room = Room, host = Host,
jid = JID, server_host = Server} = StateData) ->
FAffiliation = get_affiliation(From, StateData),
FRole = get_role(From, StateData),
IsModerator = FRole == moderator orelse FAffiliation == owner orelse
@ -5154,8 +5155,7 @@ process_iq_moderate(From, #iq{type = set, lang = Lang},
StanzaId ->
case Config#config.mam of
true ->
JIDs = jid:encode(JID),
mod_mam:remove_message_from_archive(JIDs, Server, StanzaId);
mod_mam:remove_message_from_archive({Room, Host}, Server, StanzaId);
_ ->
ok
end,