When making mucsub message from mam archive check for subject
This commit is contained in:
parent
2e007f1607
commit
c5a06e9d06
|
@ -1174,7 +1174,7 @@ wrap_as_mucsub(Messages, #jid{lserver = LServer} = Requester) ->
|
||||||
wrap_as_mucsub(Message, Requester, ReqServer) ->
|
wrap_as_mucsub(Message, Requester, ReqServer) ->
|
||||||
case Message of
|
case Message of
|
||||||
#forwarded{delay = #delay{stamp = Stamp, desc = Desc},
|
#forwarded{delay = #delay{stamp = Stamp, desc = Desc},
|
||||||
sub_els = [#message{from = From, sub_els = SubEls} = Msg]} ->
|
sub_els = [#message{from = From, sub_els = SubEls, subject = Subject} = Msg]} ->
|
||||||
{L1, SubEls2} = case lists:keytake(mam_archived, 1, xmpp:decode(SubEls)) of
|
{L1, SubEls2} = case lists:keytake(mam_archived, 1, xmpp:decode(SubEls)) of
|
||||||
{value, Arch, Rest} ->
|
{value, Arch, Rest} ->
|
||||||
{[Arch#mam_archived{by = Requester}], Rest};
|
{[Arch#mam_archived{by = Requester}], Rest};
|
||||||
|
@ -1188,13 +1188,19 @@ wrap_as_mucsub(Message, Requester, ReqServer) ->
|
||||||
{p1_rand:get_string(), L1, SubEls2}
|
{p1_rand:get_string(), L1, SubEls2}
|
||||||
end,
|
end,
|
||||||
Msg2 = Msg#message{to = Requester, sub_els = SubEls3},
|
Msg2 = Msg#message{to = Requester, sub_els = SubEls3},
|
||||||
|
Node = case Subject of
|
||||||
|
[] ->
|
||||||
|
?NS_MUCSUB_NODES_MESSAGES;
|
||||||
|
_ ->
|
||||||
|
?NS_MUCSUB_NODES_SUBJECT
|
||||||
|
end,
|
||||||
#forwarded{delay = #delay{stamp = Stamp, desc = Desc, from = ReqServer},
|
#forwarded{delay = #delay{stamp = Stamp, desc = Desc, from = ReqServer},
|
||||||
sub_els = [
|
sub_els = [
|
||||||
#message{from = jid:remove_resource(From), to = Requester,
|
#message{from = jid:remove_resource(From), to = Requester,
|
||||||
id = Sid,
|
id = Sid,
|
||||||
sub_els = [#ps_event{
|
sub_els = [#ps_event{
|
||||||
items = #ps_items{
|
items = #ps_items{
|
||||||
node = ?NS_MUCSUB_NODES_MESSAGES,
|
node = Node,
|
||||||
items = [#ps_item{
|
items = [#ps_item{
|
||||||
id = Sid,
|
id = Sid,
|
||||||
sub_els = [Msg2]
|
sub_els = [Msg2]
|
||||||
|
|
Loading…
Reference in New Issue