Mercurial > prosody-hg
comparison plugins/muc/muc.lib.lua @ 8466:df970f76c720
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 09 Dec 2017 15:37:10 +0100 |
| parents | d43012448c1f 0ec72e67f797 |
| children | 7269313c1324 597c23e1c38e |
comparison
equal
deleted
inserted
replaced
| 8455:1d0862814bfc | 8466:df970f76c720 |
|---|---|
| 187 self:_route_stanza(msg); | 187 self:_route_stanza(msg); |
| 188 end | 188 end |
| 189 end | 189 end |
| 190 end | 190 end |
| 191 function room_mt:send_subject(to) | 191 function room_mt:send_subject(to) |
| 192 if self._data['subject'] then | 192 self:_route_stanza(st.message({type='groupchat', from=self._data['subject_from'] or self.jid, to=to}):tag("subject"):text(self._data['subject'])); |
| 193 self:_route_stanza(st.message({type='groupchat', from=self._data['subject_from'] or self.jid, to=to}):tag("subject"):text(self._data['subject'])); | |
| 194 end | |
| 195 end | 193 end |
| 196 | 194 |
| 197 function room_mt:get_disco_info(stanza) | 195 function room_mt:get_disco_info(stanza) |
| 198 local count = 0; for _ in pairs(self._occupants) do count = count + 1; end | 196 local count = 0; for _ in pairs(self._occupants) do count = count + 1; end |
| 199 local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#info") | 197 local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#info") |
