Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-05-24 | 2 | -35/+20 |
|\ | |||||
| * | mod_s2s: Remove redundant setting of session.direction | Kim Alvefur | 2014-05-22 | 1 | -1/+0 |
| | | |||||
| * | mod_s2s: Move filter initialization to common place | Kim Alvefur | 2014-05-22 | 2 | -32/+17 |
| | | |||||
| * | mod_s2s: Decide on log function once | Kim Alvefur | 2014-05-22 | 1 | -2/+3 |
| | | |||||
* | | Merge with daurnimator | Matthew Wild | 2014-05-23 | 5 | -188/+175 |
|\ \ | |||||
| * | | plugins/muc/muc.lib: Even unavailable session need to be routed to sometimes ↵ | daurnimator | 2014-05-21 | 1 | -4/+2 |
| | | | | | | | | | | | | (e.g. their own leave) | ||||
| * | | plugins/muc/muc: Only set role to nil if it's the last session to leave | daurnimator | 2014-05-21 | 1 | -1/+3 |
| | | | |||||
| * | | plugins/muc/occupant: Check for type == nil rather than type ~= unavailable | daurnimator | 2014-05-19 | 1 | -1/+1 |
| | | | |||||
| * | | plugins/muc/muc: Better check for live sessions | daurnimator | 2014-05-19 | 1 | -3/+13 |
| | | | |||||
| * | | plugins/muc/muc: Always send occupant list to joining sessions | daurnimator | 2014-05-19 | 1 | -1/+1 |
| | | | |||||
| * | | plugins/muc/mod_muc: Get rid of room global; use module:shared to get it | daurnimator | 2014-05-19 | 1 | -1/+0 |
| | | | |||||
| * | | plugins/muc/mod_muc: Place adhoc section into own scope | daurnimator | 2014-04-30 | 1 | -33/+33 |
| | | | |||||
| * | | plugins/muc/mod_muc: Don't use rooms object directory in adhoc section | daurnimator | 2014-04-30 | 1 | -2/+1 |
| | | | |||||
| * | | plugins/muc/mod_muc.lua: Add "each_room" function to iterate over rooms ↵ | daurnimator | 2014-04-30 | 1 | -5/+9 |
| | | | | | | | | | | | | (instead of accessing directly) | ||||
| * | | plugins/muc/mod_muc: Remove attempt_room_creation and create_room function. ↵ | daurnimator | 2014-04-29 | 1 | -24/+19 |
| | | | | | | | | | | | | Instead have a 'track_room' function called from the end of the pre-create hook, and just create an un-tracked room object when we get a presence | ||||
| * | | plugins/muc/mod_muc: Move `restrict_room_creation` into own area. now uses ↵ | daurnimator | 2014-04-29 | 1 | -19/+21 |
| | | | | | | | | | | | | pre-create hook | ||||
| * | | plugins/muc/lock.lib: lock inside of pre-create instead of 'created' | daurnimator | 2014-04-29 | 1 | -9/+5 |
| | | | |||||
| * | | plugins/muc/mod_muc: Use module:shared instead of save/restore | daurnimator | 2014-04-29 | 1 | -25/+6 |
| | | | |||||
| * | | plugins/muc: Move 'module:get_option_number("max_history_messages")' from ↵ | daurnimator | 2014-04-29 | 3 | -5/+2 |
| | | | | | | | | | | | | mod_muc into history lib; remove from muclib exports | ||||
| * | | plugins/muc/mod_muc: Remove support for `host_session.muc` | daurnimator | 2014-04-29 | 1 | -3/+0 |
| | | | |||||
| * | | plugins/muc/mod_muc: Move room persistence to own block | daurnimator | 2014-04-29 | 1 | -48/+56 |
| | | | |||||
| * | | plugins/muc: Add room:has_occupant() method | daurnimator | 2014-04-29 | 2 | -1/+5 |
| | | | |||||
| * | | plugins/muc/mod_muc: No need to treat the host room specially | daurnimator | 2014-04-28 | 1 | -6/+0 |
| | | | |||||
| * | | plugins/muc/mod_muc: Use get_option_string instead of get_option and checking | daurnimator | 2014-04-28 | 1 | -3/+1 |
| | | | |||||
| * | | plugins/muc/mod_muc: Move affiliation monkey patch into own scope | daurnimator | 2014-04-28 | 1 | -10/+13 |
| | | | |||||
* | | | Merge with daurnimator | Matthew Wild | 2014-05-17 | 15 | -949/+1619 |
|\ \ \ | |||||
| * | | | Merge with Prosody trunk | Matthew Wild | 2014-05-08 | 15 | -949/+1619 |
| |\| | | |||||
| | * | | plugins/muc/muc.lib: Move sending of occupant list to joining user out of ↵ | daurnimator | 2014-04-21 | 2 | -10/+9 |
| | | | | | | | | | | | | | | | | hook, and into main flow: It has to occur before publication of their status | ||||
| | * | | plugins/muc/members_only.lib: Compare affiliations via rank; wrap some long ↵ | daurnimator | 2014-04-21 | 1 | -17/+31 |
| | | | | | | | | | | | | | | | | lines | ||||
| | * | | plugins/muc/muc.lib: Remove reversed conditionals when firing pre- events | daurnimator | 2014-04-21 | 1 | -2/+2 |
| | | | | |||||
| | * | | plugins/muc/subject.lib: If subject is not set by an occupant, it should ↵ | daurnimator | 2014-04-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | come from room jid itself | ||||
| | * | | plugins/muc/muc.lib: When user leaves; set their role to nil | daurnimator | 2014-04-18 | 1 | -0/+1 |
| | | | | |||||
| | * | | plugins/muc: Move 'moderated' code to seperate file; changes default ↵ | daurnimator | 2014-04-18 | 2 | -32/+58 |
| | | | | | | | | | | | | | | | | "muc-get-default-role" behaviour | ||||
| | * | | plugins/muc: Move 'hidden' ('public') code to own file | daurnimator | 2014-04-16 | 2 | -30/+55 |
| | | | | |||||
| | * | | plugins/muc: Move subject code to seperate module | daurnimator | 2014-04-16 | 2 | -61/+100 |
| | | | | |||||
| | * | | plugins/muc/muc.lib: Refactor subject logic; fix bug of mixed up subject/author | daurnimator | 2014-04-15 | 1 | -18/+23 |
| | | | | |||||
| | * | | plugins/muc: Move persistent room configuration to own module | daurnimator | 2014-04-15 | 3 | -28/+58 |
| | | | | |||||
| | * | | plugins/muc/muc.lib: Move members_only into seperate file | daurnimator | 2014-04-04 | 2 | -62/+93 |
| | | | | |||||
| | * | | plugins/muc/muc.lib: Turn get_default_role into an event | daurnimator | 2014-04-03 | 1 | -7/+21 |
| | | | | |||||
| | * | | plugins/muc/muc.lib: Fix getting a list of occupants by role (it was sending ↵ | daurnimator | 2014-04-03 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | presences instead of items inside an iq) | ||||
| | * | | plugins/muc: Move valid_roles, valid_affiliations and is_kickable_error to ↵ | daurnimator | 2014-04-03 | 2 | -35/+47 |
| | | | | | | | | | | | | | | | | new muc/util module | ||||
| | * | | plugins/muc/muc.lib: Use util.iterators to count occupants | daurnimator | 2014-04-03 | 1 | -1/+2 |
| | | | | |||||
| | * | | plugins/muc/muc.lib: Move occupancy check to later in ↵ | daurnimator | 2014-04-03 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | `deconstruct_stanza_id`: As vcards are from the bare jid, you need to use the `from_jid` out of the encoded `id` | ||||
| | * | | plugins/muc: Move history to an external module | daurnimator | 2014-04-03 | 2 | -146/+182 |
| | | | | | | | | | | | | | | | | This resulted in the split up of the main muc-occupant-joined event handler into 3 seperate ones, handling occupant list, history and subject | ||||
| | * | | plugins/muc: Move `whois` code to seperate file | daurnimator | 2014-04-03 | 2 | -49/+72 |
| | | | | |||||
| | * | | plugins/muc/muc.lib: Remember to coerce nil role to "none" | daurnimator | 2014-04-03 | 1 | -2/+3 |
| | | | | |||||
| | * | | plugins/muc/muc.lib: Refactor of change-nick presence handling | daurnimator | 2014-04-03 | 1 | -35/+31 |
| | | | | | | | | | | | | | | | | | | | | - Allow `nick` to be passed to `publicise_occupant_status`. - Moves multi-session handling to a more 'edge-case' area of code | ||||
| | * | | plugins/muc/muc.lib: Clean up whois handling | daurnimator | 2014-04-03 | 1 | -26/+39 |
| | | | | | | | | | | | | | | | | | | | | - adds functions `can_see_real_jids` and `get_base_presence` - In `publicise_occupant_status`, we don't generate each type of presence until it's used | ||||
| | * | | plugins/muc/occupant.lib: Don't allow an unavailable session to be the ↵ | daurnimator | 2014-04-02 | 1 | -5/+17 |
| | | | | | | | | | | | | | | | | primary jid | ||||
| | * | | plugins/muc: Move name functions to seperate module | daurnimator | 2014-04-02 | 2 | -24/+51 |
| | | | |