# HG changeset patch # User daurnimator # Date 1396052710 14400 # Node ID 5956f4e69ab2e6d51764bbeb2df01fc3a2fee45e # Parent 6580e557cc618678ebb20012fabe7b4d354740ae plugins/muc/muc.lib: Subjects get sent even if empty. diff -r 6580e557cc61 -r 5956f4e69ab2 plugins/muc/muc.lib.lua --- a/plugins/muc/muc.lib.lua Fri Mar 28 18:47:35 2014 -0400 +++ b/plugins/muc/muc.lib.lua Fri Mar 28 20:25:10 2014 -0400 @@ -424,26 +424,21 @@ function room_mt:get_subject() return self._data['subject'], self._data['subject_from'] end -local function create_subject_message(subject) - return st.message({type='groupchat'}) +local function create_subject_message(from, subject) + return st.message({from = from; type = "groupchat"}) :tag('subject'):text(subject):up(); end function room_mt:send_subject(to) - local from, subject = self:get_subject() - if subject then - local msg = create_subject_message(subject) - msg.attr.from = from - msg.attr.to = to - self:route_stanza(msg); - end + local msg = create_subject_message(self:get_subject()); + msg.attr.to = to; + self:route_stanza(msg); end function room_mt:set_subject(current_nick, subject) if subject == "" then subject = nil; end self._data['subject'] = subject; self._data['subject_from'] = current_nick; if self.save then self:save(); end - local msg = create_subject_message(subject) - msg.attr.from = current_nick + local msg = create_subject_message(current_nick, subject); self:broadcast_message(msg, false); return true; end