aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-07 18:53:30 +0200
committerKim Alvefur <zash@zash.se>2018-06-07 18:53:30 +0200
commitf491dbcf98c6273b6a59369cd530ed619746b432 (patch)
tree9e65233487da2cd2eec57e15590202fda13c539a
parent453b7c86a1d112bf2ff834cf2f83c89632a7b9ca (diff)
downloadprosody-f491dbcf98c6273b6a59369cd530ed619746b432.tar.gz
prosody-f491dbcf98c6273b6a59369cd530ed619746b432.zip
Backed out changeset cd186331ab1f (subject in disco#info)
Makes more sense if you must join the room to see the subject, since there?s a separate public description field.
-rw-r--r--plugins/muc/subject.lib.lua7
1 files changed, 0 insertions, 7 deletions
diff --git a/plugins/muc/subject.lib.lua b/plugins/muc/subject.lib.lua
index b842e777..14091d4e 100644
--- a/plugins/muc/subject.lib.lua
+++ b/plugins/muc/subject.lib.lua
@@ -73,13 +73,6 @@ local function set_subject(room, from, subject)
return true;
end
-module:hook("muc-disco#info", function (event)
- table.insert(event.form, {
- name = "muc#roominfo_subject";
- });
- event.formdata["muc#roominfo_subject"] = select(2, get_subject(event.room));
-end);
-
-- Send subject to joining user
module:hook("muc-occupant-session-new", function(event)
send_subject(event.room, event.stanza.attr.from);