Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 1 | -3/+3 |
| | | | | what could possibly go wrong | ||||
* | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 1 | -2/+1 |
| | |||||
* | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 1 | -10/+7 |
| | |||||
* | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 1 | -0/+1 |
| | |||||
* | Reduce size of joined_user cache | Erik Johnston | 2017-04-25 | 1 | -1/+7 |
| | | | | | | | | The _get_joined_users_from_context cache stores a mapping from user_id to avatar_url and display_name. Instead of storing those in a dict, store them in a namedtuple as that uses much less memory. We also try converting the string to ascii to further reduce the size. | ||||
* | Don't recreate so many sets | Erik Johnston | 2017-03-16 | 1 | -2/+1 |
| | |||||
* | Remove unused param | Erik Johnston | 2017-02-20 | 1 | -1/+0 |
| | |||||
* | Make kick & ban reasons work | David Baker | 2017-02-14 | 1 | -0/+5 |
| | | | | | | We somehow specced APIs with reason strings, preserve the content in the events and even have the clients display them, but failed to actually pass the parameter through to the event content. | ||||
* | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 1 | -11/+17 |
| | |||||
* | Merge pull request #1676 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-12 | 1 | -1/+18 |
|\ | | | | | Add new API appservice specific public room list | ||||
| * | Add new API appservice specific public room list | Erik Johnston | 2016-12-06 | 1 | -1/+18 |
| | | |||||
* | | Add /room/<room_id>/joined_members API | Erik Johnston | 2016-12-08 | 1 | -0/+19 |
| | | | | | | | | | | | | This returns the currently joined members in the room with their display names and avatar urls. This is more efficient than /members for large rooms where you don't need the full events. | ||||
* | | Add joined_rooms servlet | Erik Johnston | 2016-12-08 | 1 | -0/+17 |
|/ | |||||
* | Move .observe() up to the cache to make things neater | Kegan Dougal | 2016-11-14 | 1 | -24/+6 |
| | |||||
* | Review comments | Kegan Dougal | 2016-11-11 | 1 | -70/+27 |
| | |||||
* | More flake8 | Kegan Dougal | 2016-11-11 | 1 | -1/+3 |
| | |||||
* | Flake8 and fix whoopsie | Kegan Dougal | 2016-11-11 | 1 | -4/+8 |
| | |||||
* | Use ObservableDeferreds instead of Deferreds as they behave as intended | Kegan Dougal | 2016-11-11 | 1 | -19/+20 |
| | |||||
* | Flake8 | Kegan Dougal | 2016-11-10 | 1 | -3/+3 |
| | |||||
* | Store Promise<Response> instead of Response for HTTP API transactions | Kegan Dougal | 2016-11-10 | 1 | -43/+39 |
| | | | | | | | | | | | | | | | | | | This fixes a race whereby: - User hits an endpoint. - No cached transaction so executes main code. - User hits same endpoint. - No cache transaction so executes main code. - Main code finishes executing and caches response and returns. - Main code finishes executing and caches response and returns. This race is common in the wild when Synapse is struggling under load. This commit fixes the race by: - User hits an endpoint. - Caches the promise to execute the main code and executes main code. - User hits same endpoint. - Yields on the same promise as the first request. - Main code finishes executing and returns, unblocking both requests. | ||||
* | Time out typing over federation | Erik Johnston | 2016-09-23 | 1 | -1/+4 |
| | |||||
* | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 1 | -2/+2 |
| | |||||
* | Enable guest access to POST /publicRooms | Erik Johnston | 2016-09-17 | 1 | -2/+2 |
| | |||||
* | Make POST /publicRooms require auth | Erik Johnston | 2016-09-16 | 1 | -2/+1 |
| | |||||
* | Change the way we calculate new_limit in /publicRooms and add POST API | Erik Johnston | 2016-09-15 | 1 | -0/+29 |
| | |||||
* | Remove default public rooms limit | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
| | |||||
* | By default limit /publicRooms to 100 entries | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
| | |||||
* | Pass since/from parameters over federation | Erik Johnston | 2016-09-15 | 1 | -3/+3 |
| | |||||
* | Allow paginating both forwards and backwards | Erik Johnston | 2016-09-15 | 1 | -3/+15 |
| | |||||
* | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
| | |||||
* | Filter returned events for client-facing format | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+3 |
| | |||||
* | Allow clients to specify the format a room state event is returned in | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+7 |
| | |||||
* | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
| | |||||
* | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 1 | -5/+16 |
| | |||||
* | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -0/+1 |
| | | | | | | | 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. | ||||
* | Dont invoke get_handlers fromClientV1RestServlet | Erik Johnston | 2016-08-12 | 1 | -0/+48 |
| | | | | | | hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets. | ||||
* | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -1/+10 |
| | |||||
* | Don't make rooms visibile by default | Erik Johnston | 2016-06-08 | 1 | -2/+0 |
| | |||||
* | Log user that is making /publicRooms calls | Erik Johnston | 2016-06-08 | 1 | -0/+7 |
| | |||||
* | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 1 | -1/+2 |
| | |||||
* | Split out the room list handler | David Baker | 2016-05-31 | 1 | -1/+1 |
| | | | | So I can use it from federation bits without pulling in all the handlers. | ||||
* | Allow clients to specify a server_name to avoid 'No known servers' | Kegan Dougal | 2016-05-19 | 1 | -1/+4 |
| | | | | Multiple server_names are supported via ?server_name=foo&server_name=bar | ||||
* | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 1 | -4/+3 |
| | |||||
* | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 1 | -1/+1 |
| | |||||
* | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
| | |||||
* | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 1 | -0/+38 |
| | | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event. | ||||
* | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 1 | -10/+4 |
| | |||||
* | Add a parse_json_object function | Mark Haines | 2016-03-09 | 1 | -18/+8 |
| | | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions. | ||||
* | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 1 | -1/+1 |
| | |||||
* | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 1 | -4/+4 |
| | | | | This will enable more detailed decisions | ||||
* | Ignore invalid POST bodies when joining rooms | Daniel Wagner-Hall | 2016-02-24 | 1 | -2/+12 |
| | |||||
* | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -0/+4 |
| | |||||
* | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 1 | -12/+6 |
|\ | | | | | Rewrite presence for performance. | ||||
| * | Initial cut | Erik Johnston | 2016-02-17 | 1 | -12/+6 |
| | | |||||
* | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: synapse/rest/client/v1/room.py | ||||
| * | client/v1/room: include event_id in response to state event PUT, in ↵ | Patrik Oldsberg | 2016-02-17 | 1 | -2/+2 |
| | | | | | | | | | | | | accordance with the spec Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> | ||||
| * | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| | | |||||
* | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -3/+3 |
| | | | | | | | | | | I'm not particularly happy with the "action" switching, but there's no convenient way to defer the work that needs to happen after it, so... :( | ||||
* | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -5/+16 |
| | | | | | | | | Unclean, needs tidy-up, but works | ||||
* | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| | | |||||
* | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -16/+5 |
| | | |||||
* | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+31 |
| | | | | | | | | | | This code is kind of rough (passing the remote servers down a long chain), but is a step towards improvement. | ||||
* | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 1 | -1/+1 |
|/ | | | | | | Force joining by alias to go through the send_membership_event checks, rather than bypassing them straight into _do_join. This is the first of many stages of cleanup. | ||||
* | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -13/+55 |
| | | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check | ||||
* | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -55/+13 |
| | | | | | | | | | | | | | There's at least one more to merge in. Side-effects: * Stop reporting None as displayname and avatar_url in some cases * Joining a room by alias populates guest-ness in join event * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not been called on matrix.org according to logs * Stop recording access_token_id on /join/room_id - currently we don't record it on /join/room_alias; I can try to thread it through at some point. | ||||
* | Remove old log line | Erik Johnston | 2016-02-03 | 1 | -2/+0 |
| | |||||
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 1 | -4/+2 |
| | |||||
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -39/+12 |
| | |||||
* | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 1 | -0/+6 |
|\ | |||||
| * | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 1 | -0/+6 |
| | | | | | | | | ... because the context isn't much use without the event. | ||||
* | | Introduce a Requester object | Daniel Wagner-Hall | 2016-01-11 | 1 | -48/+68 |
| | | | | | | | | | | | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up. | ||||
* | | copyrights | Matthew Hodgson | 2016-01-07 | 1 | -1/+1 |
|/ | |||||
* | Missing yield | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | |||||
* | Update endpoints to reflect current spec | Daniel Wagner-Hall | 2015-12-02 | 1 | -27/+2 |
| | |||||
* | Host /unstable and /r0 versions of r0 APIs | Daniel Wagner-Hall | 2015-12-01 | 1 | -45/+45 |
| | |||||
* | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -3/+10 |
| | |||||
* | Allow guests to /room/:room_id/{join,leave} | Daniel Wagner-Hall | 2015-11-13 | 1 | -3/+14 |
| | |||||
* | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+2 |
|\ | | | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync | ||||
| * | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 1 | -1/+2 |
| | | |||||
* | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 1 | -2/+2 |
|/ | |||||
* | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -3/+10 |
| | |||||
* | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 1 | -2/+1 |
|\ | | | | | Get display name from identity server, not client | ||||
| * | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 1 | -2/+1 |
| | | |||||
* | | Add a couple of unit tests for room/<x>/messages | Richard van der Hoff | 2015-11-09 | 1 | -1/+1 |
|/ | | | | ... merely because I was trying to figure out how it worked, and couldn't. | ||||
* | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 1 | -1/+2 |
|\ | | | | | Implement pagination, order by and groups in search | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 1 | -13/+16 |
| |\ | |||||
| * | | Implement basic pagination for search results | Erik Johnston | 2015-11-05 | 1 | -1/+2 |
| | | | |||||
* | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -12/+8 |
| |/ |/| | |||||
* | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 1 | -2/+4 |
| | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents | ||||
* | | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 1 | -13/+14 |
|/ | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices. | ||||
* | Add room context api | Erik Johnston | 2015-10-28 | 1 | -0/+36 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 1 | -5/+31 |
|\ | |||||
| * | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 1 | -5/+6 |
| | | |||||
| * | Move logic into handler | Daniel Wagner-Hall | 2015-10-13 | 1 | -115/+18 |
| | | |||||
| * | Add logging | Daniel Wagner-Hall | 2015-10-13 | 1 | -2/+2 |
| | | |||||
| * | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+2 |
| | | |||||
| * | Fix lint errors | Daniel Wagner-Hall | 2015-10-06 | 1 | -3/+4 |
| | | |||||
| * | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 1 | -6/+126 |
| | | |||||
* | | Keep FTS indexes up to date. Only search through rooms currently joined | Erik Johnston | 2015-10-12 | 1 | -1/+1 |
| | | |||||
* | | Add basic full text search impl. | Erik Johnston | 2015-10-09 | 1 | -0/+17 |
|/ | |||||
* | Remove undocumented and unimplemented 'feedback' parameter from the ↵ | Mark Haines | 2015-09-09 | 1 | -2/+0 |
| | | | | Client-Server API | ||||
* | Allow users that have left the room to view the member list from the point ↵ | Mark Haines | 2015-09-09 | 1 | -5/+13 |
| | | | | they left | ||||
* | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 1 | -17/+17 |
| | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly. | ||||
* | Remove semicolon. | Kegan Dougal | 2015-07-20 | 1 | -1/+1 |
| | |||||
* | Parse the ID given to /invite|ban|kick to make sure it looks like a user ID. | Kegan Dougal | 2015-07-20 | 1 | -0/+2 |
| | |||||
* | Blunty replace json with simplejson | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
| | |||||
* | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 1 | -26/+38 |
| | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
* | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 1 | -12/+12 |
| | |||||
* | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 1 | -1/+8 |
| | | | | | | HS and getting a clock from it and calling time_msec on the clock. Remove the serialize_event method from the HS since it is no longer needed. | ||||
* | Extract the client v1 base RestServlet to a separate class | Mark Haines | 2015-01-23 | 1 | -14/+14 |
| | |||||
* | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 1 | -2/+2 |
| | |||||
* | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+2 |
| | |||||
* | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+3 |
| | |||||
* | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 1 | -0/+559 |