Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-16 22:05:29 +02:00
Code Releases Activity

Fix last item message type as message attribute

Browse Source
This commit is contained in:
Christophe Romain 2015-12-16 17:04:45 +01:00
parent c8986ffa5e
commit 6957e892dd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mod_pubsub.erl
View File

@ -3254,7 +3254,6 @@ payload_xmlelements([_ | Tail], Count) ->
payload_xmlelements(Tail, Count).
items_event_stanza(Node, Options, Items) ->
NotificationType = get_option(Options, notification_type, headline),
MoreEls = case Items of
[LastItem] ->
{ModifNow, ModifUSR} = LastItem#pubsub_item.modification,
@ -3267,14 +3266,12 @@ items_event_stanza(Node, Options, Items) ->
_ ->
[]
end,
event_stanza_with_els([#xmlel{name = <<"items">>,
attrs = case NotificationType of
normal -> nodeAttr(Node);
_ -> [{<<"type">>, jlib:atom_to_binary(NotificationType)}
| nodeAttr(Node)]
end,
BaseStanza = event_stanza_with_els([#xmlel{name = <<"items">>,
attrs = nodeAttr(Node),
children = itemsEls(Items)}],
MoreEls).
MoreEls),
NotificationType = get_option(Options, notification_type, headline),
add_message_type(BaseStanza, NotificationType).
event_stanza(Els) ->
event_stanza_with_els(Els, []).