Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2018-05-30 | 1 | -0/+1 |
|\ | |||||
| * | MUC: Revert unstable MUC commits since 0.10.1 | Matthew Wild | 2018-05-30 | 1 | -256/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have caused too many issue reports to be included in the stable branch at this time. Affected issues: #345, #397 Reverted commits: dcd53a565c01 6d4b0895f76d 1b10802a770e 564e897f0790 a7221ada9368 aaff40ec7001 05a3275b6873 c2b99fa134b3 8da11142fabf | ||||
| * | MUC: Fix error logged when no persistent rooms present | Matthew Wild | 2018-05-30 | 1 | -2/+5 |
| | | |||||
| * | mod_bosh: Store the normalized hostname on session (fixes #1151) | Kim Alvefur | 2018-05-30 | 1 | -1/+1 |
| | | |||||
| * | MUC: Handle setting default history messages when history length is unset ↵ | Kim Alvefur | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | | (thanks tmolitor) | ||||
| * | MUC: ensure that x/item/@jid is always a bare JID | Jonas Wielicki | 2018-05-17 | 1 | -2/+2 |
| | | |||||
| * | MUC: correctly emit <status/> tags | Jonas Wielicki | 2018-05-17 | 1 | -1/+1 |
| | | |||||
| * | MUC: reject non-bare JIDs in set_affiliation requests with not-acceptable | Jonas Wielicki | 2018-05-17 | 1 | -0/+3 |
| | | |||||
| * | MUC: fix set_role invocation | Jonas Wielicki | 2018-05-17 | 1 | -4/+5 |
| | | |||||
| * | mod_disco: Skip code specific to disco on user accounts (avoids invoking ↵ | Kim Alvefur | 2018-05-28 | 1 | -0/+1 |
| | | | | | | | | usermanager, fixes #1150) | ||||
* | | MUC: Add support for setting a room language (closes #1149) | Kim Alvefur | 2018-05-30 | 2 | -0/+54 |
| | | |||||
* | | mod_muc_mam: Set status code 170/171 on archiving configuration change | Kim Alvefur | 2018-05-29 | 1 | -0/+1 |
| | | |||||
* | | MUC: Some spacing to improve readability | Kim Alvefur | 2018-05-26 | 1 | -0/+1 |
| | | |||||
* | | MUC: Pass description via formdata field where it should be | Kim Alvefur | 2018-05-26 | 1 | -1/+2 |
| | | |||||
* | | MUC: Use correct field name for description in disco#info (fixes #1148) | Kim Alvefur | 2018-05-26 | 1 | -1/+9 |
| | | | | | | | | Introduced in c3254827698d | ||||
* | | mod_pubsub: Add support for parsing subscription options form (no options ↵ | Kim Alvefur | 2018-05-23 | 1 | -3/+9 |
| | | | | | | | | | | | | | | supported yet) This was actually to silence luacheck warnings options andoptions_tag variables. | ||||
* | | mod_pubsup: Ignore unused 'self' argument [luacheck] | Kim Alvefur | 2018-05-23 | 1 | -1/+1 |
| | | |||||
* | | mod_pubsub: Fix syntax error | Kim Alvefur | 2018-05-23 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2018-05-22 | 1 | -1/+1 |
|\| | |||||
| * | mod_c2s: Avoid concatenating potential nil value (fixes #753) | Kim Alvefur | 2018-05-22 | 1 | -1/+1 |
| | | |||||
| * | MUC: Restore status codes on presence sent to occupant when their ↵ | Matthew Wild | 2018-05-16 | 1 | -2/+6 |
| | | | | | | | | affiliation changes (thanks jonasw) | ||||
* | | MUC: Add support for an optional hard limit on number of rooms (fixes #766) | Kim Alvefur | 2018-05-22 | 1 | -1/+8 |
| | | |||||
* | | mod_pubsub: Add support for generation of a plain text <body> from Atom payloads | Kim Alvefur | 2018-05-21 | 2 | -0/+27 |
| | | | | | | | | See https://xmpp.org/extensions/xep-0060.html#impl-body | ||||
* | | mod_pubsub: Make the 'type' attribute on broadcast messages configurable | Kim Alvefur | 2018-05-21 | 2 | -3/+15 |
| | | | | | | | | | | This adds support for the pubsub#notification_type field in the node config form. | ||||
* | | mod_watchregistrations: Allow making the message type configurable | Kim Alvefur | 2018-05-20 | 1 | -1/+2 |
| | | |||||
* | | mod_pubsub: Set an id attribute on outgoing event messages | Kim Alvefur | 2018-05-21 | 1 | -1/+4 |
| | | | | | | | | | | | | | | https://xmpp.org/extensions/xep-0060.html#impl-bounce > a pubsub service SHOULD ensure that the <message/> stanza for each > event notification it generates possesses an 'id' attribute with a > value | ||||
* | | mod_pubsub: Use moduleapi broadcast method | Kim Alvefur | 2018-05-21 | 1 | -5/+1 |
| | | |||||
* | | mod_limits: Rename variable to avoid name clash [luacheck] | Kim Alvefur | 2018-05-02 | 1 | -5/+5 |
| | | | | | | | | FIXME better name, s_throttle doesn't seem nice | ||||
* | | Merge 0.10 -> trunk | Matthew Wild | 2018-05-16 | 2 | -2/+33 |
|\| | | | | | | | | | This commit intentionally drops changes from c2b99fa134b3 and 8da11142fabf which are based on older MUC code. | ||||
| * | MUC: Allow the number of messages sent by default to be configured (fixes #397) | Matthew Wild | 2018-05-16 | 1 | -1/+22 |
| | | |||||
| * | MUC: Import revised, more comprehensive patch for 8da11142fabf (#345) | Matthew Wild | 2018-05-16 | 1 | -95/+207 |
| | | |||||
| * | muc: Allow clients to change multiple affiliations or roles at once (#345) | Lennart Sauerbeck | 2017-03-18 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to XEP-0045 sections 9.2, 9.5 and 9.8 affiliation lists and role lists should allow mass-modification. Prosody however would just use the first entry of the list and ignore the rest. This is fixed by introducing a `for` loop to `set` stanzas of the respective `muc#admin` namespace. In order for this loop to work, the error handling was changed a little. Prosody no longer returns after the first error. Instead, an error reply is sent for each malformed or otherwise wrong entry, but the loop keeps going over the other entries. This may lead to multiple error messages being sent for one client request. A notable exception from this is when the XML Schema for `muc#admin` requests is violated. In that case the loop is aborted with an error message to the client. The change is a bit bigger than that in order to have the loop only for `set` stanzas without changing the behaviour of the `get` stanzas. This is now more in line with trunk, where there are separate methods for each stanza type. References: #345 | ||||
| * | mod_websocket: Store the request object on the session for use by other modules0.10.1 | Matthew Wild | 2018-05-08 | 1 | -0/+1 |
| | | |||||
* | | mod_muc_mam: Have stanza-id filtering over all groupchat messages, not just ↵ | Kim Alvefur | 2018-04-28 | 1 | -4/+9 |
| | | | | | | | | ones considered for history | ||||
* | | mod_muc_mam: Skip fetching history if built-in recent history is enough | Kim Alvefur | 2018-04-27 | 1 | -0/+4 |
| | | |||||
* | | mod_muc_mam: Skip fetching history if no history was requested | Kim Alvefur | 2018-04-28 | 1 | -0/+4 |
| | | |||||
* | | mod_muc_mam: Tweak calculation of max history to retrieve | Kim Alvefur | 2018-04-28 | 1 | -2/+6 |
| | | |||||
* | | MUC: Introduce an event to allow plugins to influence which messages are ↵ | Kim Alvefur | 2018-05-07 | 1 | -2/+5 |
| | | | | | | | | added to history | ||||
* | | MUC: Move condition for what gets added to history so that other modules ↵ | Kim Alvefur | 2018-05-07 | 1 | -16/+16 |
| | | | | | | | | | | | | | | benefit (thanks jcbrand) This helps mod_muc_mam avoid logging eg chat-state-only messages without needing to implement similar logic in many places | ||||
* | | mod_privacy: Silence long line warning [luacheck] | Kim Alvefur | 2018-05-02 | 1 | -1/+1 |
| | | |||||
* | | mod_admin_adhoc: Silence various harmless warnings [luacheck] | Kim Alvefur | 2018-05-01 | 1 | -0/+1 |
| | | |||||
* | | mod_admin_adhoc: Rename loop variable to avoid name clash [luacheck] | Kim Alvefur | 2018-05-01 | 1 | -2/+2 |
| | | |||||
* | | mod_admin_adhoc: Rename variable to avoid name clash [luacheck] | Kim Alvefur | 2018-05-01 | 1 | -7/+7 |
| | | |||||
* | | mod_admin_adhoc: Remove unused initial values [luacheck] | Kim Alvefur | 2018-05-01 | 1 | -2/+2 |
| | | |||||
* | | mod_admin_adhoc: Split a long line (improves readability) [luacheck] | Kim Alvefur | 2018-05-01 | 1 | -1/+6 |
| | | |||||
* | | mod_legacyauth: Split a long line [luacheck] | Kim Alvefur | 2018-05-01 | 1 | -1/+2 |
| | | |||||
* | | mod_bosh: Fix inconsistent whitespace [luacheck] | Kim Alvefur | 2018-05-01 | 1 | -2/+2 |
| | | |||||
* | | mod_bosh: Fix for 7be8f649d97d to skip error handling and allow other ↵ | Matthew Wild | 2018-04-29 | 1 | -3/+6 |
| | | | | | | | | modules to handle the request | ||||
* | | mod_c2s: Add a counter for IPv6. | Emmanuel Gil Peyrot | 2017-09-09 | 1 | -1/+7 |
| | | |||||
* | | mod_s2s: Add a counter for IPv6. | Emmanuel Gil Peyrot | 2017-09-09 | 1 | -1/+7 |
| | |