aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-05-242-35/+20
|\
| * mod_s2s: Remove redundant setting of session.directionKim Alvefur2014-05-221-1/+0
| |
| * mod_s2s: Move filter initialization to common placeKim Alvefur2014-05-222-32/+17
| |
| * mod_s2s: Decide on log function onceKim Alvefur2014-05-221-2/+3
| |
* | Merge with daurnimatorMatthew Wild2014-05-235-188/+175
|\ \
| * | plugins/muc/muc.lib: Even unavailable session need to be routed to sometimes ↵daurnimator2014-05-211-4/+2
| | | | | | | | | | | | (e.g. their own leave)
| * | plugins/muc/muc: Only set role to nil if it's the last session to leavedaurnimator2014-05-211-1/+3
| | |
| * | plugins/muc/occupant: Check for type == nil rather than type ~= unavailabledaurnimator2014-05-191-1/+1
| | |
| * | plugins/muc/muc: Better check for live sessionsdaurnimator2014-05-191-3/+13
| | |
| * | plugins/muc/muc: Always send occupant list to joining sessionsdaurnimator2014-05-191-1/+1
| | |
| * | plugins/muc/mod_muc: Get rid of room global; use module:shared to get itdaurnimator2014-05-191-1/+0
| | |
| * | plugins/muc/mod_muc: Place adhoc section into own scopedaurnimator2014-04-301-33/+33
| | |
| * | plugins/muc/mod_muc: Don't use rooms object directory in adhoc sectiondaurnimator2014-04-301-2/+1
| | |
| * | plugins/muc/mod_muc.lua: Add "each_room" function to iterate over rooms ↵daurnimator2014-04-301-5/+9
| | | | | | | | | | | | (instead of accessing directly)
| * | plugins/muc/mod_muc: Remove attempt_room_creation and create_room function. ↵daurnimator2014-04-291-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 ↵daurnimator2014-04-291-19/+21
| | | | | | | | | | | | pre-create hook
| * | plugins/muc/lock.lib: lock inside of pre-create instead of 'created'daurnimator2014-04-291-9/+5
| | |
| * | plugins/muc/mod_muc: Use module:shared instead of save/restoredaurnimator2014-04-291-25/+6
| | |
| * | plugins/muc: Move 'module:get_option_number("max_history_messages")' from ↵daurnimator2014-04-293-5/+2
| | | | | | | | | | | | mod_muc into history lib; remove from muclib exports
| * | plugins/muc/mod_muc: Remove support for `host_session.muc`daurnimator2014-04-291-3/+0
| | |
| * | plugins/muc/mod_muc: Move room persistence to own blockdaurnimator2014-04-291-48/+56
| | |
| * | plugins/muc: Add room:has_occupant() methoddaurnimator2014-04-292-1/+5
| | |
| * | plugins/muc/mod_muc: No need to treat the host room speciallydaurnimator2014-04-281-6/+0
| | |
| * | plugins/muc/mod_muc: Use get_option_string instead of get_option and checkingdaurnimator2014-04-281-3/+1
| | |
| * | plugins/muc/mod_muc: Move affiliation monkey patch into own scopedaurnimator2014-04-281-10/+13
| | |
* | | Merge with daurnimatorMatthew Wild2014-05-1715-949/+1619
|\ \ \
| * | | Merge with Prosody trunkMatthew Wild2014-05-0815-949/+1619
| |\| |
| | * | plugins/muc/muc.lib: Move sending of occupant list to joining user out of ↵daurnimator2014-04-212-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 ↵daurnimator2014-04-211-17/+31
| | | | | | | | | | | | | | | | lines
| | * | plugins/muc/muc.lib: Remove reversed conditionals when firing pre- eventsdaurnimator2014-04-211-2/+2
| | | |
| | * | plugins/muc/subject.lib: If subject is not set by an occupant, it should ↵daurnimator2014-04-181-2/+3
| | | | | | | | | | | | | | | | come from room jid itself
| | * | plugins/muc/muc.lib: When user leaves; set their role to nildaurnimator2014-04-181-0/+1
| | | |
| | * | plugins/muc: Move 'moderated' code to seperate file; changes default ↵daurnimator2014-04-182-32/+58
| | | | | | | | | | | | | | | | "muc-get-default-role" behaviour
| | * | plugins/muc: Move 'hidden' ('public') code to own filedaurnimator2014-04-162-30/+55
| | | |
| | * | plugins/muc: Move subject code to seperate moduledaurnimator2014-04-162-61/+100
| | | |
| | * | plugins/muc/muc.lib: Refactor subject logic; fix bug of mixed up subject/authordaurnimator2014-04-151-18/+23
| | | |
| | * | plugins/muc: Move persistent room configuration to own moduledaurnimator2014-04-153-28/+58
| | | |
| | * | plugins/muc/muc.lib: Move members_only into seperate filedaurnimator2014-04-042-62/+93
| | | |
| | * | plugins/muc/muc.lib: Turn get_default_role into an eventdaurnimator2014-04-031-7/+21
| | | |
| | * | plugins/muc/muc.lib: Fix getting a list of occupants by role (it was sending ↵daurnimator2014-04-031-3/+10
| | | | | | | | | | | | | | | | presences instead of items inside an iq)
| | * | plugins/muc: Move valid_roles, valid_affiliations and is_kickable_error to ↵daurnimator2014-04-032-35/+47
| | | | | | | | | | | | | | | | new muc/util module
| | * | plugins/muc/muc.lib: Use util.iterators to count occupantsdaurnimator2014-04-031-1/+2
| | | |
| | * | plugins/muc/muc.lib: Move occupancy check to later in ↵daurnimator2014-04-031-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 moduledaurnimator2014-04-032-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 filedaurnimator2014-04-032-49/+72
| | | |
| | * | plugins/muc/muc.lib: Remember to coerce nil role to "none"daurnimator2014-04-031-2/+3
| | | |
| | * | plugins/muc/muc.lib: Refactor of change-nick presence handlingdaurnimator2014-04-031-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 handlingdaurnimator2014-04-031-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 ↵daurnimator2014-04-021-5/+17
| | | | | | | | | | | | | | | | primary jid
| | * | plugins/muc: Move name functions to seperate moduledaurnimator2014-04-022-24/+51
| | | |