Comparison

plugins/mod_pep_simple.lua @ 10434:8f709577fe8e

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Nov 2019 23:12:01 +0100
parent 10111:0f335815244f
child 10555:f73947a9bd8c
comparison
equal deleted inserted replaced
10433:7777f25d5266 10434:8f709577fe8e
12 local st = require "util.stanza"; 12 local st = require "util.stanza";
13 local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed; 13 local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
14 local pairs = pairs; 14 local pairs = pairs;
15 local next = next; 15 local next = next;
16 local type = type; 16 local type = type;
17 local unpack = table.unpack or unpack; -- luacheck: ignore 113
17 local calculate_hash = require "util.caps".calculate_hash; 18 local calculate_hash = require "util.caps".calculate_hash;
18 local core_post_stanza = prosody.core_post_stanza; 19 local core_post_stanza = prosody.core_post_stanza;
19 local bare_sessions = prosody.bare_sessions; 20 local bare_sessions = prosody.bare_sessions;
20 21
21 local xmlns_pubsub = "http://jabber.org/protocol/pubsub"; 22 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
227 session.send(st.error_reply(stanza, 'cancel', 'item-not-found')); 228 session.send(st.error_reply(stanza, 'cancel', 'item-not-found'));
228 module:log("debug", "Item '%s' not found", node) 229 module:log("debug", "Item '%s' not found", node)
229 return true; 230 return true;
230 else --invalid request 231 else --invalid request
231 session.send(st.error_reply(stanza, 'modify', 'bad-request')); 232 session.send(st.error_reply(stanza, 'modify', 'bad-request'));
232 module:log("debug", "Invalid request: %s", tostring(payload)); 233 module:log("debug", "Invalid request: %s", payload);
233 return true; 234 return true;
234 end 235 end
235 else --no presence subscription 236 else --no presence subscription
236 session.send(st.error_reply(stanza, 'auth', 'not-authorized') 237 session.send(st.error_reply(stanza, 'auth', 'not-authorized')
237 :tag('presence-subscription-required', {xmlns='http://jabber.org/protocol/pubsub#errors'})); 238 :tag('presence-subscription-required', {xmlns='http://jabber.org/protocol/pubsub#errors'}));
238 module:log("debug", "Unauthorized request: %s", tostring(payload)); 239 module:log("debug", "Unauthorized request: %s", payload);
239 return true; 240 return true;
240 end 241 end
241 end 242 end
242 end); 243 end);
243 244