Software / code / prosody
Annotate
plugins/muc/muc.lib.lua @ 8839:dcd53a565c01
MUC: Handle setting default history messages when history length is unset (thanks tmolitor)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 May 2018 22:33:22 +0200 |
| parent | 8838:6d4b0895f76d |
| child | 8842:463505cc75d5 |
| rev | line source |
|---|---|
| 1734 | 1 -- Prosody IM |
|
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2864
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
|
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2864
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
|
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5681
diff
changeset
|
4 -- |
| 1734 | 5 -- This project is MIT/X11 licensed. Please see the |
| 6 -- COPYING file in the source package for more information. | |
| 7 -- | |
| 8 | |
|
3281
fd6ab269ecc2
MUC: A little modification to improve code analysis.
Waqas Hussain <waqas20@gmail.com>
parents:
3280
diff
changeset
|
9 local select = select; |
|
fd6ab269ecc2
MUC: A little modification to improve code analysis.
Waqas Hussain <waqas20@gmail.com>
parents:
3280
diff
changeset
|
10 local pairs, ipairs = pairs, ipairs; |
|
fd6ab269ecc2
MUC: A little modification to improve code analysis.
Waqas Hussain <waqas20@gmail.com>
parents:
3280
diff
changeset
|
11 |
| 1734 | 12 local datetime = require "util.datetime"; |
| 13 | |
|
3517
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
14 local dataform = require "util.dataforms"; |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
15 |
| 1734 | 16 local jid_split = require "util.jid".split; |
| 17 local jid_bare = require "util.jid".bare; | |
|
1862
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1826
diff
changeset
|
18 local jid_prep = require "util.jid".prep; |
| 1734 | 19 local st = require "util.stanza"; |
| 20 local log = require "util.logger".init("mod_muc"); | |
| 21 local t_insert, t_remove = table.insert, table.remove; | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
22 local setmetatable = setmetatable; |
|
1778
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
23 local base64 = require "util.encodings".base64; |
|
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
24 local md5 = require "util.hashes".md5; |
| 1734 | 25 |
| 26 local muc_domain = nil; --module:get_host(); | |
|
5195
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
27 local default_history_length, max_history_length = 20, math.huge; |
| 1734 | 28 |
| 29 ------------ | |
|
5612
5404832d6f7a
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5611
diff
changeset
|
30 local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true}; |
|
5404832d6f7a
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5611
diff
changeset
|
31 local function presence_filter(tag) |
|
5404832d6f7a
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5611
diff
changeset
|
32 if presence_filters[tag.attr.xmlns] then |
|
5404832d6f7a
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5611
diff
changeset
|
33 return nil; |
| 1734 | 34 end |
|
5612
5404832d6f7a
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5611
diff
changeset
|
35 return tag; |
| 1734 | 36 end |
|
5612
5404832d6f7a
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5611
diff
changeset
|
37 |
| 1734 | 38 local function get_filtered_presence(stanza) |
|
5612
5404832d6f7a
mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5611
diff
changeset
|
39 return st.clone(stanza):maptags(presence_filter); |
| 1734 | 40 end |
| 41 local kickable_error_conditions = { | |
| 42 ["gone"] = true; | |
| 43 ["internal-server-error"] = true; | |
| 44 ["item-not-found"] = true; | |
| 45 ["jid-malformed"] = true; | |
| 46 ["recipient-unavailable"] = true; | |
| 47 ["redirect"] = true; | |
| 48 ["remote-server-not-found"] = true; | |
| 49 ["remote-server-timeout"] = true; | |
| 50 ["service-unavailable"] = true; | |
|
1999
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
51 ["malformed error"] = true; |
| 1734 | 52 }; |
|
2527
3fe3dbb27b6f
MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/)
Matthew Wild <mwild1@gmail.com>
parents:
2504
diff
changeset
|
53 |
|
1999
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
54 local function get_error_condition(stanza) |
|
2527
3fe3dbb27b6f
MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/)
Matthew Wild <mwild1@gmail.com>
parents:
2504
diff
changeset
|
55 local _, condition = stanza:get_error(); |
|
3fe3dbb27b6f
MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/)
Matthew Wild <mwild1@gmail.com>
parents:
2504
diff
changeset
|
56 return condition or "malformed error"; |
|
1999
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
57 end |
|
2527
3fe3dbb27b6f
MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/)
Matthew Wild <mwild1@gmail.com>
parents:
2504
diff
changeset
|
58 |
|
1999
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
59 local function is_kickable_error(stanza) |
|
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
60 local cond = get_error_condition(stanza); |
|
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
61 return kickable_error_conditions[cond] and cond; |
| 1734 | 62 end |
| 63 ----------- | |
| 64 | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
65 local room_mt = {}; |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
66 room_mt.__index = room_mt; |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
67 |
|
5519
06e188268df1
MUC: add __tostring on room metatable
Matthew Wild <mwild1@gmail.com>
parents:
5397
diff
changeset
|
68 function room_mt:__tostring() |
|
06e188268df1
MUC: add __tostring on room metatable
Matthew Wild <mwild1@gmail.com>
parents:
5397
diff
changeset
|
69 return "MUC room ("..self.jid..")"; |
|
06e188268df1
MUC: add __tostring on room metatable
Matthew Wild <mwild1@gmail.com>
parents:
5397
diff
changeset
|
70 end |
|
06e188268df1
MUC: add __tostring on room metatable
Matthew Wild <mwild1@gmail.com>
parents:
5397
diff
changeset
|
71 |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
72 function room_mt:get_default_role(affiliation) |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
73 if affiliation == "owner" or affiliation == "admin" then |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
74 return "moderator"; |
|
3251
f2f9fe088f6e
MUC: Updated room:get_default_role() to assign unaffiliated occupants a "visitor" role in moderated rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3250
diff
changeset
|
75 elseif affiliation == "member" then |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
76 return "participant"; |
|
3251
f2f9fe088f6e
MUC: Updated room:get_default_role() to assign unaffiliated occupants a "visitor" role in moderated rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3250
diff
changeset
|
77 elseif not affiliation then |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
78 if not self:get_members_only() then |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
79 return self:get_moderated() and "visitor" or "participant"; |
|
3255
6bffb5c63131
MUC: Updated room:get_default_role() to not assign unaffiliated occupants a role in members-only rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3254
diff
changeset
|
80 end |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
81 end |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
82 end |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
83 |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
84 function room_mt:broadcast_presence(stanza, sid, code, nick) |
| 1734 | 85 stanza = get_filtered_presence(stanza); |
|
1825
f67e4bfc62f1
MUC: Renamed a variable name.
Waqas Hussain <waqas20@gmail.com>
parents:
1824
diff
changeset
|
86 local occupant = self._occupants[stanza.attr.from]; |
| 1734 | 87 stanza:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) |
|
2053
f5a198127dd3
MUC: Fixed: affiliation='none' was omitted from some presence broadcasts.
Waqas Hussain <waqas20@gmail.com>
parents:
2051
diff
changeset
|
88 :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none", nick=nick}):up(); |
| 1734 | 89 if code then |
| 90 stanza:tag("status", {code=code}):up(); | |
| 91 end | |
|
1824
8e66c9d09f81
MUC: Refactored to remove some duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
1819
diff
changeset
|
92 self:broadcast_except_nick(stanza, stanza.attr.from); |
|
8e66c9d09f81
MUC: Refactored to remove some duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
1819
diff
changeset
|
93 local me = self._occupants[stanza.attr.from]; |
| 1734 | 94 if me then |
|
3590
dcc5f3402f5b
MUC: Added a missing :up() to the stanza building for presence broadcast (thanks Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3580
diff
changeset
|
95 stanza:tag("status", {code='110'}):up(); |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
96 stanza.attr.to = sid; |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
97 self:_route_stanza(stanza); |
| 1734 | 98 end |
| 99 end | |
|
1736
98f833669d7f
MUC: Fixed function declarations.
Waqas Hussain <waqas20@gmail.com>
parents:
1735
diff
changeset
|
100 function room_mt:broadcast_message(stanza, historic) |
|
2172
84dd0fada45b
MUC: Improved handling of incoming groupchat messages (state preserved for possible later use).
Waqas Hussain <waqas20@gmail.com>
parents:
2064
diff
changeset
|
101 local to = stanza.attr.to; |
|
8476
082d12728645
MUC: Rename variable to make it clearer that it is the room JID and not the MUC host
Kim Alvefur <zash@zash.se>
parents:
8475
diff
changeset
|
102 local room_jid = self.jid; |
|
8475
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
103 |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
104 stanza:maptags(function (child) |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
105 if child.name == "delay" and child.attr["xmlns"] == "urn:xmpp:delay" then |
|
8476
082d12728645
MUC: Rename variable to make it clearer that it is the room JID and not the MUC host
Kim Alvefur <zash@zash.se>
parents:
8475
diff
changeset
|
106 if child.attr["from"] == room_jid then |
|
8475
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
107 return nil; |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
108 end |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
109 end |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
110 if child.name == "x" and child.attr["xmlns"] == "jabber:x:delay" then |
|
8476
082d12728645
MUC: Rename variable to make it clearer that it is the room JID and not the MUC host
Kim Alvefur <zash@zash.se>
parents:
8475
diff
changeset
|
111 if child.attr["from"] == room_jid then |
|
8475
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
112 return nil; |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
113 end |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
114 end |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
115 return child; |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
116 end) |
|
eb85b10e1fea
MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)
Jonas Wielicki <jonas@wielicki.name>
parents:
8474
diff
changeset
|
117 |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
118 for occupant, o_data in pairs(self._occupants) do |
| 1734 | 119 for jid in pairs(o_data.sessions) do |
| 120 stanza.attr.to = jid; | |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
121 self:_route_stanza(stanza); |
| 1734 | 122 end |
| 123 end | |
|
2172
84dd0fada45b
MUC: Improved handling of incoming groupchat messages (state preserved for possible later use).
Waqas Hussain <waqas20@gmail.com>
parents:
2064
diff
changeset
|
124 stanza.attr.to = to; |
| 1734 | 125 if historic then -- add to history |
|
5982
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
126 return self:save_to_history(stanza) |
| 1734 | 127 end |
| 128 end | |
|
5982
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
129 function room_mt:save_to_history(stanza) |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
130 local history = self._data['history']; |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
131 if not history then history = {}; self._data['history'] = history; end |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
132 stanza = st.clone(stanza); |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
133 stanza.attr.to = ""; |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
134 local stamp = datetime.datetime(); |
| 8477 | 135 stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = self.jid, stamp = stamp}):up(); -- XEP-0203 |
| 136 stanza:tag("x", {xmlns = "jabber:x:delay", from = self.jid, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated) | |
|
5982
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
137 local entry = { stanza = stanza, stamp = stamp }; |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
138 t_insert(history, entry); |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
139 while #history > (self._data.history_length or default_history_length) do t_remove(history, 1) end |
|
2d5685c6262f
MUC: Split saving to history into a separate method
Kim Alvefur <zash@zash.se>
parents:
5854
diff
changeset
|
140 end |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
141 function room_mt:broadcast_except_nick(stanza, nick) |
|
1751
55ee6e792e3e
MUC: Fixed a variable scoping bug causing problems with presence routing on affiliation/role change.
Waqas Hussain <waqas20@gmail.com>
parents:
1750
diff
changeset
|
142 for rnick, occupant in pairs(self._occupants) do |
|
55ee6e792e3e
MUC: Fixed a variable scoping bug causing problems with presence routing on affiliation/role change.
Waqas Hussain <waqas20@gmail.com>
parents:
1750
diff
changeset
|
143 if rnick ~= nick then |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
144 for jid in pairs(occupant.sessions) do |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
145 stanza.attr.to = jid; |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
146 self:_route_stanza(stanza); |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
147 end |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
148 end |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
149 end |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
150 end |
| 1734 | 151 |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
152 function room_mt:send_occupant_list(to) |
|
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
153 local current_nick = self._jid_nick[to]; |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
154 for occupant, o_data in pairs(self._occupants) do |
| 1734 | 155 if occupant ~= current_nick then |
| 156 local pres = get_filtered_presence(o_data.sessions[o_data.jid]); | |
| 157 pres.attr.to, pres.attr.from = to, occupant; | |
| 158 pres:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) | |
|
2053
f5a198127dd3
MUC: Fixed: affiliation='none' was omitted from some presence broadcasts.
Waqas Hussain <waqas20@gmail.com>
parents:
2051
diff
changeset
|
159 :tag("item", {affiliation=o_data.affiliation or "none", role=o_data.role or "none"}):up(); |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
160 self:_route_stanza(pres); |
| 1734 | 161 end |
| 162 end | |
| 163 end | |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
164 function room_mt:send_history(to, stanza) |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
165 local history = self._data['history']; -- send discussion history |
| 1734 | 166 if history then |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
167 local x_tag = stanza and stanza:get_child("x", "http://jabber.org/protocol/muc"); |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
168 local history_tag = x_tag and x_tag:get_child("history", "http://jabber.org/protocol/muc"); |
|
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5681
diff
changeset
|
169 |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
170 local maxchars = history_tag and tonumber(history_tag.attr.maxchars); |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
171 if maxchars then maxchars = math.floor(maxchars); end |
|
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5681
diff
changeset
|
172 |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
173 local maxstanzas = math.floor(history_tag and tonumber(history_tag.attr.maxstanzas) or #history); |
|
8793
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
174 if not history_tag then maxstanzas = self._data.default_history_messages; end |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
175 |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
176 local seconds = history_tag and tonumber(history_tag.attr.seconds); |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
177 if seconds then seconds = datetime.datetime(os.time() - math.floor(seconds)); end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
178 |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
179 local since = history_tag and history_tag.attr.since; |
|
3516
de54a7ab7e6e
MUC: fix timezone support when sending history
Kim Alvefur <zash@zash.se>
parents:
3510
diff
changeset
|
180 if since then since = datetime.parse(since); since = since and datetime.datetime(since); end |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
181 if seconds and (not since or since < seconds) then since = seconds; end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
182 |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
183 local n = 0; |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
184 local charcount = 0; |
|
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5681
diff
changeset
|
185 |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
186 for i=#history,1,-1 do |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
187 local entry = history[i]; |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
188 if maxchars then |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
189 if not entry.chars then |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
190 entry.stanza.attr.to = ""; |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
191 entry.chars = #tostring(entry.stanza); |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
192 end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
193 charcount = charcount + entry.chars + #to; |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
194 if charcount > maxchars then break; end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
195 end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
196 if since and since > entry.stamp then break; end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
197 if n + 1 > maxstanzas then break; end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
198 n = n + 1; |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
199 end |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
200 for i=#history-n+1,#history do |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
201 local msg = history[i].stanza; |
|
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
202 msg.attr.to = to; |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
203 self:_route_stanza(msg); |
| 1734 | 204 end |
| 205 end | |
|
5983
930109558aa2
MUC: Split out sending of the topic into method separate from sending history
Kim Alvefur <zash@zash.se>
parents:
5982
diff
changeset
|
206 end |
|
930109558aa2
MUC: Split out sending of the topic into method separate from sending history
Kim Alvefur <zash@zash.se>
parents:
5982
diff
changeset
|
207 function room_mt:send_subject(to) |
|
8465
0ec72e67f797
MUC: Always send subject message, even if it is empty (fixes #1053)
Kim Alvefur <zash@zash.se>
parents:
7383
diff
changeset
|
208 self:_route_stanza(st.message({type='groupchat', from=self._data['subject_from'] or self.jid, to=to}):tag("subject"):text(self._data['subject'])); |
| 1734 | 209 end |
| 210 | |
|
2503
bb6b0bd7f2cf
MUC: Converted some local functions into methods.
Waqas Hussain <waqas20@gmail.com>
parents:
2416
diff
changeset
|
211 function room_mt:get_disco_info(stanza) |
|
4266
513485a11b85
MUC: Include occupant count in room disco#info response.
Waqas Hussain <waqas20@gmail.com>
parents:
4202
diff
changeset
|
212 local count = 0; for _ in pairs(self._occupants) do count = count + 1; end |
|
7118
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
213 local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#info") |
|
3507
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
214 :tag("identity", {category="conference", type="text", name=self:get_name()}):up() |
|
3246
3371419eb0e1
MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set).
Waqas Hussain <waqas20@gmail.com>
parents:
3245
diff
changeset
|
215 :tag("feature", {var="http://jabber.org/protocol/muc"}):up() |
|
8588
54b60a1eea2d
MUC: send muc#stanza_id feature as per XEP-0045 v1.31 (fixes #1097)
Jonas Wielicki <jonas@wielicki.name>
parents:
8476
diff
changeset
|
216 :tag("feature", {var="http://jabber.org/protocol/muc#stable_id"}):up() |
|
3246
3371419eb0e1
MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set).
Waqas Hussain <waqas20@gmail.com>
parents:
3245
diff
changeset
|
217 :tag("feature", {var=self:get_password() and "muc_passwordprotected" or "muc_unsecured"}):up() |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
218 :tag("feature", {var=self:get_moderated() and "muc_moderated" or "muc_unmoderated"}):up() |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
219 :tag("feature", {var=self:get_members_only() and "muc_membersonly" or "muc_open"}):up() |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
220 :tag("feature", {var=self:get_persistent() and "muc_persistent" or "muc_temporary"}):up() |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
221 :tag("feature", {var=self:get_hidden() and "muc_hidden" or "muc_public"}):up() |
|
3264
e1c787c6f86e
MUC: Added disco#info features to advertise room's anonymity status (muc_semianonymous or muc_nonanonymous).
Waqas Hussain <waqas20@gmail.com>
parents:
3263
diff
changeset
|
222 :tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up() |
|
3246
3371419eb0e1
MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set).
Waqas Hussain <waqas20@gmail.com>
parents:
3245
diff
changeset
|
223 ; |
|
7118
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
224 local dataform = dataform.new({ |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
225 { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" }, |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
226 { name = "muc#roominfo_description", label = "Description", value = "" }, |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
227 { name = "muc#roominfo_occupants", label = "Number of occupants", value = "" } |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
228 }); |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
229 local formdata = { |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
230 ["muc#roominfo_description"] = self:get_description(), |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
231 ["muc#roominfo_occupants"] = tostring(count), |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
232 }; |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
233 module:fire_event("muc-disco#info", { room = self, reply = reply, form = dataform, formdata = formdata }); |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
234 reply:add_child(dataform:form(formdata, 'result')) |
|
dacc07833b86
MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply
Kim Alvefur <zash@zash.se>
parents:
7012
diff
changeset
|
235 return reply; |
|
1756
b2291156a9c2
MUC: Added service discovery replies for rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1755
diff
changeset
|
236 end |
|
2503
bb6b0bd7f2cf
MUC: Converted some local functions into methods.
Waqas Hussain <waqas20@gmail.com>
parents:
2416
diff
changeset
|
237 function room_mt:get_disco_items(stanza) |
|
2035
b8c3dbf76a2e
MUC: List occupants in a room's disco#items response.
Waqas Hussain <waqas20@gmail.com>
parents:
2008
diff
changeset
|
238 local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items"); |
|
b8c3dbf76a2e
MUC: List occupants in a room's disco#items response.
Waqas Hussain <waqas20@gmail.com>
parents:
2008
diff
changeset
|
239 for room_jid in pairs(self._occupants) do |
|
b8c3dbf76a2e
MUC: List occupants in a room's disco#items response.
Waqas Hussain <waqas20@gmail.com>
parents:
2008
diff
changeset
|
240 reply:tag("item", {jid = room_jid, name = room_jid:match("/(.*)")}):up(); |
|
b8c3dbf76a2e
MUC: List occupants in a room's disco#items response.
Waqas Hussain <waqas20@gmail.com>
parents:
2008
diff
changeset
|
241 end |
|
b8c3dbf76a2e
MUC: List occupants in a room's disco#items response.
Waqas Hussain <waqas20@gmail.com>
parents:
2008
diff
changeset
|
242 return reply; |
|
1756
b2291156a9c2
MUC: Added service discovery replies for rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1755
diff
changeset
|
243 end |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
244 function room_mt:set_subject(current_nick, subject) |
| 1734 | 245 if subject == "" then subject = nil; end |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
246 self._data['subject'] = subject; |
|
3393
5b8de0731c4d
MUC: Store the nick (full room JID) which set the subject, and send subject to occupants from that JID.
Waqas Hussain <waqas20@gmail.com>
parents:
3361
diff
changeset
|
247 self._data['subject_from'] = current_nick; |
|
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
248 if self.save then self:save(); end |
| 1734 | 249 local msg = st.message({type='groupchat', from=current_nick}) |
| 250 :tag('subject'):text(subject):up(); | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
251 self:broadcast_message(msg, false); |
| 1734 | 252 return true; |
| 253 end | |
| 254 | |
|
2529
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
255 local function build_unavailable_presence_from_error(stanza) |
|
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
256 local type, condition, text = stanza:get_error(); |
|
3506
0f46acca11cc
MUC: Fixed traceback on presence errors lacking a condition.
Waqas Hussain <waqas20@gmail.com>
parents:
3446
diff
changeset
|
257 local error_message = "Kicked: "..(condition and condition:gsub("%-", " ") or "presence error"); |
|
2529
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
258 if text then |
|
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
259 error_message = error_message..": "..text; |
|
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
260 end |
|
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
261 return st.presence({type='unavailable', from=stanza.attr.from, to=stanza.attr.to}) |
|
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
262 :tag('status'):text(error_message); |
|
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
263 end |
|
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
264 |
|
3507
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
265 function room_mt:set_name(name) |
|
3510
711eb5bf94b4
MUC: Make the room node be the default room name (thanks Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3509
diff
changeset
|
266 if name == "" or type(name) ~= "string" or name == (jid_split(self.jid)) then name = nil; end |
|
3507
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
267 if self._data.name ~= name then |
|
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
268 self._data.name = name; |
|
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
269 if self.save then self:save(true); end |
|
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
270 end |
|
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
271 end |
|
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
272 function room_mt:get_name() |
|
3510
711eb5bf94b4
MUC: Make the room node be the default room name (thanks Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3509
diff
changeset
|
273 return self._data.name or jid_split(self.jid); |
|
3507
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
274 end |
|
3508
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
275 function room_mt:set_description(description) |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
276 if description == "" or type(description) ~= "string" then description = nil; end |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
277 if self._data.description ~= description then |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
278 self._data.description = description; |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
279 if self.save then self:save(true); end |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
280 end |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
281 end |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
282 function room_mt:get_description() |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
283 return self._data.description; |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
284 end |
|
3244
616a3bb2bad9
MUC: Added room:get_password() and room:set_password().
Waqas Hussain <waqas20@gmail.com>
parents:
2985
diff
changeset
|
285 function room_mt:set_password(password) |
|
616a3bb2bad9
MUC: Added room:get_password() and room:set_password().
Waqas Hussain <waqas20@gmail.com>
parents:
2985
diff
changeset
|
286 if password == "" or type(password) ~= "string" then password = nil; end |
|
3249
95daf6398dbb
MUC: Persist data in room:set_password() when called programmatically.
Waqas Hussain <waqas20@gmail.com>
parents:
3248
diff
changeset
|
287 if self._data.password ~= password then |
|
95daf6398dbb
MUC: Persist data in room:set_password() when called programmatically.
Waqas Hussain <waqas20@gmail.com>
parents:
3248
diff
changeset
|
288 self._data.password = password; |
|
95daf6398dbb
MUC: Persist data in room:set_password() when called programmatically.
Waqas Hussain <waqas20@gmail.com>
parents:
3248
diff
changeset
|
289 if self.save then self:save(true); end |
|
95daf6398dbb
MUC: Persist data in room:set_password() when called programmatically.
Waqas Hussain <waqas20@gmail.com>
parents:
3248
diff
changeset
|
290 end |
|
3244
616a3bb2bad9
MUC: Added room:get_password() and room:set_password().
Waqas Hussain <waqas20@gmail.com>
parents:
2985
diff
changeset
|
291 end |
|
616a3bb2bad9
MUC: Added room:get_password() and room:set_password().
Waqas Hussain <waqas20@gmail.com>
parents:
2985
diff
changeset
|
292 function room_mt:get_password() |
|
616a3bb2bad9
MUC: Added room:get_password() and room:set_password().
Waqas Hussain <waqas20@gmail.com>
parents:
2985
diff
changeset
|
293 return self._data.password; |
|
616a3bb2bad9
MUC: Added room:get_password() and room:set_password().
Waqas Hussain <waqas20@gmail.com>
parents:
2985
diff
changeset
|
294 end |
|
3250
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
295 function room_mt:set_moderated(moderated) |
|
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
296 moderated = moderated and true or nil; |
|
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
297 if self._data.moderated ~= moderated then |
|
3252
22062c50eabe
MUC: Added a 'Make Room Moderated?' field to the room config dialog.
Waqas Hussain <waqas20@gmail.com>
parents:
3251
diff
changeset
|
298 self._data.moderated = moderated; |
|
3250
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
299 if self.save then self:save(true); end |
|
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
300 end |
|
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
301 end |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
302 function room_mt:get_moderated() |
|
3250
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
303 return self._data.moderated; |
|
38402e874b45
MUC: Added room:set_moderated(boolean) and room:is_moderated().
Waqas Hussain <waqas20@gmail.com>
parents:
3249
diff
changeset
|
304 end |
|
3254
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
305 function room_mt:set_members_only(members_only) |
|
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
306 members_only = members_only and true or nil; |
|
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
307 if self._data.members_only ~= members_only then |
|
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
308 self._data.members_only = members_only; |
|
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
309 if self.save then self:save(true); end |
|
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
310 end |
|
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
311 end |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
312 function room_mt:get_members_only() |
|
3254
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
313 return self._data.members_only; |
|
a01c6411fdfb
MUC: Added room:set_members_only(boolean) and room:is_members_only().
Waqas Hussain <waqas20@gmail.com>
parents:
3253
diff
changeset
|
314 end |
|
3258
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
315 function room_mt:set_persistent(persistent) |
|
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
316 persistent = persistent and true or nil; |
|
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
317 if self._data.persistent ~= persistent then |
|
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
318 self._data.persistent = persistent; |
|
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
319 if self.save then self:save(true); end |
|
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
320 end |
|
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
321 end |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
322 function room_mt:get_persistent() |
|
3258
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
323 return self._data.persistent; |
|
bc07564bec6d
MUC: Added room:set_persistent(boolean) and room:is_persistent().
Waqas Hussain <waqas20@gmail.com>
parents:
3257
diff
changeset
|
324 end |
|
3261
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
325 function room_mt:set_hidden(hidden) |
|
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
326 hidden = hidden and true or nil; |
|
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
327 if self._data.hidden ~= hidden then |
|
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
328 self._data.hidden = hidden; |
|
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
329 if self.save then self:save(true); end |
|
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
330 end |
|
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
331 end |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
332 function room_mt:get_hidden() |
|
3261
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
333 return self._data.hidden; |
|
fe1c93296abd
MUC: Added room:set_hidden(boolean) and room:is_hidden().
Waqas Hussain <waqas20@gmail.com>
parents:
3260
diff
changeset
|
334 end |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
335 function room_mt:get_public() |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
336 return not self:get_hidden(); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
337 end |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
338 function room_mt:set_public(public) |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
339 return self:set_hidden(not public); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
340 end |
|
4119
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
341 function room_mt:set_changesubject(changesubject) |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
342 changesubject = changesubject and true or nil; |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
343 if self._data.changesubject ~= changesubject then |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
344 self._data.changesubject = changesubject; |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
345 if self.save then self:save(true); end |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
346 end |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
347 end |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
348 function room_mt:get_changesubject() |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
349 return self._data.changesubject; |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
350 end |
|
4528
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
351 function room_mt:get_historylength() |
|
4785
36234dc4b177
mod_muc/muc.lib: Fall back to default_history_length if no length in config
Matthew Wild <mwild1@gmail.com>
parents:
4766
diff
changeset
|
352 return self._data.history_length or default_history_length; |
|
4528
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
353 end |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
354 function room_mt:set_historylength(length) |
|
5195
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
355 length = math.min(tonumber(length) or default_history_length, max_history_length or math.huge); |
|
4876
fa41d05ee7ef
muc.lib: room:set_historylength(): Condense code, and don't store length when equal to default
Matthew Wild <mwild1@gmail.com>
parents:
4875
diff
changeset
|
356 if length == default_history_length then |
|
fa41d05ee7ef
muc.lib: room:set_historylength(): Condense code, and don't store length when equal to default
Matthew Wild <mwild1@gmail.com>
parents:
4875
diff
changeset
|
357 length = nil; |
|
4528
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
358 end |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
359 self._data.history_length = length; |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
360 end |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
361 |
|
8793
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
362 -- Fix for clients who don't support XEP-0045 correctly |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
363 -- Default number of history messages the room returns |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
364 function room_mt:get_defaulthistorymessages() |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
365 return self._data.default_history_messages or default_history_length; |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
366 end |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
367 function room_mt:set_defaulthistorymessages(number) |
|
8839
dcd53a565c01
MUC: Handle setting default history messages when history length is unset (thanks tmolitor)
Kim Alvefur <zash@zash.se>
parents:
8838
diff
changeset
|
368 number = math.min(tonumber(number) or default_history_length, self._data.history_length or default_history_length); |
|
8793
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
369 if number == default_history_length then |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
370 number = nil; |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
371 end |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
372 self._data.default_history_messages = number; |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
373 end |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
374 |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
375 |
|
3244
616a3bb2bad9
MUC: Added room:get_password() and room:set_password().
Waqas Hussain <waqas20@gmail.com>
parents:
2985
diff
changeset
|
376 |
|
5600
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
377 local valid_whois = { moderators = true, anyone = true }; |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
378 |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
379 function room_mt:set_whois(whois) |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
380 if valid_whois[whois] and self._data.whois ~= whois then |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
381 self._data.whois = whois; |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
382 if self.save then self:save(true); end |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
383 end |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
384 end |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
385 |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
386 function room_mt:get_whois() |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
387 return self._data.whois; |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
388 end |
|
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
389 |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
390 local function construct_stanza_id(room, stanza) |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
391 local from_jid, to_nick = stanza.attr.from, stanza.attr.to; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
392 local from_nick = room._jid_nick[from_jid]; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
393 local occupant = room._occupants[to_nick]; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
394 local to_jid = occupant.jid; |
|
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5681
diff
changeset
|
395 |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
396 return from_nick, to_jid, base64.encode(to_jid.."\0"..stanza.attr.id.."\0"..md5(from_jid)); |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
397 end |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
398 local function deconstruct_stanza_id(room, stanza) |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
399 local from_jid_possiblybare, to_nick = stanza.attr.from, stanza.attr.to; |
|
6923
f755e0bdc60a
muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, causing dropped stanzas (thanks Jitsi folk!)
Matthew Wild <mwild1@gmail.com>
parents:
6049
diff
changeset
|
400 local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$"); |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
401 local from_nick = room._jid_nick[from_jid]; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
402 |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
403 if not(from_nick) then return; end |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
404 if not(from_jid_possiblybare == from_jid or from_jid_possiblybare == jid_bare(from_jid)) then return; end |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
405 |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
406 local occupant = room._occupants[to_nick]; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
407 for to_jid in pairs(occupant and occupant.sessions or {}) do |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
408 if md5(to_jid) == to_jid_hash then |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
409 return from_nick, to_jid, id; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
410 end |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
411 end |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
412 end |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
413 |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
414 |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
415 function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc |
| 1734 | 416 local from, to = stanza.attr.from, stanza.attr.to; |
| 417 local room = jid_bare(to); | |
| 418 local current_nick = self._jid_nick[from]; | |
| 419 local type = stanza.attr.type; | |
| 420 log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag()); | |
| 421 if (select(2, jid_split(from)) == muc_domain) then error("Presence from the MUC itself!!!"); end | |
| 422 if stanza.name == "presence" then | |
| 423 local pr = get_filtered_presence(stanza); | |
| 424 pr.attr.from = current_nick; | |
| 425 if type == "error" then -- error, kick em out! | |
| 426 if current_nick then | |
| 427 log("debug", "kicking %s from %s", current_nick, room); | |
|
2529
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
428 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); |
| 1734 | 429 end |
| 430 elseif type == "unavailable" then -- unavailable | |
| 431 if current_nick then | |
| 432 log("debug", "%s leaving %s", current_nick, room); | |
|
4424
1cbf3744300c
MUC: Fix a possible stack overflow (when a local component joins a room, then disconnects, an unavailble-error presence cycle can occur).
Waqas Hussain <waqas20@gmail.com>
parents:
4357
diff
changeset
|
433 self._jid_nick[from] = nil; |
|
1826
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
434 local occupant = self._occupants[current_nick]; |
|
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
435 local new_jid = next(occupant.sessions); |
|
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
436 if new_jid == from then new_jid = next(occupant.sessions, new_jid); end |
|
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
437 if new_jid then |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
438 local jid = occupant.jid; |
|
1826
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
439 occupant.jid = new_jid; |
|
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
440 occupant.sessions[from] = nil; |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
441 pr.attr.to = from; |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
442 pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) |
|
2053
f5a198127dd3
MUC: Fixed: affiliation='none' was omitted from some presence broadcasts.
Waqas Hussain <waqas20@gmail.com>
parents:
2051
diff
changeset
|
443 :tag("item", {affiliation=occupant.affiliation or "none", role='none'}):up() |
|
3989
84792db89336
MUC: Fix a pair of missing :up()
Kim Alvefur <zash@zash.se>
parents:
3632
diff
changeset
|
444 :tag("status", {code='110'}):up(); |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
445 self:_route_stanza(pr); |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
446 if jid ~= new_jid then |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
447 pr = st.clone(occupant.sessions[new_jid]) |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
448 :tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) |
|
2053
f5a198127dd3
MUC: Fixed: affiliation='none' was omitted from some presence broadcasts.
Waqas Hussain <waqas20@gmail.com>
parents:
2051
diff
changeset
|
449 :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none"}); |
|
2051
2567f4bf0085
MUC: Fixed an issue with multi-session nicks where the 'from' attribute in a presence broadcast was not being properly set.
Waqas Hussain <waqas20@gmail.com>
parents:
2035
diff
changeset
|
450 pr.attr.from = current_nick; |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
451 self:broadcast_except_nick(pr, current_nick); |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
452 end |
|
1826
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
453 else |
|
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
454 occupant.role = 'none'; |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
455 self:broadcast_presence(pr, from); |
|
1826
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
456 self._occupants[current_nick] = nil; |
|
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1825
diff
changeset
|
457 end |
| 1734 | 458 end |
| 459 elseif not type then -- available | |
| 460 if current_nick then | |
| 461 --if #pr == #stanza or current_nick ~= to then -- commented because google keeps resending directed presence | |
| 462 if current_nick == to then -- simple presence | |
| 463 log("debug", "%s broadcasted presence", current_nick); | |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
464 self._occupants[current_nick].sessions[from] = pr; |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
465 self:broadcast_presence(pr, from); |
| 1734 | 466 else -- change nick |
|
8187
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
467 -- a MUC service MUST NOT allow empty or invisible Room Nicknames |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
468 -- (i.e., Room Nicknames that consist only of one or more space characters). |
|
8191
d43012448c1f
MUC: Use variable that actually exists (thanks Martin)
Kim Alvefur <zash@zash.se>
parents:
8187
diff
changeset
|
469 if not select(3, jid_split(to)):find("[^ ]") then -- resourceprep turns all whitespace into 0x20 |
|
8187
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
470 module:log("debug", "Rejecting invisible nickname"); |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
471 origin.send(st.error_reply(stanza, "cancel", "not-allowed")); |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
472 return; |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
473 end |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
474 local occupant = self._occupants[current_nick]; |
|
2008
6b6b924ee558
MUC: Re-enable nick changes for non-multisession nicks.
Waqas Hussain <waqas20@gmail.com>
parents:
2006
diff
changeset
|
475 local is_multisession = next(occupant.sessions, next(occupant.sessions)); |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
476 if self._occupants[to] or is_multisession then |
| 1734 | 477 log("debug", "%s couldn't change nick", current_nick); |
|
1818
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1808
diff
changeset
|
478 local reply = st.error_reply(stanza, "cancel", "conflict"):up(); |
|
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1808
diff
changeset
|
479 reply.tags[1].attr.code = "409"; |
|
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1808
diff
changeset
|
480 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
| 1734 | 481 else |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
482 local data = self._occupants[current_nick]; |
| 1734 | 483 local to_nick = select(3, jid_split(to)); |
| 484 if to_nick then | |
| 485 log("debug", "%s (%s) changing nick to %s", current_nick, data.jid, to); | |
| 486 local p = st.presence({type='unavailable', from=current_nick}); | |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
487 self:broadcast_presence(p, from, '303', to_nick); |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
488 self._occupants[current_nick] = nil; |
|
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
489 self._occupants[to] = data; |
| 1734 | 490 self._jid_nick[from] = to; |
| 491 pr.attr.from = to; | |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
492 self._occupants[to].sessions[from] = pr; |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
493 self:broadcast_presence(pr, from); |
| 1734 | 494 else |
| 495 --TODO malformed-jid | |
| 496 end | |
| 497 end | |
| 498 end | |
| 499 --else -- possible rejoin | |
| 500 -- log("debug", "%s had connection replaced", current_nick); | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
501 -- self:handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to}) |
|
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
502 -- :tag('status'):text('Replaced by new connection'):up()); -- send unavailable |
|
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
503 -- self:handle_to_occupant(origin, stanza); -- resend available |
| 1734 | 504 --end |
| 505 else -- enter room | |
|
8187
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
506 -- a MUC service MUST NOT allow empty or invisible Room Nicknames |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
507 -- (i.e., Room Nicknames that consist only of one or more space characters). |
|
8191
d43012448c1f
MUC: Use variable that actually exists (thanks Martin)
Kim Alvefur <zash@zash.se>
parents:
8187
diff
changeset
|
508 if not select(3, jid_split(to)):find("[^ ]") then -- resourceprep turns all whitespace into 0x20 |
|
8187
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
509 module:log("debug", "Rejecting invisible nickname"); |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
510 origin.send(st.error_reply(stanza, "cancel", "not-allowed")); |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
511 return; |
|
4d83876aac3e
MUC: Reject whitespace-only nicknames (fixes #337)
Kim Alvefur <zash@zash.se>
parents:
8176
diff
changeset
|
512 end |
| 1734 | 513 local new_nick = to; |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
514 local is_merge; |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
515 if self._occupants[to] then |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
516 if jid_bare(from) ~= jid_bare(self._occupants[to].jid) then |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
517 new_nick = nil; |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
518 end |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
519 is_merge = true; |
| 1734 | 520 end |
|
3245
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
521 local password = stanza:get_child("x", "http://jabber.org/protocol/muc"); |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
522 password = password and password:get_child("password", "http://jabber.org/protocol/muc"); |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
523 password = password and password[1] ~= "" and password[1]; |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
524 if self:get_password() and self:get_password() ~= password then |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
525 log("debug", "%s couldn't join due to invalid password: %s", from, to); |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
526 local reply = st.error_reply(stanza, "auth", "not-authorized"):up(); |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
527 reply.tags[1].attr.code = "401"; |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
528 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
|
a8a4c87a4fbf
MUC: Added password checking on room join.
Waqas Hussain <waqas20@gmail.com>
parents:
3244
diff
changeset
|
529 elseif not new_nick then |
| 1734 | 530 log("debug", "%s couldn't join due to nick conflict: %s", from, to); |
|
1818
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1808
diff
changeset
|
531 local reply = st.error_reply(stanza, "cancel", "conflict"):up(); |
|
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1808
diff
changeset
|
532 reply.tags[1].attr.code = "409"; |
|
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1808
diff
changeset
|
533 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
| 1734 | 534 else |
| 535 log("debug", "%s joining as %s", from, to); | |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
536 if not next(self._affiliations) then -- new room, no owners |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
537 self._affiliations[jid_bare(from)] = "owner"; |
|
5808
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
538 if self.locked and not stanza:get_child("x", "http://jabber.org/protocol/muc") then |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
539 self.locked = nil; -- Older groupchat protocol doesn't lock |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
540 end |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
541 elseif self.locked then -- Deny entry |
|
7997
aca13c433e45
MUC: Log when denying entry to locked room
Kim Alvefur <zash@zash.se>
parents:
7684
diff
changeset
|
542 module:log("debug", "Room is locked, denying entry"); |
|
5808
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
543 origin.send(st.error_reply(stanza, "cancel", "item-not-found")); |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
544 return; |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
545 end |
|
1740
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
546 local affiliation = self:get_affiliation(from); |
|
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
547 local role = self:get_default_role(affiliation) |
|
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
548 if role then -- new occupant |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
549 if not is_merge then |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
550 self._occupants[to] = {affiliation=affiliation, role=role, jid=from, sessions={[from]=get_filtered_presence(stanza)}}; |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
551 else |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
552 self._occupants[to].sessions[from] = get_filtered_presence(stanza); |
|
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
553 end |
|
1740
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
554 self._jid_nick[from] = to; |
|
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
555 self:send_occupant_list(from); |
|
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
556 pr.attr.from = to; |
|
3593
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
557 pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) |
|
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
558 :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up(); |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
559 if not is_merge then |
|
3593
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
560 self:broadcast_except_nick(pr, to); |
|
1989
97c3236cc4ac
MUC: Multiple sessions per nick.
Waqas Hussain <waqas20@gmail.com>
parents:
1862
diff
changeset
|
561 end |
|
3989
84792db89336
MUC: Fix a pair of missing :up()
Kim Alvefur <zash@zash.se>
parents:
3632
diff
changeset
|
562 pr:tag("status", {code='110'}):up(); |
|
3593
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
563 if self._data.whois == 'anyone' then |
|
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
564 pr:tag("status", {code='100'}):up(); |
|
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
565 end |
|
5808
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
566 if self.locked then |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
567 pr:tag("status", {code='201'}):up(); |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
568 end |
|
3593
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
569 pr.attr.to = from; |
|
58a4af582eb3
MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
3592
diff
changeset
|
570 self:_route_stanza(pr); |
|
2880
a3f6cc3417f2
MUC: Added support for letting clients manage discussion history.
Waqas Hussain <waqas20@gmail.com>
parents:
2658
diff
changeset
|
571 self:send_history(from, stanza); |
|
5983
930109558aa2
MUC: Split out sending of the topic into method separate from sending history
Kim Alvefur <zash@zash.se>
parents:
5982
diff
changeset
|
572 self:send_subject(from); |
|
3445
2fde9cb97f76
MUC: Return correct error to non-members attempting to enter a members-only room.
Waqas Hussain <waqas20@gmail.com>
parents:
3393
diff
changeset
|
573 elseif not affiliation then -- registration required for entering members-only room |
|
2fde9cb97f76
MUC: Return correct error to non-members attempting to enter a members-only room.
Waqas Hussain <waqas20@gmail.com>
parents:
3393
diff
changeset
|
574 local reply = st.error_reply(stanza, "auth", "registration-required"):up(); |
|
2fde9cb97f76
MUC: Return correct error to non-members attempting to enter a members-only room.
Waqas Hussain <waqas20@gmail.com>
parents:
3393
diff
changeset
|
575 reply.tags[1].attr.code = "407"; |
|
2fde9cb97f76
MUC: Return correct error to non-members attempting to enter a members-only room.
Waqas Hussain <waqas20@gmail.com>
parents:
3393
diff
changeset
|
576 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
|
1740
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
577 else -- banned |
|
1819
ed1911be26c7
MUC: Added legacy error code to the presence error returned when a banned user attempts to join.
Waqas Hussain <waqas20@gmail.com>
parents:
1818
diff
changeset
|
578 local reply = st.error_reply(stanza, "auth", "forbidden"):up(); |
|
ed1911be26c7
MUC: Added legacy error code to the presence error returned when a banned user attempts to join.
Waqas Hussain <waqas20@gmail.com>
parents:
1818
diff
changeset
|
579 reply.tags[1].attr.code = "403"; |
|
ed1911be26c7
MUC: Added legacy error code to the presence error returned when a banned user attempts to join.
Waqas Hussain <waqas20@gmail.com>
parents:
1818
diff
changeset
|
580 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
| 1734 | 581 end |
| 582 end | |
| 583 end | |
| 584 elseif type ~= 'result' then -- bad type | |
|
1998
40792c18a8e4
MUC: Ignore invisible presence (incorrectly broadcasted or forwarded by ejabberd).
Waqas Hussain <waqas20@gmail.com>
parents:
1997
diff
changeset
|
585 if type ~= 'visible' and type ~= 'invisible' then -- COMPAT ejabberd can broadcast or forward XEP-0018 presences |
|
40792c18a8e4
MUC: Ignore invisible presence (incorrectly broadcasted or forwarded by ejabberd).
Waqas Hussain <waqas20@gmail.com>
parents:
1997
diff
changeset
|
586 origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error? |
|
40792c18a8e4
MUC: Ignore invisible presence (incorrectly broadcasted or forwarded by ejabberd).
Waqas Hussain <waqas20@gmail.com>
parents:
1997
diff
changeset
|
587 end |
| 1734 | 588 end |
|
1778
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
589 elseif not current_nick then -- not in room |
|
5144
a30507061526
MUC: Fix traceback caused by faulty logic precedence. (thanks waqas, nulani)
Kim Alvefur <zash@zash.se>
parents:
5086
diff
changeset
|
590 if (type == "error" or type == "result") and stanza.name == "iq" then |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
591 local id = stanza.attr.id; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
592 stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza); |
|
5086
1ef9aa0c9fb0
MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed.
Waqas Hussain <waqas20@gmail.com>
parents:
5078
diff
changeset
|
593 if stanza.attr.id then |
|
1ef9aa0c9fb0
MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed.
Waqas Hussain <waqas20@gmail.com>
parents:
5078
diff
changeset
|
594 self:_route_stanza(stanza); |
|
1ef9aa0c9fb0
MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed.
Waqas Hussain <waqas20@gmail.com>
parents:
5078
diff
changeset
|
595 end |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
596 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id; |
|
5294
87f07dd0bbfb
MUC: Don't reply to errors (thanks iron)
Kim Alvefur <zash@zash.se>
parents:
5241
diff
changeset
|
597 elseif type ~= "error" then |
|
1778
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
598 origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); |
|
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
599 end |
| 1734 | 600 elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM |
| 601 origin.send(st.error_reply(stanza, "modify", "bad-request")); | |
|
1999
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
602 elseif current_nick and stanza.name == "message" and type == "error" and is_kickable_error(stanza) then |
|
1996
3e6b36c6d7b7
MUC: Kick occupants on sending error messages to other occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
1989
diff
changeset
|
603 log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid); |
|
2529
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
604 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable |
| 1734 | 605 else -- private stanza |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
606 local o_data = self._occupants[to]; |
| 1734 | 607 if o_data then |
| 608 log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid); | |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
609 if stanza.name == "iq" then |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
610 local id = stanza.attr.id; |
|
5078
cba0b426b542
MUC: Fix private IQ results and errors for non-vcard queries.
Waqas Hussain <waqas20@gmail.com>
parents:
5063
diff
changeset
|
611 if stanza.attr.type == "get" or stanza.attr.type == "set" then |
|
cba0b426b542
MUC: Fix private IQ results and errors for non-vcard queries.
Waqas Hussain <waqas20@gmail.com>
parents:
5063
diff
changeset
|
612 stanza.attr.from, stanza.attr.to, stanza.attr.id = construct_stanza_id(self, stanza); |
|
cba0b426b542
MUC: Fix private IQ results and errors for non-vcard queries.
Waqas Hussain <waqas20@gmail.com>
parents:
5063
diff
changeset
|
613 else |
|
cba0b426b542
MUC: Fix private IQ results and errors for non-vcard queries.
Waqas Hussain <waqas20@gmail.com>
parents:
5063
diff
changeset
|
614 stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza); |
|
cba0b426b542
MUC: Fix private IQ results and errors for non-vcard queries.
Waqas Hussain <waqas20@gmail.com>
parents:
5063
diff
changeset
|
615 end |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
616 if type == 'get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
617 stanza.attr.to = jid_bare(stanza.attr.to); |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
618 end |
|
5086
1ef9aa0c9fb0
MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed.
Waqas Hussain <waqas20@gmail.com>
parents:
5078
diff
changeset
|
619 if stanza.attr.id then |
|
1ef9aa0c9fb0
MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed.
Waqas Hussain <waqas20@gmail.com>
parents:
5078
diff
changeset
|
620 self:_route_stanza(stanza); |
|
1ef9aa0c9fb0
MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed.
Waqas Hussain <waqas20@gmail.com>
parents:
5078
diff
changeset
|
621 end |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
622 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
623 else -- message |
|
6004
09151d26560a
MUC: Tag PMs with <x>, like presence stanzas
Kim Alvefur <zash@zash.se>
parents:
5983
diff
changeset
|
624 stanza:tag("x", { xmlns = "http://jabber.org/protocol/muc#user" }):up(); |
|
5061
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
625 stanza.attr.from = current_nick; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
626 for jid in pairs(o_data.sessions) do |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
627 stanza.attr.to = jid; |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
628 self:_route_stanza(stanza); |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
629 end |
|
186f34d88073
MUC: Fix private IQ and message routing.
Waqas Hussain <waqas20@gmail.com>
parents:
4999
diff
changeset
|
630 stanza.attr.from, stanza.attr.to = from, to; |
|
1778
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
631 end |
| 1734 | 632 elseif type ~= "error" and type ~= "result" then -- recipient not in room |
| 633 origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room")); | |
| 634 end | |
| 635 end | |
| 636 end | |
| 637 | |
|
2216
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
638 function room_mt:send_form(origin, stanza) |
|
3591
dff4a77ee285
MUC: Parse submitted form with util.dataforms
Kim Alvefur <zash@zash.se>
parents:
3590
diff
changeset
|
639 origin.send(st.reply(stanza):query("http://jabber.org/protocol/muc#owner") |
|
5601
f55ab5fa939f
mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler
Matthew Wild <mwild1@gmail.com>
parents:
5600
diff
changeset
|
640 :add_child(self:get_form_layout(stanza.attr.from):form()) |
|
3591
dff4a77ee285
MUC: Parse submitted form with util.dataforms
Kim Alvefur <zash@zash.se>
parents:
3590
diff
changeset
|
641 ); |
|
dff4a77ee285
MUC: Parse submitted form with util.dataforms
Kim Alvefur <zash@zash.se>
parents:
3590
diff
changeset
|
642 end |
|
dff4a77ee285
MUC: Parse submitted form with util.dataforms
Kim Alvefur <zash@zash.se>
parents:
3590
diff
changeset
|
643 |
|
5601
f55ab5fa939f
mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler
Matthew Wild <mwild1@gmail.com>
parents:
5600
diff
changeset
|
644 function room_mt:get_form_layout(actor) |
|
5541
1997671d5e46
MUC: Allow plugins to add and handle options in the MUC config form
Matthew Wild <mwild1@gmail.com>
parents:
5519
diff
changeset
|
645 local form = dataform.new({ |
|
1997671d5e46
MUC: Allow plugins to add and handle options in the MUC config form
Matthew Wild <mwild1@gmail.com>
parents:
5519
diff
changeset
|
646 title = "Configuration for "..self.jid, |
|
1997671d5e46
MUC: Allow plugins to add and handle options in the MUC config form
Matthew Wild <mwild1@gmail.com>
parents:
5519
diff
changeset
|
647 instructions = "Complete and submit this form to configure the room.", |
|
3517
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
648 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
649 name = 'FORM_TYPE', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
650 type = 'hidden', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
651 value = 'http://jabber.org/protocol/muc#roomconfig' |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
652 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
653 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
654 name = 'muc#roomconfig_roomname', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
655 type = 'text-single', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
656 label = 'Name', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
657 value = self:get_name() or "", |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
658 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
659 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
660 name = 'muc#roomconfig_roomdesc', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
661 type = 'text-single', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
662 label = 'Description', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
663 value = self:get_description() or "", |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
664 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
665 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
666 name = 'muc#roomconfig_persistentroom', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
667 type = 'boolean', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
668 label = 'Make Room Persistent?', |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
669 value = self:get_persistent() |
|
3517
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
670 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
671 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
672 name = 'muc#roomconfig_publicroom', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
673 type = 'boolean', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
674 label = 'Make Room Publicly Searchable?', |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
675 value = not self:get_hidden() |
|
3517
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
676 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
677 { |
|
4119
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
678 name = 'muc#roomconfig_changesubject', |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
679 type = 'boolean', |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
680 label = 'Allow Occupants to Change Subject?', |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
681 value = self:get_changesubject() |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
682 }, |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
683 { |
|
3517
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
684 name = 'muc#roomconfig_whois', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
685 type = 'list-single', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
686 label = 'Who May Discover Real JIDs?', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
687 value = { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
688 { value = 'moderators', label = 'Moderators Only', default = self._data.whois == 'moderators' }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
689 { value = 'anyone', label = 'Anyone', default = self._data.whois == 'anyone' } |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
690 } |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
691 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
692 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
693 name = 'muc#roomconfig_roomsecret', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
694 type = 'text-private', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
695 label = 'Password', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
696 value = self:get_password() or "", |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
697 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
698 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
699 name = 'muc#roomconfig_moderatedroom', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
700 type = 'boolean', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
701 label = 'Make Room Moderated?', |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
702 value = self:get_moderated() |
|
3517
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
703 }, |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
704 { |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
705 name = 'muc#roomconfig_membersonly', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
706 type = 'boolean', |
|
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
707 label = 'Make Room Members-Only?', |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
708 value = self:get_members_only() |
|
4528
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
709 }, |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
710 { |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
711 name = 'muc#roomconfig_historylength', |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
712 type = 'text-single', |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
713 label = 'Maximum Number of History Messages Returned by Room', |
|
875b90d5ce0f
muc - implement per channel history limits
Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de>
parents:
4424
diff
changeset
|
714 value = tostring(self:get_historylength()) |
|
8793
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
715 }, |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
716 { |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
717 name = 'muc#roomconfig_defaulthistorymessages', |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
718 type = 'text-single', |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
719 label = 'Default Number of History Messages Returned by Room', |
|
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
720 value = tostring(self:get_defaulthistorymessages()) |
|
3517
530f7de1d265
MUC: Use util.dataforms to generate forms
Kim Alvefur <zash@zash.se>
parents:
3516
diff
changeset
|
721 } |
|
3591
dff4a77ee285
MUC: Parse submitted form with util.dataforms
Kim Alvefur <zash@zash.se>
parents:
3590
diff
changeset
|
722 }); |
|
5601
f55ab5fa939f
mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler
Matthew Wild <mwild1@gmail.com>
parents:
5600
diff
changeset
|
723 return module:fire_event("muc-config-form", { room = self, actor = actor, form = form }) or form; |
|
2216
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
724 end |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
725 |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
726 function room_mt:process_form(origin, stanza) |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
727 local query = stanza.tags[1]; |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
728 local form; |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
729 for _, tag in ipairs(query.tags) do if tag.name == "x" and tag.attr.xmlns == "jabber:x:data" then form = tag; break; end end |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
730 if not form then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); return; end |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
731 if form.attr.type == "cancel" then origin.send(st.reply(stanza)); return; end |
|
3591
dff4a77ee285
MUC: Parse submitted form with util.dataforms
Kim Alvefur <zash@zash.se>
parents:
3590
diff
changeset
|
732 if form.attr.type ~= "submit" then origin.send(st.error_reply(stanza, "cancel", "bad-request", "Not a submitted form")); return; end |
|
dff4a77ee285
MUC: Parse submitted form with util.dataforms
Kim Alvefur <zash@zash.se>
parents:
3590
diff
changeset
|
733 |
|
7383
69827ee1f951
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur <zash@zash.se>
parents:
7011
diff
changeset
|
734 if form.tags[1] == nil then |
|
69827ee1f951
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur <zash@zash.se>
parents:
7011
diff
changeset
|
735 -- instant room |
|
69827ee1f951
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur <zash@zash.se>
parents:
7011
diff
changeset
|
736 if self.save then self:save(true); end |
|
69827ee1f951
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur <zash@zash.se>
parents:
7011
diff
changeset
|
737 origin.send(st.reply(stanza)); |
|
69827ee1f951
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur <zash@zash.se>
parents:
7011
diff
changeset
|
738 return true; |
|
69827ee1f951
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur <zash@zash.se>
parents:
7011
diff
changeset
|
739 end |
|
69827ee1f951
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur <zash@zash.se>
parents:
7011
diff
changeset
|
740 |
|
6982
c515f9491ce6
MUC: Process only options that are included in a form (Fixes #521)
Kim Alvefur <zash@zash.se>
parents:
6924
diff
changeset
|
741 local fields, errors, present = self:get_form_layout(stanza.attr.from):data(form); |
| 6831 | 742 if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then |
| 743 origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration")); | |
| 744 return; | |
|
3507
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
745 end |
|
b639042bb0d5
MUC: Added a 'Name' property (muc#roomconfig_roomname)
Kim Alvefur <zash@zash.se>
parents:
3446
diff
changeset
|
746 |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
747 local changed = {}; |
|
5541
1997671d5e46
MUC: Allow plugins to add and handle options in the MUC config form
Matthew Wild <mwild1@gmail.com>
parents:
5519
diff
changeset
|
748 |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
749 local function handle_option(name, field, allowed) |
| 6983 | 750 if not present[field] then return; end |
| 751 local new = fields[field]; | |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
752 if allowed and not allowed[new] then return; end |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
753 if new == self["get_"..name](self) then return; end |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
754 changed[name] = true; |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
755 self["set_"..name](self, new); |
|
3508
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
756 end |
|
9e4c2b048f9a
MUC: Added a 'Description' property (muc#roomconfig_roomdesc)
Kim Alvefur <zash@zash.se>
parents:
3507
diff
changeset
|
757 |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
758 local event = { room = self, fields = fields, changed = changed, stanza = stanza, origin = origin, update_option = handle_option }; |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
759 module:fire_event("muc-config-submitted", event); |
|
4119
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
760 |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
761 handle_option("name", "muc#roomconfig_roomname"); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
762 handle_option("description", "muc#roomconfig_roomdesc"); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
763 handle_option("persistent", "muc#roomconfig_persistentroom"); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
764 handle_option("moderated", "muc#roomconfig_moderatedroom"); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
765 handle_option("members_only", "muc#roomconfig_membersonly"); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
766 handle_option("public", "muc#roomconfig_publicroom"); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
767 handle_option("changesubject", "muc#roomconfig_changesubject"); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
768 handle_option("historylength", "muc#roomconfig_historylength"); |
|
8793
05a3275b6873
MUC: Allow the number of messages sent by default to be configured (fixes #397)
Matthew Wild <mwild1@gmail.com>
parents:
8792
diff
changeset
|
769 handle_option("defaulthistorymessages", "muc#roomconfig_defaulthistorymessages"); |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
770 handle_option("whois", "muc#roomconfig_whois", valid_whois); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
771 handle_option("password", "muc#roomconfig_roomsecret"); |
|
3248
f8d14ea3ad0e
MUC: Added a password field to the room config dialog.
Waqas Hussain <waqas20@gmail.com>
parents:
3247
diff
changeset
|
772 |
|
2216
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
773 if self.save then self:save(true); end |
|
5808
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
774 if self.locked then |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
775 module:fire_event("muc-room-unlocked", { room = self }); |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
776 self.locked = nil; |
|
026367992a0f
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
Matthew Wild <mwild1@gmail.com>
parents:
5776
diff
changeset
|
777 end |
|
2216
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
778 origin.send(st.reply(stanza)); |
|
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
779 |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
780 if next(changed) then |
|
3592
3adac5780c5a
MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3591
diff
changeset
|
781 local msg = st.message({type='groupchat', from=self.jid}) |
| 7012 | 782 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'}) |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
783 :tag('status', {code = '104'}):up(); |
|
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
784 if changed.whois then |
|
5600
1b326a1e4da6
mod_muc: Add getter/setter for 'whois' (fixes traceback)
Matthew Wild <mwild1@gmail.com>
parents:
5580
diff
changeset
|
785 local code = (self:get_whois() == 'moderators') and "173" or "172"; |
|
3592
3adac5780c5a
MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3591
diff
changeset
|
786 msg.tags[1]:tag('status', {code = code}):up(); |
|
3adac5780c5a
MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3591
diff
changeset
|
787 end |
|
3adac5780c5a
MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash).
Waqas Hussain <waqas20@gmail.com>
parents:
3591
diff
changeset
|
788 self:broadcast_message(msg, false) |
|
2412
e243b7c81de6
Added notification of configuration changes for MUCs
Rob Hoelz <rob@hoelzro.net>
parents:
2411
diff
changeset
|
789 end |
|
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
790 end |
|
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
791 |
|
2217
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
792 function room_mt:destroy(newjid, reason, password) |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
793 local pr = st.presence({type = "unavailable"}) |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
794 :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"}) |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
795 :tag("item", { affiliation='none', role='none' }):up() |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
796 :tag("destroy", {jid=newjid}) |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
797 if reason then pr:tag("reason"):text(reason):up(); end |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
798 if password then pr:tag("password"):text(password):up(); end |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
799 for nick, occupant in pairs(self._occupants) do |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
800 pr.attr.from = nick; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
801 for jid in pairs(occupant.sessions) do |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
802 pr.attr.to = jid; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
803 self:_route_stanza(pr); |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
804 self._jid_nick[jid] = nil; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
805 end |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
806 self._occupants[nick] = nil; |
|
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
807 end |
|
3259
a5b9209efb23
MUC: Replaced direct access of room's internal persistence state with :set_persistent(boolean) and :is_persistent() in various functions.
Waqas Hussain <waqas20@gmail.com>
parents:
3258
diff
changeset
|
808 self:set_persistent(false); |
|
5577
8b09b0d068d4
mod_muc: Fire muc-room-created and muc-room-destroyed events (thanks nik)
Matthew Wild <mwild1@gmail.com>
parents:
5542
diff
changeset
|
809 module:fire_event("muc-room-destroyed", { room = self }); |
|
7684
65ba769d9f05
MUC: Return 'true' from room:destroy() so that use from the telnet console says 'OK'
Kim Alvefur <zash@zash.se>
parents:
7443
diff
changeset
|
810 return true; |
|
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
811 end |
|
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
812 |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
813 function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc |
| 1734 | 814 local type = stanza.attr.type; |
|
1745
15039fac3693
MUC: Some fixes for minor bugs in IQ handling.
Waqas Hussain <waqas20@gmail.com>
parents:
1744
diff
changeset
|
815 local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns; |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
816 if stanza.name == "iq" then |
|
5335
bb81c13d2c6f
MUC: Always return <service-unavailable/> when a node is present in service discovery requests.
Waqas Hussain <waqas20@gmail.com>
parents:
5334
diff
changeset
|
817 if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" and not stanza.tags[1].attr.node then |
|
bb81c13d2c6f
MUC: Always return <service-unavailable/> when a node is present in service discovery requests.
Waqas Hussain <waqas20@gmail.com>
parents:
5334
diff
changeset
|
818 origin.send(self:get_disco_info(stanza)); |
|
bb81c13d2c6f
MUC: Always return <service-unavailable/> when a node is present in service discovery requests.
Waqas Hussain <waqas20@gmail.com>
parents:
5334
diff
changeset
|
819 elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" and not stanza.tags[1].attr.node then |
|
2503
bb6b0bd7f2cf
MUC: Converted some local functions into methods.
Waqas Hussain <waqas20@gmail.com>
parents:
2416
diff
changeset
|
820 origin.send(self:get_disco_items(stanza)); |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
821 elseif xmlns == "http://jabber.org/protocol/muc#admin" then |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
822 local actor = stanza.attr.from; |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
823 local affiliation = self:get_affiliation(actor); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
824 local current_nick = self._jid_nick[actor]; |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
825 local role = current_nick and self._occupants[current_nick].role or self:get_default_role(affiliation); |
|
8791
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
826 if type == "set" then |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
827 local at_least_one_item_provided = false; |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
828 local callback = function() origin.send(st.reply(stanza)); end |
|
8791
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
829 |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
830 -- Gather all changes to affiliations and roles |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
831 local jid_affiliation = {}; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
832 local jidnick_role = {}; |
|
8791
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
833 for item in stanza.tags[1]:childtags("item") do |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
834 at_least_one_item_provided = true; |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
835 |
|
1862
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1826
diff
changeset
|
836 if item.attr.jid then -- Validate provided JID |
|
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1826
diff
changeset
|
837 item.attr.jid = jid_prep(item.attr.jid); |
|
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1826
diff
changeset
|
838 if not item.attr.jid then |
|
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1826
diff
changeset
|
839 origin.send(st.error_reply(stanza, "modify", "jid-malformed")); |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
840 return; |
|
1862
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1826
diff
changeset
|
841 end |
|
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1826
diff
changeset
|
842 end |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
843 if not item.attr.jid and item.attr.nick then -- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
844 local occupant = self._occupants[self.jid.."/"..item.attr.nick]; |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
845 if occupant then item.attr.jid = occupant.jid; end |
|
2864
1ce0e2ceb419
MUC: Allow role changes based on JIDs.
Waqas Hussain <waqas20@gmail.com>
parents:
2845
diff
changeset
|
846 elseif not item.attr.nick and item.attr.jid then |
|
1ce0e2ceb419
MUC: Allow role changes based on JIDs.
Waqas Hussain <waqas20@gmail.com>
parents:
2845
diff
changeset
|
847 local nick = self._jid_nick[item.attr.jid]; |
|
1ce0e2ceb419
MUC: Allow role changes based on JIDs.
Waqas Hussain <waqas20@gmail.com>
parents:
2845
diff
changeset
|
848 if nick then item.attr.nick = select(3, jid_split(nick)); end |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
849 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
850 |
|
2006
0c62bed9d338
MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc).
Waqas Hussain <waqas20@gmail.com>
parents:
2005
diff
changeset
|
851 local reason = item.tags[1] and item.tags[1].name == "reason" and #item.tags[1] == 1 and item.tags[1][1]; |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
852 if item.attr.affiliation and item.attr.jid and not item.attr.role then |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
853 jid_affiliation[item.attr.jid] = { ["affiliation"] = item.attr.affiliation, ["reason"] = reason }; |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
854 elseif item.attr.role and item.attr.nick and not item.attr.affiliation then |
|
8835
a7221ada9368
MUC: fix set_role invocation
Jonas Wielicki <jonas@wielicki.name>
parents:
8795
diff
changeset
|
855 jidnick_role[self.jid.."/"..item.attr.nick] = { ["role"] = item.attr.role, ["reason"] = reason }; |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
856 else |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
857 origin.send(st.error_reply(stanza, "cancel", "bad-request")); |
|
8791
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
858 return; |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
859 end |
|
8791
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
860 end |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
861 |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
862 if not at_least_one_item_provided then |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
863 origin.send(st.error_reply(stanza, "cancel", "bad-request")); |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
864 return; |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
865 else |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
866 local can_set_affiliations, errtype_aff, err_aff = self:can_set_affiliations(actor, jid_affiliation) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
867 local can_set_roles, errtype_role, err_role = self:can_set_roles(actor, jidnick_role) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
868 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
869 if can_set_affiliations and can_set_roles then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
870 local nb_affiliation_changes = 0; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
871 for _ in pairs(jid_affiliation) do nb_affiliation_changes = nb_affiliation_changes + 1; end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
872 local nb_role_changes = 0; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
873 for _ in pairs(jidnick_role) do nb_role_changes = nb_role_changes + 1; end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
874 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
875 if nb_affiliation_changes > 0 and nb_role_changes > 0 then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
876 origin.send(st.error_reply(stanza, "cancel", "bad-request")); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
877 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
878 if nb_affiliation_changes > 0 then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
879 self:set_affiliations(actor, jid_affiliation, callback); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
880 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
881 if nb_role_changes > 0 then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
882 self:set_roles(actor, jidnick_role, callback); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
883 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
884 else |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
885 if not can_set_affiliations then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
886 origin.send(st.error_reply(stanza, errtype_aff, err_aff)); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
887 elseif not can_set_roles then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
888 origin.send(st.error_reply(stanza, errtype_role, err_role)); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
889 else |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
890 origin.send(st.error_reply(stanza, "cancel", "bad-request")); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
891 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
892 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
893 return; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
894 end |
|
8791
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
895 end |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
896 elseif type == "get" then |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
897 local item = stanza.tags[1].tags[1]; |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
898 if item and item.name == "item" then |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
899 local _aff = item.attr.affiliation; |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
900 local _rol = item.attr.role; |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
901 if _aff and not _rol then |
|
7443
4a178edc9847
MUC: Allow members (or above) in members-only non-anonymous rooms to see the member list (fixes #445)
Kim Alvefur <zash@zash.se>
parents:
7385
diff
changeset
|
902 if affiliation == "owner" or (affiliation == "admin" and _aff ~= "owner" and _aff ~= "admin") |
|
4a178edc9847
MUC: Allow members (or above) in members-only non-anonymous rooms to see the member list (fixes #445)
Kim Alvefur <zash@zash.se>
parents:
7385
diff
changeset
|
903 or (affiliation and affiliation ~= "outcast" and self:get_members_only() and self:get_whois() == "anyone") then |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
904 local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin"); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
905 for jid, affiliation in pairs(self._affiliations) do |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
906 if affiliation == _aff then |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
907 reply:tag("item", {affiliation = _aff, jid = jid}):up(); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
908 end |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
909 end |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
910 origin.send(reply); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
911 else |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
912 origin.send(st.error_reply(stanza, "auth", "forbidden")); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
913 end |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
914 elseif _rol and not _aff then |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
915 if role == "moderator" then |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
916 -- TODO allow admins and owners not in room? Provide read-only access to everyone who can see the participants anyway? |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
917 if _rol == "none" then _rol = nil; end |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
918 local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin"); |
|
2845
f76139aa7cd5
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)
Matthew Wild <mwild1@gmail.com>
parents:
2174
diff
changeset
|
919 for occupant_jid, occupant in pairs(self._occupants) do |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
920 if occupant.role == _rol then |
|
2845
f76139aa7cd5
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)
Matthew Wild <mwild1@gmail.com>
parents:
2174
diff
changeset
|
921 reply:tag("item", { |
|
f76139aa7cd5
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)
Matthew Wild <mwild1@gmail.com>
parents:
2174
diff
changeset
|
922 nick = select(3, jid_split(occupant_jid)), |
|
f76139aa7cd5
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)
Matthew Wild <mwild1@gmail.com>
parents:
2174
diff
changeset
|
923 role = _rol or "none", |
|
f76139aa7cd5
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)
Matthew Wild <mwild1@gmail.com>
parents:
2174
diff
changeset
|
924 affiliation = occupant.affiliation or "none", |
|
f76139aa7cd5
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)
Matthew Wild <mwild1@gmail.com>
parents:
2174
diff
changeset
|
925 jid = occupant.jid |
|
f76139aa7cd5
MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo)
Matthew Wild <mwild1@gmail.com>
parents:
2174
diff
changeset
|
926 }):up(); |
|
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
927 end |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
928 end |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
929 origin.send(reply); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
930 else |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
931 origin.send(st.error_reply(stanza, "auth", "forbidden")); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
932 end |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
933 else |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
934 origin.send(st.error_reply(stanza, "cancel", "bad-request")); |
|
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
935 end |
|
8791
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
936 else |
|
8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
Lennart Sauerbeck <devel@lennart.sauerbeck.org>
parents:
8590
diff
changeset
|
937 origin.send(st.error_reply(stanza, "cancel", "bad-request")); |
|
1744
265863a5612b
MUC: Added support for requesting various lists (owner, admin, voice, etc).
Waqas Hussain <waqas20@gmail.com>
parents:
1743
diff
changeset
|
938 end |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
939 end |
|
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
940 elseif xmlns == "http://jabber.org/protocol/muc#owner" and (type == "get" or type == "set") and stanza.tags[1].name == "query" then |
|
2216
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
941 if self:get_affiliation(stanza.attr.from) ~= "owner" then |
|
4201
9a8d2baf7a9c
MUC: Add a textual error message when the user isn't allowed to get/set config form.
Waqas Hussain <waqas20@gmail.com>
parents:
4119
diff
changeset
|
942 origin.send(st.error_reply(stanza, "auth", "forbidden", "Only owners can configure rooms")); |
|
2216
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
943 elseif stanza.attr.type == "get" then |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
944 self:send_form(origin, stanza); |
|
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
945 elseif stanza.attr.type == "set" then |
|
2217
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
946 local child = stanza.tags[1].tags[1]; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
947 if not child then |
|
4326
6c082bf9bf0f
MUC: Change error type of badly-formatted stanza from 'auth' to 'modify' (thanks Andrew)
Matthew Wild <mwild1@gmail.com>
parents:
4266
diff
changeset
|
948 origin.send(st.error_reply(stanza, "modify", "bad-request")); |
|
2217
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
949 elseif child.name == "destroy" then |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
950 local newjid = child.attr.jid; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
951 local reason, password; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
952 for _,tag in ipairs(child.tags) do |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
953 if tag.name == "reason" then |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
954 reason = #tag.tags == 0 and tag[1]; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
955 elseif tag.name == "password" then |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
956 password = #tag.tags == 0 and tag[1]; |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
957 end |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
958 end |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
959 self:destroy(newjid, reason, password); |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
960 origin.send(st.reply(stanza)); |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
961 else |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
962 self:process_form(origin, stanza); |
|
838f6d546177
MUC: Added support for the room-destroy owner use case.
Waqas Hussain <waqas20@gmail.com>
parents:
2216
diff
changeset
|
963 end |
|
2216
dbbb5ed41365
MUC: Slightly refactored form processing.
Waqas Hussain <waqas20@gmail.com>
parents:
2174
diff
changeset
|
964 end |
|
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
965 elseif type == "set" or type == "get" then |
|
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
966 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
967 end |
| 1734 | 968 elseif stanza.name == "message" and type == "groupchat" then |
|
5613
f3166adab512
mod_muc: Remove unused variable
Matthew Wild <mwild1@gmail.com>
parents:
5612
diff
changeset
|
969 local from = stanza.attr.from; |
| 1734 | 970 local current_nick = self._jid_nick[from]; |
|
2173
f9af31dbfeb8
MUC: Prevent visitors from broadcasting messages.
Waqas Hussain <waqas20@gmail.com>
parents:
2172
diff
changeset
|
971 local occupant = self._occupants[current_nick]; |
|
f9af31dbfeb8
MUC: Prevent visitors from broadcasting messages.
Waqas Hussain <waqas20@gmail.com>
parents:
2172
diff
changeset
|
972 if not occupant then -- not in room |
| 1734 | 973 origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); |
|
2173
f9af31dbfeb8
MUC: Prevent visitors from broadcasting messages.
Waqas Hussain <waqas20@gmail.com>
parents:
2172
diff
changeset
|
974 elseif occupant.role == "visitor" then |
|
4999
d5a3c5c1873c
mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with type 'cancel' - fixes #303
Matthew Wild <mwild1@gmail.com>
parents:
4876
diff
changeset
|
975 origin.send(st.error_reply(stanza, "auth", "forbidden")); |
| 1734 | 976 else |
| 977 local from = stanza.attr.from; | |
| 978 stanza.attr.from = current_nick; | |
|
5611
e043d4d65423
mod_muc: Replace getText() with get_child_text(), 1 insertion, 12 deletions!
Matthew Wild <mwild1@gmail.com>
parents:
5601
diff
changeset
|
979 local subject = stanza:get_child_text("subject"); |
| 1734 | 980 if subject then |
|
4119
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
981 if occupant.role == "moderator" or |
|
813adb81d7da
MUC: Add option to allow participants to change the subject.
Kim Alvefur <zash@zash.se>
parents:
3989
diff
changeset
|
982 ( self._data.changesubject and occupant.role == "participant" ) then -- and participant |
|
5618
4fd2708fe8df
mod_muc: Remove some old TODO comments
Matthew Wild <mwild1@gmail.com>
parents:
5614
diff
changeset
|
983 self:set_subject(current_nick, subject); |
|
2174
13375e6c4ecb
MUC: Only allow moderators to change the room subject.
Waqas Hussain <waqas20@gmail.com>
parents:
2173
diff
changeset
|
984 else |
|
13375e6c4ecb
MUC: Only allow moderators to change the room subject.
Waqas Hussain <waqas20@gmail.com>
parents:
2173
diff
changeset
|
985 stanza.attr.from = from; |
|
4999
d5a3c5c1873c
mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with type 'cancel' - fixes #303
Matthew Wild <mwild1@gmail.com>
parents:
4876
diff
changeset
|
986 origin.send(st.error_reply(stanza, "auth", "forbidden")); |
|
2174
13375e6c4ecb
MUC: Only allow moderators to change the room subject.
Waqas Hussain <waqas20@gmail.com>
parents:
2173
diff
changeset
|
987 end |
| 1734 | 988 else |
|
5397
ed55a48270be
mod_muc/muc.lib: Don't add messages without a body (such as chat state notifications) to the room history (thanks louiz’, Link Mauve, poezio and all its users)
Matthew Wild <mwild1@gmail.com>
parents:
5335
diff
changeset
|
989 self:broadcast_message(stanza, self:get_historylength() > 0 and stanza:get_child("body")); |
| 1734 | 990 end |
|
2172
84dd0fada45b
MUC: Improved handling of incoming groupchat messages (state preserved for possible later use).
Waqas Hussain <waqas20@gmail.com>
parents:
2064
diff
changeset
|
991 stanza.attr.from = from; |
| 1734 | 992 end |
|
1999
05054e360d89
MUC: Improved handling of error stanzas and made error messages concise.
Waqas Hussain <waqas20@gmail.com>
parents:
1998
diff
changeset
|
993 elseif stanza.name == "message" and type == "error" and is_kickable_error(stanza) then |
|
1768
802c40384dd0
MUC: Don't kick on errors in private messages.
Waqas Hussain <waqas20@gmail.com>
parents:
1764
diff
changeset
|
994 local current_nick = self._jid_nick[stanza.attr.from]; |
|
802c40384dd0
MUC: Don't kick on errors in private messages.
Waqas Hussain <waqas20@gmail.com>
parents:
1764
diff
changeset
|
995 log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid); |
|
2529
7968e8b3ecf9
MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast
Matthew Wild <mwild1@gmail.com>
parents:
2528
diff
changeset
|
996 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable |
| 1734 | 997 elseif stanza.name == "presence" then -- hack - some buggy clients send presence updates to the room rather than their nick |
| 998 local to = stanza.attr.to; | |
| 999 local current_nick = self._jid_nick[stanza.attr.from]; | |
| 1000 if current_nick then | |
| 1001 stanza.attr.to = current_nick; | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1002 self:handle_to_occupant(origin, stanza); |
| 1734 | 1003 stanza.attr.to = to; |
| 1004 elseif type ~= "error" and type ~= "result" then | |
| 1005 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); | |
| 1006 end | |
|
5241
4516e6bd51b4
MUC: Support invite messages when stanza type is explicitly set to "normal" or to an unknown value.
Waqas Hussain <waqas20@gmail.com>
parents:
5195
diff
changeset
|
1007 elseif stanza.name == "message" and not(type == "chat" or type == "error" or type == "groupchat" or type == "headline") and #stanza.tags == 1 |
|
4516e6bd51b4
MUC: Support invite messages when stanza type is explicitly set to "normal" or to an unknown value.
Waqas Hussain <waqas20@gmail.com>
parents:
5195
diff
changeset
|
1008 and self._jid_nick[stanza.attr.from] and stanza.tags[1].name == "x" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#user" then |
|
2005
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1009 local x = stanza.tags[1]; |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1010 local payload = (#x.tags == 1 and x.tags[1]); |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1011 if payload and payload.name == "invite" and payload.attr.to then |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1012 local _from, _to = stanza.attr.from, stanza.attr.to; |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1013 local _invitee = jid_prep(payload.attr.to); |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1014 if _invitee then |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1015 local _reason = payload.tags[1] and payload.tags[1].name == 'reason' and #payload.tags[1].tags == 0 and payload.tags[1][1]; |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1016 local invite = st.message({from = _to, to = _invitee, id = stanza.attr.id}) |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1017 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'}) |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1018 :tag('invite', {from=_from}) |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1019 :tag('reason'):text(_reason or ""):up() |
|
3247
ee8aaca3226c
MUC: Include a <password/> element in invites from password protected rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3246
diff
changeset
|
1020 :up(); |
|
ee8aaca3226c
MUC: Include a <password/> element in invites from password protected rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3246
diff
changeset
|
1021 if self:get_password() then |
|
ee8aaca3226c
MUC: Include a <password/> element in invites from password protected rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3246
diff
changeset
|
1022 invite:tag("password"):text(self:get_password()):up(); |
|
ee8aaca3226c
MUC: Include a <password/> element in invites from password protected rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3246
diff
changeset
|
1023 end |
|
ee8aaca3226c
MUC: Include a <password/> element in invites from password protected rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
3246
diff
changeset
|
1024 invite:up() |
|
2005
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1025 :tag('x', {xmlns="jabber:x:conference", jid=_to}) -- COMPAT: Some older clients expect this |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1026 :text(_reason or "") |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1027 :up() |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1028 :tag('body') -- Add a plain message for clients which don't support invites |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1029 :text(_from..' invited you to the room '.._to..(_reason and (' ('.._reason..')') or "")) |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1030 :up(); |
|
5580
db5d1a350cc7
mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
1031 if self:get_members_only() and not self:get_affiliation(_invitee) then |
|
3611
d58da6bb8a77
MUC: Grant membership when inviteing someone into a members-only room.
Kim Alvefur <zash@zash.se>
parents:
3593
diff
changeset
|
1032 log("debug", "%s invited %s into members only room %s, granting membership", _from, _invitee, _to); |
|
d58da6bb8a77
MUC: Grant membership when inviteing someone into a members-only room.
Kim Alvefur <zash@zash.se>
parents:
3593
diff
changeset
|
1033 self:set_affiliation(_from, _invitee, "member", nil, "Invited by " .. self._jid_nick[_from]) |
|
d58da6bb8a77
MUC: Grant membership when inviteing someone into a members-only room.
Kim Alvefur <zash@zash.se>
parents:
3593
diff
changeset
|
1034 end |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1035 self:_route_stanza(invite); |
|
2005
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1036 else |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1037 origin.send(st.error_reply(stanza, "cancel", "jid-malformed")); |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1038 end |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1039 else |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1040 origin.send(st.error_reply(stanza, "cancel", "bad-request")); |
|
478ba7e85862
MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients.
Waqas Hussain <waqas20@gmail.com>
parents:
1999
diff
changeset
|
1041 end |
| 1734 | 1042 else |
| 1043 if type == "error" or type == "result" then return; end | |
| 1044 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); | |
| 1045 end | |
| 1046 end | |
| 1047 | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1048 function room_mt:handle_stanza(origin, stanza) |
| 1734 | 1049 local to_node, to_host, to_resource = jid_split(stanza.attr.to); |
| 1050 if to_resource then | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1051 self:handle_to_occupant(origin, stanza); |
| 1734 | 1052 else |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1053 self:handle_to_room(origin, stanza); |
| 1734 | 1054 end |
| 1055 end | |
| 1056 | |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1057 function room_mt:route_stanza(stanza) end -- Replace with a routing function, e.g., function(room, stanza) core_route_stanza(origin, stanza); end |
|
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1058 |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1059 function room_mt:get_affiliation(jid) |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1060 local node, host, resource = jid_split(jid); |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1061 local bare = node and node.."@"..host or host; |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1062 local result = self._affiliations[bare]; -- Affiliations are granted, revoked, and maintained based on the user's bare JID. |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1063 if not result and self._affiliations[host] == "outcast" then result = "outcast"; end -- host banned |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1064 return result; |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1065 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1066 --- Checks whether the given affiliation changes in jid_affiliation can be applied by actor. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1067 -- Note: Empty tables can always be applied and won't have any effect. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1068 function room_mt:can_set_affiliations(actor, jid_affiliation) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1069 local actor_affiliation; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1070 if actor ~= true then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1071 actor_affiliation = self:get_affiliation(actor); |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1072 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1073 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1074 -- First let's see if there are any problems with the affiliations given |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1075 -- in jid_affiliation |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1076 for jid, value in pairs(jid_affiliation) do |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1077 local affiliation = value["affiliation"]; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1078 |
|
8836
564e897f0790
MUC: reject non-bare JIDs in set_affiliation requests with not-acceptable
Jonas Wielicki <jonas@wielicki.name>
parents:
8835
diff
changeset
|
1079 if jid ~= jid_bare(jid) then |
|
564e897f0790
MUC: reject non-bare JIDs in set_affiliation requests with not-acceptable
Jonas Wielicki <jonas@wielicki.name>
parents:
8835
diff
changeset
|
1080 return false, "modify", "not-acceptable"; |
|
564e897f0790
MUC: reject non-bare JIDs in set_affiliation requests with not-acceptable
Jonas Wielicki <jonas@wielicki.name>
parents:
8835
diff
changeset
|
1081 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1082 jid = jid_bare(jid); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1083 if affiliation == "none" then affiliation = nil; end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1084 if affiliation and affiliation ~= "outcast" and affiliation ~= "owner" and affiliation ~= "admin" and affiliation ~= "member" then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1085 return false, "modify", "not-acceptable"; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1086 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1087 |
|
4357
d6928b78c548
MUC: Allow affiliation change when argument actor==true in room:set_affiliation().
Waqas Hussain <waqas20@gmail.com>
parents:
4326
diff
changeset
|
1088 local target_affiliation = self:get_affiliation(jid); |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1089 if target_affiliation == affiliation then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1090 -- no change, no error checking necessary |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1091 else |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1092 if actor ~= true and actor_affiliation ~= "owner" then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1093 if affiliation == "owner" or affiliation == "admin" or actor_affiliation ~= "admin" or target_affiliation == "owner" or target_affiliation == "admin" then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1094 return false, "cancel", "not-allowed"; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1095 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1096 elseif target_affiliation == "owner" and jid_bare(actor) == jid then -- self change |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1097 local is_last = true; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1098 for j, aff in pairs(self._affiliations) do if j ~= jid and aff == "owner" then is_last = false; break; end end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1099 if is_last then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1100 return false, "cancel", "conflict"; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1101 end |
|
4357
d6928b78c548
MUC: Allow affiliation change when argument actor==true in room:set_affiliation().
Waqas Hussain <waqas20@gmail.com>
parents:
4326
diff
changeset
|
1102 end |
|
4202
dff7df4a191b
MUC: Don't limit affiliation changes to owners, and allow owners to remove themselves if they are not the last owner.
Waqas Hussain <waqas20@gmail.com>
parents:
4201
diff
changeset
|
1103 end |
|
dff7df4a191b
MUC: Don't limit affiliation changes to owners, and allow owners to remove themselves if they are not the last owner.
Waqas Hussain <waqas20@gmail.com>
parents:
4201
diff
changeset
|
1104 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1105 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1106 return true; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1107 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1108 --- Updates the room affiliations by applying the ones given here. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1109 -- Takes the affiliations given in jid_affiliation and applies them to |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1110 -- the room, overwriting a potentially existing affiliation for any given |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1111 -- jid. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1112 -- @param jid_affiliation A table associating a jid with a table consisting |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1113 -- of two subkeys: `affilation` and `reason`. The jids |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1114 -- within must not be malformed. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1115 function room_mt:set_affiliations(actor, jid_affiliation, callback) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1116 local can_set, err_type, err_condition = self:can_set_affiliations(actor, jid_affiliation) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1117 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1118 if not can_set then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1119 return false, err_type, err_condition; |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1120 end |
|
8176
f07cfc9b9b36
MUC: Add some comments attempting to explain what presence and <x> tag goes where
Kim Alvefur <zash@zash.se>
parents:
8175
diff
changeset
|
1121 -- Your own presence should have status 110 |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1122 local modified_nicks = {}; |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1123 local nb_modified_nicks = 0; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1124 -- Now we can be sure that jid_affiliation causes no problems |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1125 -- We can actually set them |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1126 for jid, value in pairs(jid_affiliation) do |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1127 local affiliation = value["affiliation"]; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1128 local reason = value["reason"]; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1129 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1130 self._affiliations[jid] = affiliation; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1131 local role = self:get_default_role(affiliation); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1132 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"}) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1133 :tag("item", {affiliation=affiliation or "none", role=role or "none"}) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1134 :tag("reason"):text(reason or ""):up() |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1135 :up(); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1136 local self_x = st.clone(x); |
|
8837
1b10802a770e
MUC: correctly emit <status/> tags
Jonas Wielicki <jonas@wielicki.name>
parents:
8836
diff
changeset
|
1137 self_x:tag("status", {code="110"}):up(); |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1138 local presence_type = nil; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1139 if not role then -- getting kicked |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1140 presence_type = "unavailable"; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1141 if affiliation == "outcast" then |
|
8795
aaff40ec7001
MUC: Restore status codes on presence sent to occupant when their affiliation changes (thanks jonasw)
Matthew Wild <mwild1@gmail.com>
parents:
8793
diff
changeset
|
1142 -- banned |
|
aaff40ec7001
MUC: Restore status codes on presence sent to occupant when their affiliation changes (thanks jonasw)
Matthew Wild <mwild1@gmail.com>
parents:
8793
diff
changeset
|
1143 x:tag("status", {code="301"}):up(); |
|
aaff40ec7001
MUC: Restore status codes on presence sent to occupant when their affiliation changes (thanks jonasw)
Matthew Wild <mwild1@gmail.com>
parents:
8793
diff
changeset
|
1144 self_x:tag("status", {code="301"}):up(); |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1145 else |
|
8795
aaff40ec7001
MUC: Restore status codes on presence sent to occupant when their affiliation changes (thanks jonasw)
Matthew Wild <mwild1@gmail.com>
parents:
8793
diff
changeset
|
1146 -- affiliation change |
|
aaff40ec7001
MUC: Restore status codes on presence sent to occupant when their affiliation changes (thanks jonasw)
Matthew Wild <mwild1@gmail.com>
parents:
8793
diff
changeset
|
1147 x:tag("status", {code="321"}):up(); |
|
aaff40ec7001
MUC: Restore status codes on presence sent to occupant when their affiliation changes (thanks jonasw)
Matthew Wild <mwild1@gmail.com>
parents:
8793
diff
changeset
|
1148 self_x:tag("status", {code="321"}):up(); |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1149 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1150 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1151 for nick, occupant in pairs(self._occupants) do |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1152 if jid_bare(occupant.jid) == jid then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1153 if not role then -- getting kicked |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1154 self._occupants[nick] = nil; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1155 else |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1156 occupant.affiliation, occupant.role = affiliation, role; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1157 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1158 for jid,pres in pairs(occupant.sessions) do -- remove for all sessions of the nick |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1159 if not role then self._jid_nick[jid] = nil; end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1160 local p = st.clone(pres); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1161 p.attr.from = nick; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1162 p.attr.type = presence_type; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1163 p.attr.to = jid; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1164 self:_route_stanza(p); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1165 if occupant.jid == jid then |
|
8176
f07cfc9b9b36
MUC: Add some comments attempting to explain what presence and <x> tag goes where
Kim Alvefur <zash@zash.se>
parents:
8175
diff
changeset
|
1166 -- Broadcast this presence to everyone else later, with the public <x> variant |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1167 local bp = st.clone(p); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1168 bp:add_child(x); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1169 modified_nicks[nick] = bp; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1170 nb_modified_nicks = nb_modified_nicks + 1; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1171 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1172 p:add_child(self_x); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1173 self:_route_stanza(p); |
|
8175
b187da5b7e8f
MUC: Include status code 110 on affiliation changes (see #765)
Kim Alvefur <zash@zash.se>
parents:
8174
diff
changeset
|
1174 end |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1175 end |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1176 end |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1177 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1178 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1179 if nb_modified_nicks > 0 then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1180 if self.save then self:save(); end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1181 if callback then callback(); end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1182 end |
|
3631
138f385e8246
MUC: Include the user's current presence contents when broadcasting an affiliation change.
Waqas Hussain <waqas20@gmail.com>
parents:
3629
diff
changeset
|
1183 for nick,p in pairs(modified_nicks) do |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1184 p.attr.from = nick; |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1185 self:broadcast_except_nick(p, nick); |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1186 end |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1187 return true; |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1188 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1189 function room_mt:set_affiliation(actor, jid, affiliation, callback, reason) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1190 return self.set_affiliations(actor, { [jid] = { ["affiliation"] = affiliation, ["reason"] = reason } }, callback) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1191 end |
| 1734 | 1192 |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1193 function room_mt:get_role(nick) |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1194 local session = self._occupants[nick]; |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1195 return session and session.role or nil; |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1196 end |
|
3279
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1197 function room_mt:can_set_role(actor_jid, occupant_jid, role) |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1198 local occupant = self._occupants[occupant_jid]; |
|
5680
24b044f6e06d
mod_muc: Fix incorrect variable name
Matthew Wild <mwild1@gmail.com>
parents:
5577
diff
changeset
|
1199 if not occupant or not actor_jid then return nil, "modify", "not-acceptable"; end |
|
3279
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1200 |
|
5542
329ebdfb39a2
MUC: Allow actor == true to set roles (like affiliations)
Matthew Wild <mwild1@gmail.com>
parents:
5541
diff
changeset
|
1201 if actor_jid == true then return true; end |
|
329ebdfb39a2
MUC: Allow actor == true to set roles (like affiliations)
Matthew Wild <mwild1@gmail.com>
parents:
5541
diff
changeset
|
1202 |
|
329ebdfb39a2
MUC: Allow actor == true to set roles (like affiliations)
Matthew Wild <mwild1@gmail.com>
parents:
5541
diff
changeset
|
1203 local actor = self._occupants[self._jid_nick[actor_jid]]; |
|
6049
6d410ffd6e13
MUC: Fixed traceback when a JID not in a room requested a role change for an occupant.
Waqas Hussain <waqas20@gmail.com>
parents:
5853
diff
changeset
|
1204 if actor and actor.role == "moderator" then |
|
3279
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1205 if occupant.affiliation ~= "owner" and occupant.affiliation ~= "admin" then |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1206 if actor.affiliation == "owner" or actor.affiliation == "admin" then |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1207 return true; |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1208 elseif occupant.role ~= "moderator" and role ~= "moderator" then |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1209 return true; |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1210 end |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1211 end |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1212 end |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1213 return nil, "cancel", "not-allowed"; |
|
8b0a4a7d2c6e
MUC: Added room:can_set_role().
Waqas Hussain <waqas20@gmail.com>
parents:
3264
diff
changeset
|
1214 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1215 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1216 --- Checks whether the given role changes in jidnick_role can be applied by actor. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1217 -- Note: Empty tables can always be applied and won't have any effect. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1218 function room_mt:can_set_roles(actor, jidnick_role) |
|
8835
a7221ada9368
MUC: fix set_role invocation
Jonas Wielicki <jonas@wielicki.name>
parents:
8795
diff
changeset
|
1219 for jidnick, role_info in pairs(jidnick_role) do |
|
a7221ada9368
MUC: fix set_role invocation
Jonas Wielicki <jonas@wielicki.name>
parents:
8795
diff
changeset
|
1220 local role = role_info["role"]; |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1221 if role == "none" then role = nil; end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1222 if role and role ~= "moderator" and role ~= "participant" and role ~= "visitor" then return false, "modify", "not-acceptable"; end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1223 local can_set, err_type, err_condition = self:can_set_role(actor, jidnick, role) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1224 if not can_set then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1225 return false, err_type, err_condition; |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1226 end |
|
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1227 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1228 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1229 return true; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1230 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1231 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1232 --- Updates the room roles by applying the ones given here. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1233 -- Takes the roles given in jidnick_role and applies them to |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1234 -- the room, overwriting a potentially existing role for any given |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1235 -- jid. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1236 -- @param jidnick_role A table associating a jid/nick with a table consisting |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1237 -- of two subkeys: `role` and `reason`. The jids within |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1238 -- must not be malformed. |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1239 function room_mt:set_roles(actor, jidnick_role, callback) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1240 local allowed, err_type, err_condition = self:can_set_roles(actor, jidnick_role); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1241 if not allowed then return allowed, err_type, err_condition; end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1242 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1243 local modified_nicks = {}; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1244 local nb_modified_nicks = 0; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1245 for jidnick, value in pairs(jidnick_role) do |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1246 local occupant_jid = jidnick; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1247 local role = value["role"]; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1248 local reason = value["reason"]; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1249 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1250 local occupant = self._occupants[occupant_jid]; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1251 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"}) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1252 :tag("item", {affiliation=occupant.affiliation or "none", nick=select(3, jid_split(occupant_jid)), role=role or "none"}) |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1253 :tag("reason"):text(reason or ""):up() |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1254 :up(); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1255 local presence_type = nil; |
|
8835
a7221ada9368
MUC: fix set_role invocation
Jonas Wielicki <jonas@wielicki.name>
parents:
8795
diff
changeset
|
1256 if not role or role == "none" then -- kick |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1257 presence_type = "unavailable"; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1258 self._occupants[occupant_jid] = nil; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1259 for jid in pairs(occupant.sessions) do -- remove for all sessions of the nick |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1260 self._jid_nick[jid] = nil; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1261 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1262 x:tag("status", {code = "307"}):up(); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1263 else |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1264 occupant.role = role; |
|
8174
260886554512
MUC: Include status code 110 on role change notifications (fixes #765))
Kim Alvefur <zash@zash.se>
parents:
7997
diff
changeset
|
1265 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1266 local self_x = st.clone(x); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1267 self_x:tag("status", {code = "110"}):up(); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1268 local bp; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1269 for jid,pres in pairs(occupant.sessions) do -- send to all sessions of the nick |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1270 local p = st.clone(pres); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1271 p.attr.from = occupant_jid; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1272 p.attr.type = presence_type; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1273 p.attr.to = jid; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1274 self:_route_stanza(p); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1275 if occupant.jid == jid then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1276 bp = st.clone(p); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1277 bp:add_child(x); |
|
8835
a7221ada9368
MUC: fix set_role invocation
Jonas Wielicki <jonas@wielicki.name>
parents:
8795
diff
changeset
|
1278 modified_nicks[occupant_jid] = bp; |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1279 nb_modified_nicks = nb_modified_nicks + 1; |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1280 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1281 p:add_child(self_x); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1282 self:route_stanza(p); |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1283 end |
|
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
1284 end |
|
8792
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1285 |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1286 if nb_modified_nicks > 0 then |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1287 if callback then callback(); end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1288 end |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1289 for nick,p in pairs(modified_nicks) do |
|
c2b99fa134b3
MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)
Matthew Wild <mwild1@gmail.com>
parents:
8791
diff
changeset
|
1290 self:broadcast_except_nick(p, nick); |
|
3632
d82189efecc0
MUC: Include the user's current presence contents when broadcasting a role change.
Waqas Hussain <waqas20@gmail.com>
parents:
3631
diff
changeset
|
1291 end |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1292 return true; |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1293 end |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1294 |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1295 function room_mt:_route_stanza(stanza) |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1296 local muc_child; |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1297 local to_occupant = self._occupants[self._jid_nick[stanza.attr.to]]; |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1298 local from_occupant = self._occupants[stanza.attr.from]; |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1299 if stanza.name == "presence" then |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1300 if to_occupant and from_occupant then |
|
2411
c2b6c55201af
Add support for non-anonymous MUC rooms
Rob Hoelz <rob@hoelzro.net>
parents:
2217
diff
changeset
|
1301 if self._data.whois == 'anyone' then |
|
2416
89be536aae25
mod_muc/muc.lib: Use stanza:get_child() to locate MUC child element
Matthew Wild <mwild1@gmail.com>
parents:
2412
diff
changeset
|
1302 muc_child = stanza:get_child("x", "http://jabber.org/protocol/muc#user"); |
|
2411
c2b6c55201af
Add support for non-anonymous MUC rooms
Rob Hoelz <rob@hoelzro.net>
parents:
2217
diff
changeset
|
1303 else |
|
c2b6c55201af
Add support for non-anonymous MUC rooms
Rob Hoelz <rob@hoelzro.net>
parents:
2217
diff
changeset
|
1304 if to_occupant.role == "moderator" or jid_bare(to_occupant.jid) == jid_bare(from_occupant.jid) then |
|
2416
89be536aae25
mod_muc/muc.lib: Use stanza:get_child() to locate MUC child element
Matthew Wild <mwild1@gmail.com>
parents:
2412
diff
changeset
|
1305 muc_child = stanza:get_child("x", "http://jabber.org/protocol/muc#user"); |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1306 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1307 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1308 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1309 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1310 if muc_child then |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1311 for _, item in pairs(muc_child.tags) do |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1312 if item.name == "item" then |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1313 if from_occupant == to_occupant then |
|
8838
6d4b0895f76d
MUC: ensure that x/item/@jid is always a bare JID
Jonas Wielicki <jonas@wielicki.name>
parents:
8837
diff
changeset
|
1314 item.attr.jid = jid_bare(stanza.attr.to); |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1315 else |
|
8838
6d4b0895f76d
MUC: ensure that x/item/@jid is always a bare JID
Jonas Wielicki <jonas@wielicki.name>
parents:
8837
diff
changeset
|
1316 item.attr.jid = jid_bare(from_occupant.jid); |
|
2064
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1317 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1318 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1319 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1320 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1321 self:route_stanza(stanza); |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1322 if muc_child then |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1323 for _, item in pairs(muc_child.tags) do |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1324 if item.name == "item" then |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1325 item.attr.jid = nil; |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1326 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1327 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1328 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1329 end |
|
1ee862fd1afe
MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms).
Waqas Hussain <waqas20@gmail.com>
parents:
2053
diff
changeset
|
1330 |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1331 local _M = {}; -- module "muc" |
|
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1332 |
|
3330
bdc325ce9fbc
MUC: Make number of stored history messages configurable with option max_history_messages (thanks michal and others who requested)
Matthew Wild <mwild1@gmail.com>
parents:
3281
diff
changeset
|
1333 function _M.new_room(jid, config) |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1334 return setmetatable({ |
| 1734 | 1335 jid = jid; |
| 1336 _jid_nick = {}; | |
|
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
1337 _occupants = {}; |
|
2411
c2b6c55201af
Add support for non-anonymous MUC rooms
Rob Hoelz <rob@hoelzro.net>
parents:
2217
diff
changeset
|
1338 _data = { |
|
3330
bdc325ce9fbc
MUC: Make number of stored history messages configurable with option max_history_messages (thanks michal and others who requested)
Matthew Wild <mwild1@gmail.com>
parents:
3281
diff
changeset
|
1339 whois = 'moderators'; |
|
5195
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
1340 history_length = math.min((config and config.history_length) |
|
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
1341 or default_history_length, max_history_length); |
|
2411
c2b6c55201af
Add support for non-anonymous MUC rooms
Rob Hoelz <rob@hoelzro.net>
parents:
2217
diff
changeset
|
1342 }; |
|
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
1343 _affiliations = {}; |
|
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
1344 }, room_mt); |
| 1734 | 1345 end |
| 1346 | |
|
5195
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
1347 function _M.set_max_history_length(_max_history_length) |
|
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
1348 max_history_length = _max_history_length or math.huge; |
|
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
1349 end |
|
ce5d7538ac48
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)
Matthew Wild <mwild1@gmail.com>
parents:
5144
diff
changeset
|
1350 |
|
5063
4bc202a7b351
MUC: Expose room metatable in the MUC lib.
Waqas Hussain <waqas20@gmail.com>
parents:
5061
diff
changeset
|
1351 _M.room_mt = room_mt; |
|
4bc202a7b351
MUC: Expose room metatable in the MUC lib.
Waqas Hussain <waqas20@gmail.com>
parents:
5061
diff
changeset
|
1352 |
| 1734 | 1353 return _M; |
