summary refs log tree commit diff
path: root/synapse/handlers/room_member.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Return a 404 rather than a 500 on rejoining empty roomsRichard van der Hoff2018-04-091-0/+8
| | | | | | | Filter ourselves out of the server list before checking for an empty remote host list, to fix 500 error Fixes #2141
* _remote_join and co take a requesterErik Johnston2018-03-131-4/+4
|
* Merge pull request #2987 from matrix-org/erikj/split_room_member_handlerErik Johnston2018-03-131-98/+185
|\ | | | | Split RoomMemberHandler into base and master class
| * Add missing param to docstringsErik Johnston2018-03-131-0/+3
| |
| * Correct import orderErik Johnston2018-03-131-3/+3
| |
| * Move user_*_room distributor stuff to master classErik Johnston2018-03-131-5/+50
| | | | | | | | | | I added yields when calling user_left_room, but they shouldn't matter on the master process as they always return None anyway.
| * Split RoomMemberHandler into base and master classErik Johnston2018-03-131-96/+135
| | | | | | | | | | | | | | | | The intention here is to split the class into the bits that can be done on workers and the bits that have to be done on the master. In future there will also be a class that can be run on the worker, which will delegate work to the master when necessary.
* | Merge pull request #2981 from matrix-org/erikj/factor_remote_leaveErik Johnston2018-03-131-22/+54
|\| | | | | Factor out _remote_reject_invite in RoomMember
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2018-03-131-14/+10
| |\ | | | | | | | | | erikj/factor_remote_leave
| * | Add docstringErik Johnston2018-03-131-0/+26
| | |
| * | Factor out _remote_reject_invite in RoomMemberErik Johnston2018-03-131-22/+28
| | |
* | | Merge pull request #2979 from matrix-org/erikj/no_handlersErik Johnston2018-03-131-2/+1
|\ \ \ | |_|/ |/| | Don't build handlers on workers unnecessarily
| * | Split replication layer into twoErik Johnston2018-03-131-2/+1
| |/
* | Merge pull request #2980 from matrix-org/erikj/rm_privErik Johnston2018-03-131-7/+7
|\ \ | | | | | | Make RoomMemberHandler functions private that can be
| * | Make functions private that can beErik Johnston2018-03-131-7/+7
| |/
* / Refactor get_or_register_3pid_guestErik Johnston2018-03-131-7/+3
|/
* Add missing yield during 3pid signature checksErik Johnston2018-03-021-1/+1
|
* Move back to hs.is_mineErik Johnston2018-03-011-7/+6
|
* Move RoomMemberHandler out of HandlersErik Johnston2018-03-011-23/+31
|
* Update copyrightErik Johnston2018-02-061-0/+1
|
* Update places where we create eventsErik Johnston2018-02-051-9/+11
|
* Copy dict in update_membership tooErik Johnston2017-12-071-0/+4
|
* Merge pull request #2466 from matrix-org/erikj/groups_mergedErik Johnston2017-10-111-1/+3
|\ | | | | Initial Group Implementation
| * Merge branch 'develop' into erikj/groups_mergedDavid Baker2017-10-021-0/+22
| |\
| * | Split out profile handler to fix testsErik Johnston2017-08-251-1/+3
| | |
* | | Spam checking: add the invitee to user_may_inviteDavid Baker2017-10-051-1/+1
| | |
* | | pass room id tooDavid Baker2017-10-031-1/+3
| | |
* | | Federation was passing strings anywayDavid Baker2017-10-031-1/+1
| | | | | | | | | | | | so pass string everywhere
* | | this shouldn't be debugDavid Baker2017-10-031-2/+2
| | |
* | | better loggingDavid Baker2017-10-031-4/+9
| | |
* | | Skip spam check for admin usersDavid Baker2017-10-031-8/+8
| | |
* | | Allow spam checker to reject invites tooDavid Baker2017-10-031-6/+14
| |/ |/|
* | Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-191-0/+22
|/ | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites.
* Handle all cases of sending membership eventsErik Johnston2017-06-191-0/+5
|
* Add shutdown room APIErik Johnston2017-06-191-0/+5
|
* Speed up get_joined_hostsErik Johnston2017-05-161-1/+2
|
* Add more granular event send metricsErik Johnston2017-05-021-0/+1
|
* Broaden the conditions for locally_rejecting invitesRichard van der Hoff2017-04-211-1/+7
| | | | | | | | | | The logic for marking invites as locally rejected was all well and good, but didn't happen when the remote server returned a 500, or wasn't reachable, or had no DNS, or whatever. Just expand the except clause to catch everything. Fixes https://github.com/matrix-org/synapse/issues/761.
* Remove redundant functionRichard van der Hoff2017-04-211-10/+5
| | | | | inline `reject_remote_invite`, which only existed to make tracing the callflow more difficult.
* Allow forgetting rooms you're banned fromDavid Baker2017-02-151-1/+3
|
* Add missing None checkErik Johnston2017-01-111-5/+6
|
* Merge pull request #1787 from matrix-org/erikj/linearize_memberErik Johnston2017-01-101-4/+15
|\ | | | | Linearize updates to membership via PUT /state/
| * Linearize updates to membership via PUT /state/Erik Johnston2017-01-091-4/+15
| |
* | Name linearizer's for better logsErik Johnston2017-01-091-1/+1
|/
* handlers/room_member: fix guest access check when joining roomsPatrik Oldsberg2017-01-061-4/+6
| | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* Fix membership changes to be idempotentMark Haines2016-09-021-0/+6
|
* Correctly handle the difference between prev and current stateErik Johnston2016-08-311-3/+3
|
* Replace context.current_state with context.current_state_idsErik Johnston2016-08-251-40/+84
|
* Pass through user-supplied content in /join/$room_idKegan Dougal2016-08-231-2/+12
| | | | | | | It was always intended to allow custom keys on the join event, but this has at some point been lost. Restore it. If the user specifies keys like "avatar_url" then they will be clobbered.
* Only process one local membership event per room at a timeErik Johnston2016-08-121-1/+1
|
* Add `create_requester` functionRichard van der Hoff2016-07-261-11/+9
| | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout
* Remove unused get_joined_rooms_for_userMark Haines2016-05-171-15/+0
|
* Remove get_joined_rooms_for_user from RoomMemberHandlerMark Haines2016-05-161-2/+1
|
* Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_roomMark Haines2016-05-161-29/+0
|
* Fix typoMark Haines2016-05-111-1/+1
|
* Move _create_new_client_event and handle_new_client_event out of base handlerMark Haines2016-05-111-2/+2
|
* fix typoMatthew Hodgson2016-04-281-1/+1
|
* Remove some unused functions (#711)Mark Haines2016-04-081-13/+0
| | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want
* Move all the wrapper functions for distributor.fireMark Haines2016-04-081-15/+1
| | | | | | | Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file.
* Merge pull request #700 from matrix-org/erikj/deduplicate_joinsErik Johnston2016-04-071-0/+31
|\ | | | | Deduplicate membership changes
| * Deduplicate joinsErik Johnston2016-04-071-0/+31
| |
* | Set profile information when joining rooms remotelyErik Johnston2016-04-071-0/+5
|/
* Merge pull request #691 from matrix-org/erikj/memberErik Johnston2016-04-051-4/+14
|\ | | | | Fix stuck invites
| * Fix stuck invitesErik Johnston2016-04-051-4/+14
| | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject.
* | Merge pull request #690 from matrix-org/erikj/memberErik Johnston2016-04-051-1/+4
|\| | | | | Store invites in a separate table.
| * Docs and indentsErik Johnston2016-04-041-1/+4
| |
| * Store invites in a separate table.Erik Johnston2016-04-041-1/+1
| |
* | Merge pull request #689 from matrix-org/erikj/memberErik Johnston2016-04-041-93/+147
|\| | | | | Do checks for memberships before creating events
| * Use computed prev event idsErik Johnston2016-04-011-0/+3
| |
| * Do checks for memberships before creating eventsErik Johnston2016-04-011-93/+144
| |
* | Use google style doc strings.Mark Haines2016-04-011-24/+24
|/ | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format.
* Split out RoomMemberHandlerErik Johnston2016-03-311-0/+646