diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2009-11-26 13:06:52 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2009-11-26 13:06:52 +0500 |
| commit | d3aa2ff4e6469edb368f272bec11dff9658faaa4 (patch) | |
| tree | 92c34d551eee2a0f7b9fa8831508ce34faf1ec4d /plugins | |
| parent | b544f41cef7692b6d4672b9784637051131d03ad (diff) | |
| parent | 0554c71543ee4a199b056accac6a4bc1bc26d216 (diff) | |
| download | prosody-d3aa2ff4e6469edb368f272bec11dff9658faaa4.tar.gz prosody-d3aa2ff4e6469edb368f272bec11dff9658faaa4.zip | |
Merge with 0.6.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_presence.lua | 5 | ||||
| -rw-r--r-- | plugins/mod_roster.lua | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index cda8dab0..d3818a5d 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -200,9 +200,6 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_ rostermanager.roster_push(node, host, to_bare); end core_route_stanza(origin, stanza); - -- COMPAT: Some legacy clients keep displaying unsubscribed contacts as online unless an unavailable presence is sent: - send_presence_of_available_resources(node, host, to_bare, origin, core_route_stanza, - st.presence({ type="unavailable", from=from_bare, to=to_bare, id=stanza.attr.id })); end stanza.attr.from, stanza.attr.to = st_from, st_to; end @@ -233,7 +230,7 @@ function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_b -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) end else - core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- acknowledging receipt + core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- acknowledging receipt if not rostermanager.is_contact_pending_in(node, host, from_bare) then if rostermanager.set_contact_pending_in(node, host, from_bare) then sessionmanager.send_to_available_resources(node, host, stanza); diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua index 7ca22aa1..52c61a26 100644 --- a/plugins/mod_roster.lua +++ b/plugins/mod_roster.lua @@ -74,18 +74,20 @@ module:add_iq_handler("c2s", "jabber:iq:roster", if not resource and host then if jid ~= from_node.."@"..from_host then if item.attr.subscription == "remove" then - local r_item = session.roster[jid]; + local roster = session.roster; + local r_item = roster[jid]; if r_item then + local to_bare = node and (node.."@"..host) or host; -- bare JID + if r_item.subscription == "both" or r_item.subscription == "from" or (roster.pending and roster.pending[jid]) then + core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare})); + end + if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then + core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare})); + end local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid); if success then session.send(st.reply(stanza)); rm_roster_push(from_node, from_host, jid); - local to_bare = node and (node.."@"..host) or host; -- bare JID - if r_item.subscription == "both" or r_item.subscription == "from" then - core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare})); - elseif r_item.subscription == "both" or r_item.subscription == "to" then - core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare})); - end else session.send(st.error_reply(stanza, err_type, err_cond, err_msg)); end |