aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-07-11 03:38:01 +0200
committerKim Alvefur <zash@zash.se>2018-07-11 03:38:01 +0200
commit51620914670b2e1ba45b8442af488a018e728614 (patch)
tree8e1874216e547a18742c5c45fedccd5c7fd9c501
parent85fa97aa78b008b3249db2e54a7833cf83079c79 (diff)
downloadprosody-51620914670b2e1ba45b8442af488a018e728614.tar.gz
prosody-51620914670b2e1ba45b8442af488a018e728614.zip
MUC: Allow an admin to recreate destroyed rooms
-rw-r--r--plugins/muc/mod_muc.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 7704adfe..cc0c675b 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -398,8 +398,8 @@ for event_name, method in pairs {
if room and room._data.destroyed then
if stanza.attr.type == nil and stanza.name == "presence" then
- if room._data.locked < os.time() then
- -- Allow the room to be recreated after time has passed
+ if is_admin(stanza.attr.from) or room._data.locked < os.time() then
+ -- Allow the room to be recreated by admin or after time has passed
delete_room(room);
room = nil;
else