Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Return a 404 rather than a 500 on rejoining empty rooms | Richard van der Hoff | 2018-04-09 | 1 | -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 requester | Erik Johnston | 2018-03-13 | 1 | -4/+4 |
| | |||||
* | Merge pull request #2987 from matrix-org/erikj/split_room_member_handler | Erik Johnston | 2018-03-13 | 1 | -98/+185 |
|\ | | | | | Split RoomMemberHandler into base and master class | ||||
| * | Add missing param to docstrings | Erik Johnston | 2018-03-13 | 1 | -0/+3 |
| | | |||||
| * | Correct import order | Erik Johnston | 2018-03-13 | 1 | -3/+3 |
| | | |||||
| * | Move user_*_room distributor stuff to master class | Erik Johnston | 2018-03-13 | 1 | -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 class | Erik Johnston | 2018-03-13 | 1 | -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_leave | Erik Johnston | 2018-03-13 | 1 | -22/+54 |
|\| | | | | | Factor out _remote_reject_invite in RoomMember | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-03-13 | 1 | -14/+10 |
| |\ | | | | | | | | | | erikj/factor_remote_leave | ||||
| * | | Add docstring | Erik Johnston | 2018-03-13 | 1 | -0/+26 |
| | | | |||||
| * | | Factor out _remote_reject_invite in RoomMember | Erik Johnston | 2018-03-13 | 1 | -22/+28 |
| | | | |||||
* | | | Merge pull request #2979 from matrix-org/erikj/no_handlers | Erik Johnston | 2018-03-13 | 1 | -2/+1 |
|\ \ \ | |_|/ |/| | | Don't build handlers on workers unnecessarily | ||||
| * | | Split replication layer into two | Erik Johnston | 2018-03-13 | 1 | -2/+1 |
| |/ | |||||
* | | Merge pull request #2980 from matrix-org/erikj/rm_priv | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
|\ \ | | | | | | | Make RoomMemberHandler functions private that can be | ||||
| * | | Make functions private that can be | Erik Johnston | 2018-03-13 | 1 | -7/+7 |
| |/ | |||||
* / | Refactor get_or_register_3pid_guest | Erik Johnston | 2018-03-13 | 1 | -7/+3 |
|/ | |||||
* | Add missing yield during 3pid signature checks | Erik Johnston | 2018-03-02 | 1 | -1/+1 |
| | |||||
* | Move back to hs.is_mine | Erik Johnston | 2018-03-01 | 1 | -7/+6 |
| | |||||
* | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 1 | -23/+31 |
| | |||||
* | Update copyright | Erik Johnston | 2018-02-06 | 1 | -0/+1 |
| | |||||
* | Update places where we create events | Erik Johnston | 2018-02-05 | 1 | -9/+11 |
| | |||||
* | Copy dict in update_membership too | Erik Johnston | 2017-12-07 | 1 | -0/+4 |
| | |||||
* | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 1 | -1/+3 |
|\ | | | | | Initial Group Implementation | ||||
| * | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 1 | -0/+22 |
| |\ | |||||
| * | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 1 | -1/+3 |
| | | | |||||
* | | | Spam checking: add the invitee to user_may_invite | David Baker | 2017-10-05 | 1 | -1/+1 |
| | | | |||||
* | | | pass room id too | David Baker | 2017-10-03 | 1 | -1/+3 |
| | | | |||||
* | | | Federation was passing strings anyway | David Baker | 2017-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | so pass string everywhere | ||||
* | | | this shouldn't be debug | David Baker | 2017-10-03 | 1 | -2/+2 |
| | | | |||||
* | | | better logging | David Baker | 2017-10-03 | 1 | -4/+9 |
| | | | |||||
* | | | Skip spam check for admin users | David Baker | 2017-10-03 | 1 | -8/+8 |
| | | | |||||
* | | | Allow spam checker to reject invites too | David Baker | 2017-10-03 | 1 | -6/+14 |
| |/ |/| | |||||
* | | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -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 events | Erik Johnston | 2017-06-19 | 1 | -0/+5 |
| | |||||
* | Add shutdown room API | Erik Johnston | 2017-06-19 | 1 | -0/+5 |
| | |||||
* | Speed up get_joined_hosts | Erik Johnston | 2017-05-16 | 1 | -1/+2 |
| | |||||
* | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 1 | -0/+1 |
| | |||||
* | Broaden the conditions for locally_rejecting invites | Richard van der Hoff | 2017-04-21 | 1 | -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 function | Richard van der Hoff | 2017-04-21 | 1 | -10/+5 |
| | | | | | inline `reject_remote_invite`, which only existed to make tracing the callflow more difficult. | ||||
* | Allow forgetting rooms you're banned from | David Baker | 2017-02-15 | 1 | -1/+3 |
| | |||||
* | Add missing None check | Erik Johnston | 2017-01-11 | 1 | -5/+6 |
| | |||||
* | Merge pull request #1787 from matrix-org/erikj/linearize_member | Erik Johnston | 2017-01-10 | 1 | -4/+15 |
|\ | | | | | Linearize updates to membership via PUT /state/ | ||||
| * | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 1 | -4/+15 |
| | | |||||
* | | Name linearizer's for better logs | Erik Johnston | 2017-01-09 | 1 | -1/+1 |
|/ | |||||
* | handlers/room_member: fix guest access check when joining rooms | Patrik Oldsberg | 2017-01-06 | 1 | -4/+6 |
| | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
* | Fix membership changes to be idempotent | Mark Haines | 2016-09-02 | 1 | -0/+6 |
| | |||||
* | Correctly handle the difference between prev and current state | Erik Johnston | 2016-08-31 | 1 | -3/+3 |
| | |||||
* | Replace context.current_state with context.current_state_ids | Erik Johnston | 2016-08-25 | 1 | -40/+84 |
| | |||||
* | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -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 time | Erik Johnston | 2016-08-12 | 1 | -1/+1 |
| | |||||
* | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 1 | -11/+9 |
| | | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout | ||||
* | Remove unused get_joined_rooms_for_user | Mark Haines | 2016-05-17 | 1 | -15/+0 |
| | |||||
* | Remove get_joined_rooms_for_user from RoomMemberHandler | Mark Haines | 2016-05-16 | 1 | -2/+1 |
| | |||||
* | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_room | Mark Haines | 2016-05-16 | 1 | -29/+0 |
| | |||||
* | Fix typo | Mark Haines | 2016-05-11 | 1 | -1/+1 |
| | |||||
* | Move _create_new_client_event and handle_new_client_event out of base handler | Mark Haines | 2016-05-11 | 1 | -2/+2 |
| | |||||
* | fix typo | Matthew Hodgson | 2016-04-28 | 1 | -1/+1 |
| | |||||
* | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 1 | -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.fire | Mark Haines | 2016-04-08 | 1 | -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_joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
|\ | | | | | Deduplicate membership changes | ||||
| * | Deduplicate joins | Erik Johnston | 2016-04-07 | 1 | -0/+31 |
| | | |||||
* | | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 1 | -4/+14 |
|\ | | | | | Fix stuck invites | ||||
| * | Fix stuck invites | Erik Johnston | 2016-04-05 | 1 | -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/member | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\| | | | | | Store invites in a separate table. | ||||
| * | Docs and indents | Erik Johnston | 2016-04-04 | 1 | -1/+4 |
| | | |||||
| * | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 1 | -93/+147 |
|\| | | | | | Do checks for memberships before creating events | ||||
| * | Use computed prev event ids | Erik Johnston | 2016-04-01 | 1 | -0/+3 |
| | | |||||
| * | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 1 | -93/+144 |
| | | |||||
* | | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -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 RoomMemberHandler | Erik Johnston | 2016-03-31 | 1 | -0/+646 |