Mercurial > prosody-hg
comparison plugins/muc/muc.lib.lua @ 5854:16a2bb97c5f5
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Oct 2013 12:15:25 -0400 |
| parents | 026367992a0f 3ee3d79db18c |
| children | 2d5685c6262f |
comparison
equal
deleted
inserted
replaced
| 5850:e8c743f4213f | 5854:16a2bb97c5f5 |
|---|---|
| 200 :tag("feature", {var=self:get_persistent() and "muc_persistent" or "muc_temporary"}):up() | 200 :tag("feature", {var=self:get_persistent() and "muc_persistent" or "muc_temporary"}):up() |
| 201 :tag("feature", {var=self:get_hidden() and "muc_hidden" or "muc_public"}):up() | 201 :tag("feature", {var=self:get_hidden() and "muc_hidden" or "muc_public"}):up() |
| 202 :tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up() | 202 :tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up() |
| 203 :add_child(dataform.new({ | 203 :add_child(dataform.new({ |
| 204 { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" }, | 204 { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" }, |
| 205 { name = "muc#roominfo_description", label = "Description"}, | 205 { name = "muc#roominfo_description", label = "Description", value = "" }, |
| 206 { name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) } | 206 { name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) } |
| 207 }):form({["muc#roominfo_description"] = self:get_description()}, 'result')) | 207 }):form({["muc#roominfo_description"] = self:get_description()}, 'result')) |
| 208 ; | 208 ; |
| 209 end | 209 end |
| 210 function room_mt:get_disco_items(stanza) | 210 function room_mt:get_disco_items(stanza) |
