diff options
| author | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
| commit | 080d7974bf0c1da8a1c0578d67c3172facc9d719 (patch) | |
| tree | 838d6904e47ab8681928b37701ff4f1c6e89184a /plugins/mod_announce.lua | |
| parent | baff85a52c5fda705e8b3699410c770f015d89ab (diff) | |
| parent | c916ce76ee89dca32e7e653dff1ade4732462efc (diff) | |
| download | prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.tar.gz prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.zip | |
Merge 0.12->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 |