prosody
b1f80447a2b1
core/rostermanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/rostermanager.lua @ 7779:b1f80447a2b1

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Fri, 09 Dec 2016 17:07:57 +0100
parent 7271:dae47cd774ac
parent 7777:65836cf2d057
child 7949:8acc35b5355a
comparison
equal deleted inserted replaced
7776:63f50a84318f 7779:b1f80447a2b1
232 end 232 end
233 local roster, err = load_roster(username, host); 233 local roster, err = load_roster(username, host);
234 local item = roster[jid]; 234 local item = roster[jid];
235 return item and (item.subscription == "from" or item.subscription == "both"), err; 235 return item and (item.subscription == "from" or item.subscription == "both"), err;
236 end 236 end
237 local function is_user_subscribed(username, host, jid)
238 do
239 local selfjid = username.."@"..host;
240 local user_subscription = _get_online_roster_subscription(selfjid, jid);
241 if user_subscription then return (user_subscription == "both" or user_subscription == "to"); end
242 local contact_subscription = _get_online_roster_subscription(jid, selfjid);
243 if contact_subscription then return (contact_subscription == "both" or contact_subscription == "from"); end
244 end
245 local roster, err = load_roster(username, host);
246 local item = roster[jid];
247 return item and (item.subscription == "to" or item.subscription == "both"), err;
248 end
237 249
238 function is_contact_pending_in(username, host, jid) 250 function is_contact_pending_in(username, host, jid)
239 local roster = load_roster(username, host); 251 local roster = load_roster(username, host);
240 return roster[false].pending[jid]; 252 return roster[false].pending[jid];
241 end 253 end
348 save_roster = save_roster; 360 save_roster = save_roster;
349 process_inbound_subscription_approval = process_inbound_subscription_approval; 361 process_inbound_subscription_approval = process_inbound_subscription_approval;
350 process_inbound_subscription_cancellation = process_inbound_subscription_cancellation; 362 process_inbound_subscription_cancellation = process_inbound_subscription_cancellation;
351 process_inbound_unsubscribe = process_inbound_unsubscribe; 363 process_inbound_unsubscribe = process_inbound_unsubscribe;
352 is_contact_subscribed = is_contact_subscribed; 364 is_contact_subscribed = is_contact_subscribed;
365 is_user_subscribed = is_user_subscribed;
353 is_contact_pending_in = is_contact_pending_in; 366 is_contact_pending_in = is_contact_pending_in;
354 set_contact_pending_in = set_contact_pending_in; 367 set_contact_pending_in = set_contact_pending_in;
355 is_contact_pending_out = is_contact_pending_out; 368 is_contact_pending_out = is_contact_pending_out;
356 set_contact_pending_out = set_contact_pending_out; 369 set_contact_pending_out = set_contact_pending_out;
357 unsubscribe = unsubscribe; 370 unsubscribe = unsubscribe;