Mercurial > prosody-hg
comparison plugins/mod_presence.lua @ 7433:7eec6f3c7300
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 22 May 2016 14:39:14 +0200 |
| parents | 0c69305ab525 ad0b15f253ee |
| children | 893378a1c03e |
comparison
equal
deleted
inserted
replaced
| 7432:92f721226753 | 7433:7eec6f3c7300 |
|---|---|
| 176 if rostermanager.subscribed(node, host, to_bare) then | 176 if rostermanager.subscribed(node, host, to_bare) then |
| 177 rostermanager.roster_push(node, host, to_bare); | 177 rostermanager.roster_push(node, host, to_bare); |
| 178 end | 178 end |
| 179 core_post_stanza(origin, stanza); | 179 core_post_stanza(origin, stanza); |
| 180 send_presence_of_available_resources(node, host, to_bare, origin); | 180 send_presence_of_available_resources(node, host, to_bare, origin); |
| 181 core_post_stanza(origin, st.presence({ type = "probe", from = from_bare, to = to_bare })); | |
| 181 elseif stanza.attr.type == "unsubscribed" then | 182 elseif stanza.attr.type == "unsubscribed" then |
| 182 -- 1. send unavailable | 183 -- 1. send unavailable |
| 183 -- 2. route stanza | 184 -- 2. route stanza |
| 184 -- 3. roster push (subscription = from or both) | 185 -- 3. roster push (subscription = from or both) |
| 185 local success, pending_in, subscribed = rostermanager.unsubscribed(node, host, to_bare); | 186 local success, pending_in, subscribed = rostermanager.unsubscribed(node, host, to_bare); |
