diff options
| author | Matthew Wild <mwild1@gmail.com> | 2022-08-22 13:53:35 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2022-08-22 13:53:35 +0100 |
| commit | e4ed9a570ab61ef45ca0e63dfd6d230e26812749 (patch) | |
| tree | 361af05ddf1d012f9ce849528d36cfa83a0715ba /plugins/mod_announce.lua | |
| parent | b79cb49bfba1d64dda54cf7243154624c53b5fb9 (diff) | |
| parent | 227f6c033697210a54f671f5b9128cde8699fdcd (diff) | |
| download | prosody-e4ed9a570ab61ef45ca0e63dfd6d230e26812749.tar.gz prosody-e4ed9a570ab61ef45ca0e63dfd6d230e26812749.zip | |
Merge role-auth->trunk
Diffstat (limited to 'plugins/mod_announce.lua')
| -rw-r--r-- | plugins/mod_announce.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua index c742ebb8..8161d4ba 100644 --- a/plugins/mod_announce.lua +++ b/plugins/mod_announce.lua @@ -9,7 +9,6 @@ local st, jid = require "util.stanza", require "util.jid"; local hosts = prosody.hosts; -local is_admin = require "core.usermanager".is_admin; function send_to_online(message, host) local sessions; @@ -34,6 +33,7 @@ function send_to_online(message, host) return c; end +module:default_permission("prosody:admin", ":send-announcement"); -- Old <message>-based jabberd-style announcement sending function handle_announcement(event) @@ -45,8 +45,8 @@ function handle_announcement(event) return; -- Not an announcement end - if not is_admin(stanza.attr.from, host) then - -- Not an admin? Not allowed! + if not module:may(":send-announcement", event) then + -- Not allowed! module:log("warn", "Non-admin '%s' tried to send server announcement", stanza.attr.from); return; end |