Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Comment | Erik Johnston | 2016-03-23 | 1 | -0/+3 |
| | |||||
* | Don't require alias in public room list. | Erik Johnston | 2016-03-23 | 1 | -14/+13 |
| | | | | | | | Rooms now no longer require an alias to be published. Also, changes the way we pull out state of each room to not require fetching all state events. | ||||
* | Add config to create guest account on 3pid invite | Erik Johnston | 2016-03-14 | 1 | -25/+32 |
| | | | | | | | | | | | | | Currently, when a 3pid invite request is sent to an identity server, it includes a provisioned guest access token. This allows the link in the, say, invite email to include the guest access token ensuring that the same account is used each time the link is clicked. This flow has a number of flaws, including when using different servers or servers that have guest access disabled. For now, we keep this implementation but hide it behind a config option until a better flow is implemented. | ||||
* | Send the user ID matching the guest access token, since there is no Matrix ↵ | David Baker | 2016-03-07 | 1 | -0/+5 |
| | | | | API to discover what user ID an access token is for. | ||||
* | Merge pull request #623 from matrix-org/rav/fix_createroom_race | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
|\ | | | | | Make sure we add all invited members before returning from createRoom | ||||
| * | Make sure we add all invited members before returning from createRoom | Richard van der Hoff | 2016-03-04 | 1 | -1/+1 |
| | | | | | | | | add a missing yield. | ||||
* | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642 | Richard van der Hoff | 2016-03-03 | 1 | -31/+45 |
|\| | |||||
| * | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 1 | -31/+45 |
| | | | | | | | | This will enable more detailed decisions | ||||
* | | Fix typo | Richard van der Hoff | 2016-03-03 | 1 | -1/+1 |
| | | |||||
* | | Move arg default to the start of the function | Richard van der Hoff | 2016-03-02 | 1 | -2/+3 |
| | | | | | | | | Also don't overwrite the list that gets passed in. | ||||
* | | Address review comments | Richard van der Hoff | 2016-03-02 | 1 | -2/+3 |
| | | |||||
* | | Handle rejections of invites from local users locally | Richard van der Hoff | 2016-03-01 | 1 | -5/+18 |
|/ | | | | | Slightly hacky fix to SYN-642, which avoids the federation codepath when trying to reject invites from local users. | ||||
* | Generate guest access token on 3pid invites | Daniel Wagner-Hall | 2016-02-24 | 1 | -0/+8 |
| | | | | | | | | | This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit. | ||||
* | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -8/+59 |
| | |||||
* | Review comments | Daniel Wagner-Hall | 2016-02-18 | 1 | -5/+4 |
| | |||||
* | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -66/+58 |
| | | | | | 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... :( | ||||
* | Respond to federated invite with non-empty context | Daniel Wagner-Hall | 2016-02-17 | 1 | -40/+12 |
| | | | | | | | Currently, we magically perform an extra database hit to find the inviter, and use this to guess where we should send the event. Instead, fill in a valid context, so that other callers relying on the context actually have one. | ||||
* | Some cleanup, some TODOs, more to do | Daniel Wagner-Hall | 2016-02-16 | 1 | -68/+60 |
| | |||||
* | Some cleanup | Daniel Wagner-Hall | 2016-02-16 | 1 | -19/+20 |
| | |||||
* | Tidy? up room creation event sending | Daniel Wagner-Hall | 2016-02-16 | 1 | -63/+72 |
| | |||||
* | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-16 | 1 | -3/+3 |
|\ | | | | | | | | | Conflicts: synapse/handlers/room.py | ||||
| * | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -40/+28 |
| | | |||||
* | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -34/+46 |
| | | | | | | | | Unclean, needs tidy-up, but works | ||||
* | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+25 |
| | | |||||
* | | Use update_membership for profile updates | Daniel Wagner-Hall | 2016-02-15 | 1 | -4/+0 |
| | | |||||
* | | Use update_membership to kick guests | Daniel Wagner-Hall | 2016-02-15 | 1 | -2/+9 |
| | | |||||
* | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -3/+9 |
| | | |||||
* | | Inline _do_local_membership_update | Daniel Wagner-Hall | 2016-02-15 | 1 | -18/+7 |
| | | |||||
* | | Inline _do_join as it now only has one caller | Daniel Wagner-Hall | 2016-02-15 | 1 | -48/+47 |
| | | | | | | | | | | | | Also, consistently apply rate limiting. Again, ugly, but a step in the right direction. | ||||
* | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 1 | -25/+15 |
| | | | | | | | | | | 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 | -4/+10 |
|/ | | | | | | 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 | -35/+9 |
| | | | | | | 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 | -9/+35 |
| | | | | | | | | | | | | | 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. | ||||
* | Return events in correct order for /events | Erik Johnston | 2016-02-11 | 1 | -0/+1 |
| | |||||
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -2/+9 |
| | |||||
* | PEP8 | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | |||||
* | Remove unused method | Erik Johnston | 2016-02-03 | 1 | -8/+0 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-02-03 | 1 | -3/+8 |
|\ | | | | | | | erikj/public_room_fix | ||||
| * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 1 | -1/+1 |
| | | |||||
| * | s/get_room_changes_for_user/get_membership_changes_for_user/ | Erik Johnston | 2016-02-02 | 1 | -1/+1 |
| | | |||||
| * | WARN if we get a topo token instead of stream. | Erik Johnston | 2016-02-02 | 1 | -1/+6 |
| | | |||||
* | | Change the way we do public room list fetching | Erik Johnston | 2016-02-02 | 1 | -23/+63 |
|/ | |||||
* | Order things correctly | Erik Johnston | 2016-02-01 | 1 | -1/+1 |
| | |||||
* | Switch over /events to use per room caches | Erik Johnston | 2016-02-01 | 1 | -5/+20 |
| | |||||
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 1 | -1/+1 |
| | |||||
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -2/+53 |
| | |||||
* | Remove unused parameters | Daniel Wagner-Hall | 2016-01-15 | 1 | -11/+5 |
| | |||||
* | Merge branch 'release-v0.12.1' into develop | Richard van der Hoff | 2016-01-14 | 1 | -12/+23 |
|\ | |||||
| * | Add 'event' result to 'context' endpoint | Richard van der Hoff | 2016-01-13 | 1 | -12/+23 |
| | | | | | | | | ... because the context isn't much use without the event. | ||||
| * | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-13 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour. | ||||
* | | Skip, rather than erroring, invalid guest requests | Daniel Wagner-Hall | 2016-01-05 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | Erroring causes problems when people make illegal requests, because they don't know what limit parameter they should pass. This is definitely buggy. It leaks message counts for rooms people don't have permission to see, via tokens. But apparently we already consciously decided to allow that as a team, so this preserves that behaviour. | ||||
* | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 1 | -1/+1 |
| | | |||||
* | | Use named args | Erik Johnston | 2016-01-05 | 1 | -2/+2 |
| | | |||||
* | | Support inviting 3pids in /createRoom | Erik Johnston | 2016-01-05 | 1 | -0/+16 |
|/ | |||||
* | Return room avatar URLs in /publicRooms | Daniel Wagner-Hall | 2015-12-21 | 1 | -2/+21 |
| | | | | | Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121 | ||||
* | Give the IS a bunch more 3pid invite context | Daniel Wagner-Hall | 2015-12-16 | 1 | -7/+60 |
| | | | | This allows it to form richer emails | ||||
* | Add caches for whether a room has been forgotten by a user | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | |||||
* | Add comments | Mark Haines | 2015-12-02 | 1 | -0/+3 |
| | |||||
* | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 1 | -9/+15 |
|\ | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py | ||||
| * | Wrap calls to distributor.fire in appropriately named functions so that ↵ | Mark Haines | 2015-12-01 | 1 | -9/+15 |
| | | | | | | | | static analysis can work out want is calling what | ||||
* | | Only fire user_joined_room on the distributor if the user has actually ↵ | Mark Haines | 2015-12-01 | 1 | -4/+6 |
|/ | | | | joined the room | ||||
* | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -0/+3 |
| | |||||
* | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 1 | -1/+2 |
| | | | | | There was a regression where we stopped including profile data in initial joins for rooms joined over federation. | ||||
* | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 1 | -3/+9 |
| | |||||
* | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 1 | -1/+15 |
| | |||||
* | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 1 | -5/+3 |
| | |||||
* | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 1 | -8/+11 |
| | |||||
* | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 1 | -1/+10 |
| | | | | Squash-merge of PR #345 from daniel/anonymousevents | ||||
* | Remove more unused parameters | Daniel Wagner-Hall | 2015-11-02 | 1 | -1/+0 |
| | |||||
* | Docs | Erik Johnston | 2015-10-28 | 1 | -0/+13 |
| | |||||
* | Add room context api | Erik Johnston | 2015-10-28 | 1 | -0/+42 |
| | |||||
* | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 1 | -41/+61 |
| | | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave. | ||||
* | Verify third party ID server certificates | Daniel Wagner-Hall | 2015-10-16 | 1 | -2/+29 |
| | |||||
* | Use non-placeholder name for endpoint | Daniel Wagner-Hall | 2015-10-15 | 1 | -1/+1 |
| | |||||
* | Look for keys on the right objects | Daniel Wagner-Hall | 2015-10-15 | 1 | -2/+2 |
| | |||||
* | Move logic into handler | Daniel Wagner-Hall | 2015-10-13 | 1 | -0/+132 |
| | |||||
* | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 1 | -4/+7 |
| | |||||
* | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 1 | -2/+21 |
|\ | |||||
| * | Add 'trusted_private_chat' to room creation presets | Erik Johnston | 2015-10-02 | 1 | -0/+5 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-10-02 | 1 | -65/+12 |
| |\ | |||||
| | * | Merge pull request #287 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-09-30 | 1 | -1/+10 |
| | |\ | | | | | | | | | Set m.room.canonical_alias on room creation. | ||||
| | | * | Remove double indentation | Erik Johnston | 2015-09-30 | 1 | -7/+6 |
| | | | | |||||
| | | * | Set m.room.canonical_alias on room creation. | Erik Johnston | 2015-09-23 | 1 | -1/+11 |
| | | | | |||||
| * | | | Add flag which disables federation of the room | Erik Johnston | 2015-09-01 | 1 | -2/+6 |
| | | | | |||||
* | | | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 1 | -0/+4 |
| |/ / |/| | | |||||
* | | | Merge pull request #288 from matrix-org/markjh/unused_definitions | Mark Haines | 2015-09-28 | 1 | -26/+0 |
|\ \ \ | |_|/ |/| | | Remove some of the unused definitions from synapse | ||||
| * | | synapse/handlers/room.py:_should_invite_join was unused | Mark Haines | 2015-09-23 | 1 | -26/+0 |
| | | | |||||
* | | | Merge pull request #271 from matrix-org/erikj/default_history | Erik Johnston | 2015-09-23 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Change default history visibility for private rooms | ||||
| * | | Change default history visibility for private rooms | Erik Johnston | 2015-09-09 | 1 | -1/+1 |
| |/ | |||||
* | | Remove undocumented and unimplemented 'feedback' parameter from the ↵ | Mark Haines | 2015-09-09 | 1 | -1/+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 | -36/+0 |
|/ | | | | they left | ||||
* | Add m.room.avatar to default power levels. Change default required power ↵ | Erik Johnston | 2015-08-20 | 1 | -2/+3 |
| | | | | levels of such events to 50 | ||||
* | Merge pull request #233 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-08-20 | 1 | -0/+1 |
|\ | | | | | Add server side support for canonical aliases | ||||
| * | Add canonical alias to the default power levels | Erik Johnston | 2015-08-19 | 1 | -0/+1 |
| | | |||||
* | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users | Erik Johnston | 2015-08-19 | 1 | -8/+2 |
|/ | |||||
* | Implement specifying custom initial state for /createRoom | Erik Johnston | 2015-07-16 | 1 | -40/+60 |
| | |||||
* | s/everyone_ops/original_invitees_have_ops/ | Erik Johnston | 2015-07-14 | 1 | -3/+3 |
| | |||||
* | Capitalize contants | Erik Johnston | 2015-07-14 | 1 | -4/+4 |
| | |||||
* | Implement presets at room creation | Erik Johnston | 2015-07-13 | 1 | -22/+60 |
| | |||||
* | Add m.room.history_visibility to newly created rooms' m.room.power_levels | Erik Johnston | 2015-07-06 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-22 | 1 | -3/+1 |
|\ | |||||
| * | Add caches for things requested by the pushers | Mark Haines | 2015-05-21 | 1 | -3/+1 |
| | | |||||
* | | Throw error when creating room if alias contains whitespace #SYN-335 | David Baker | 2015-05-14 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #144 from matrix-org/erikj/logging_context | Mark Haines | 2015-05-12 | 1 | -2/+2 |
|\ \ | | | | | | | Preserving logging contexts | ||||
| * | | Unwrap defer.gatherResults failures | Erik Johnston | 2015-05-12 | 1 | -2/+2 |
| |/ | |||||
* / | Make get_current_token accept a direction parameter, which tells whether the ↵ | Erik Johnston | 2015-05-12 | 1 | -2/+2 |
|/ | | | | source whether we want a token for going 'forwards' or 'backwards' | ||||
* | One too many lens | Erik Johnston | 2015-05-01 | 1 | -1/+1 |
| | |||||
* | Change public room list to use defer.gatherResults | Erik Johnston | 2015-05-01 | 1 | -5/+13 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-28 | 1 | -1/+2 |
|\ | |||||
| * | Create an 'invite' powerlevel when making new rooms | Paul "LeoNerd" Evans | 2015-04-21 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-27 | 1 | -4/+4 |
|\| | |||||
| * | SYN-350: Don't ratelimit the individual events generated during room creation | Mark Haines | 2015-04-21 | 1 | -4/+4 |
| | | |||||
* | | Sanitize RoomMemberStore | Erik Johnston | 2015-03-23 | 1 | -19/+0 |
|/ | |||||
* | Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This ↵ | Erik Johnston | 2015-03-09 | 1 | -3/+3 |
| | | | | uses the a storage api that is cached. | ||||
* | Finish impl to get new events for AS. ASes should now be able to poll /events | Kegan Dougal | 2015-02-26 | 1 | -1/+3 |
| | |||||
* | Add stub functions and work out execution flow to implement AS event stream ↵ | Kegan Dougal | 2015-02-25 | 1 | -9/+25 |
| | | | | polling. | ||||
* | Remove debug logging | Erik Johnston | 2015-02-11 | 1 | -2/+0 |
| | |||||
* | Don't unfreeze when using FreezeEvent.get_dict, as we are using a ↵ | Erik Johnston | 2015-02-11 | 1 | -1/+3 |
| | | | | JSONEncoder that understands FrozenDict | ||||
* | Pass through list of room hosts from room alias query to federation so that ↵ | Erik Johnston | 2015-02-05 | 1 | -7/+5 |
| | | | | it can retry against different room hosts | ||||
* | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 1 | -2/+5 |
| | | | | | | 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. | ||||
* | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 1 | -2/+0 |
| | |||||
* | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 1 | -7/+7 |
| | |||||
* | PEP8 and pyflakes warnings | Kegan Dougal | 2015-01-07 | 1 | -1/+3 |
| | |||||
* | SYN-154: Tweak how the m.room.create check is done. | Kegan Dougal | 2015-01-07 | 1 | -2/+11 |
| | | | | | Don't perform the check in auth.is_host_in_room but instead do it in _do_join and also assert that there are no m.room.members in the room before doing so. | ||||
* | SYN-154: Better error messages when joining an unknown room by ID. | Kegan Dougal | 2015-01-07 | 1 | -3/+5 |
| | | | | | | The simple fix doesn't work here because room creation also involves unknown room IDs. The check relies on the presence of m.room.create for rooms being created, whereas bogus room IDs have no state events at all. | ||||
* | Merge pull request #28 from matrix-org/erikj-perf | Mark Haines | 2015-01-06 | 1 | -8/+5 |
|\ | | | | | Database performance improvements. | ||||
| * | Add RoomMemberStore.get_users_in_room, so that we can get the list of joined ↵ | Erik Johnston | 2015-01-06 | 1 | -8/+5 |
| | | | | | | | | users without having to retrieve the full events | ||||
* | | Update copyright notices | Mark Haines | 2015-01-06 | 1 | -1/+1 |
|/ | |||||
* | Set a state_key for the topic and room name, otherwise they won't be treated ↵ | Mark Haines | 2014-12-19 | 1 | -0/+2 |
| | | | | as room state | ||||
* | Set display name when joining via alias | Mark Haines | 2014-12-19 | 1 | -0/+5 |
| | |||||
* | s/user_id/sender/ | Mark Haines | 2014-12-19 | 1 | -1/+1 |
| | |||||
* | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 1 | -16/+12 |
| | |||||
* | Rename MessageHandler.handle_event. Add a few comments. | Erik Johnston | 2014-12-15 | 1 | -4/+4 |
| | |||||
* | Get current member state from current_state snapshot. Fix leave test. | Erik Johnston | 2014-12-15 | 1 | -3/+3 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-15 | 1 | -0/+7 |
|\ | | | | | | | | | Conflicts: tests/handlers/test_room.py | ||||
| * | Add a 'user_left_room' distributor signal analogous to 'user_joined_room' | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+7 |
| | | |||||
* | | .from_string() no longer takes a HS | Erik Johnston | 2014-12-10 | 1 | -2/+2 |
| | | |||||
* | | Try and figure out how and why signatures are being changed. | Erik Johnston | 2014-12-10 | 1 | -5/+2 |
| | | |||||
* | | PEP8 | Erik Johnston | 2014-12-09 | 1 | -1/+1 |
| | | |||||
* | | Fix joining from an invite | Erik Johnston | 2014-12-09 | 1 | -13/+3 |
| | | |||||
* | | More bug fixes | Erik Johnston | 2014-12-08 | 1 | -3/+8 |
| | | |||||
* | | More bug fixes | Erik Johnston | 2014-12-08 | 1 | -6/+1 |
| | | |||||
* | | More bug fixes | Erik Johnston | 2014-12-08 | 1 | -2/+2 |
| | | |||||
* | | Convert rest and handlers to use new event structure | Erik Johnston | 2014-12-04 | 1 | -77/+53 |
| | | |||||
* | | Begin converting things to use the new Event structure | Erik Johnston | 2014-12-04 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-03 | 1 | -1/+5 |
|\| | |||||
| * | Squash room_ids list to a set() to remove duplicates - with TODO marker as I ↵ | Paul "LeoNerd" Evans | 2014-12-02 | 1 | -1/+5 |
| | | | | | | | | have no idea /why/ the dups are happening in the first place | ||||
* | | Change DomainSpecificString so that it doesn't use a HomeServer object | Erik Johnston | 2014-12-02 | 1 | -8/+11 |
|/ | |||||
* | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 1 | -2/+3 |
| | |||||
* | Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵ | Mark Haines | 2014-11-20 | 1 | -2/+2 |
| | | | | because they don't interact well with the logging contexts | ||||
* | Don't add a 'prev' key to m.room.member messages | Erik Johnston | 2014-11-19 | 1 | -3/+0 |
| | |||||
* | SYN-149: Enable auth for events added during room creation since they should ↵ | Mark Haines | 2014-11-18 | 1 | -1/+1 |
| | | | | pass auth checks | ||||
* | SYN-149: Send join event immediately after the room create event | Mark Haines | 2014-11-18 | 1 | -24/+26 |
| | |||||
* | Split out sending the room alias events from creating the alias so that we ↵ | Mark Haines | 2014-11-18 | 1 | -7/+10 |
| | | | | can do them in the right point when creating a room | ||||
* | SYN-148: Add the alias after creating the room | Mark Haines | 2014-11-17 | 1 | -9/+9 |
| | |||||
* | Fix bugs with invites/joins across federatiom. | Erik Johnston | 2014-11-12 | 1 | -2/+8 |
| | | | | | Both in terms of auth and not trying to fetch missing PDUs for invites, joins etc. | ||||
* | Implement invite part of invite join dance | Erik Johnston | 2014-11-07 | 1 | -20/+12 |
| | |||||
* | Amalgamate all power levels. | Erik Johnston | 2014-11-06 | 1 | -36/+16 |
| | | | | | Remove concept of reqired power levels, something similiar can be done using the new power level event. | ||||
* | Implement new replace_state and changed prev_state | Erik Johnston | 2014-11-06 | 1 | -12/+4 |
| | | | | | `prev_state` is now a list of previous state ids, similiar to prev_events. `replace_state` now points to what we think was replaced. | ||||
* | Fix room handler tests | Erik Johnston | 2014-11-04 | 1 | -1/+0 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-30 | 1 | -20/+6 |
|\ | | | | | | | federation_authorization | ||||
| * | Construct a source-specific 'SourcePaginationConfig' to pass into ↵ | Paul "LeoNerd" Evans | 2014-10-29 | 1 | -15/+6 |
| | | | | | | | | get_pagination_rows; meaning each source doesn't have to care about its own name any more | ||||
| * | Remove duplicate join_event from create_room | Mark Haines | 2014-10-27 | 1 | -5/+0 |
| | | |||||
* | | Begin making auth use event.old_state_events | Erik Johnston | 2014-10-15 | 1 | -10/+9 |
|/ | |||||
* | Merge branch 'deletions' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-25 | 1 | -0/+1 |
|\ | |||||
| * | Rename deletions to redactions | Erik Johnston | 2014-09-24 | 1 | -1/+1 |
| | | |||||
| * | SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops ↵ | Erik Johnston | 2014-09-23 | 1 | -0/+1 |
| | | | | | | | | | | | | levels event SYN-12 # comment Auth has been added. | ||||
* | | Don't set the room name to be the room alias on room creation if the client ↵ | Erik Johnston | 2014-09-24 | 1 | -11/+0 |
|/ | | | | didn't supply a name | ||||
* | Correctly handle the 'age' key in events and pdus | Erik Johnston | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | Added num_joined_users key to /publicRooms for each room. Show this ↵ | Kegan Dougal | 2014-09-08 | 1 | -0/+6 |
| | | | | information in the webclient. | ||||
* | Add support for inviting people when you create a room | Erik Johnston | 2014-09-06 | 1 | -0/+26 |
| | |||||
* | Generate m.room.aliases event when the HS creates a room alias | Erik Johnston | 2014-09-05 | 1 | -5/+7 |
| | |||||
* | Change the default power levels to be 0, 50 and 100 | Erik Johnston | 2014-09-05 | 1 | -8/+8 |
| | |||||
* | When creating a room and a user supplies a room_alias but no name, use the ↵ | Erik Johnston | 2014-09-03 | 1 | -0/+11 |
| | | | | room_alias as the name. | ||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 1 | -1/+1 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Add copyright notices and fix pyflakes errors | Mark Haines | 2014-09-03 | 1 | -2/+0 |
| | |||||
* | Merge branch 'ratelimiting' into develop | Mark Haines | 2014-09-03 | 1 | -0/+1 |
|\ | |||||
| * | rate limiting for message sending | Mark Haines | 2014-09-02 | 1 | -0/+1 |
| | | |||||
* | | By default, only room ops can change the name and topic. | Erik Johnston | 2014-09-02 | 1 | -0/+2 |
|/ | |||||
* | Add support for setting room name and topic when creating rooms | Erik Johnston | 2014-09-02 | 1 | -4/+29 |
| | |||||
* | Don't set a 'default' key in the creation event | Erik Johnston | 2014-09-01 | 1 | -1/+0 |
| | |||||
* | Don't put required power levels on permission state events | Erik Johnston | 2014-09-01 | 1 | -2/+4 |
| | |||||
* | Add all the necessary checks to make banning work. | Erik Johnston | 2014-09-01 | 1 | -1/+11 |
| | |||||
* | Add beginnings of ban support. | Erik Johnston | 2014-09-01 | 1 | -20/+29 |
| | |||||
* | Implement power level lists, default power levels and ↵ | Erik Johnston | 2014-09-01 | 1 | -9/+22 |
| | | | | send_evnet_level/add_state_level events. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into room_config | Erik Johnston | 2014-09-01 | 1 | -0/+46 |
|\ | |||||
| * | Renamed get_current_token_part to get_current_key | Paul "LeoNerd" Evans | 2014-08-29 | 1 | -2/+2 |
| | | |||||
| * | Have EventSource's get_new_events_for_user() API work only on keys within ↵ | Paul "LeoNerd" Evans | 2014-08-29 | 1 | -5/+3 |
| | | | | | | | | that source, not overall eventstream tokens | ||||
| * | Rename 'events_key' to 'room_key' so it matches the name of the event source | Paul "LeoNerd" Evans | 2014-08-29 | 1 | -5/+5 |
| | | |||||
| * | Move the *EventSource classes into the handlers they relate to, so it's ↵ | Paul "LeoNerd" Evans | 2014-08-29 | 1 | -0/+48 |
| | | | | | | | | easier to find the code | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into room_config | Erik Johnston | 2014-08-29 | 1 | -1/+2 |
|\| | |||||
| * | Fix bug where we used UserID objects instead of strigns | Erik Johnston | 2014-08-28 | 1 | -1/+2 |
| | | |||||
* | | Create the correct events with the right configuration when creating a new room. | Erik Johnston | 2014-08-28 | 1 | -19/+54 |
|/ | |||||
* | Split out MessageHandler | Erik Johnston | 2014-08-27 | 1 | -275/+2 |
| | |||||
* | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -28/+41 |
|\ | | | | | | | | | | | Conflicts: synapse/handlers/room.py synapse/storage/stream.py | ||||
| * | Remove stale FIXMEs | Erik Johnston | 2014-08-27 | 1 | -2/+0 |
| | | |||||
| * | Remove store_id from notifier.on_new_room_event calls. | Erik Johnston | 2014-08-27 | 1 | -12/+7 |
| | | |||||
| * | Index sources in a nicer fashion. | Erik Johnston | 2014-08-27 | 1 | -2/+2 |
| | | |||||
| * | Convert get_paginat_rows to use PaginationConfig. This allows people to ↵ | Erik Johnston | 2014-08-27 | 1 | -8/+7 |
| | | | | | | | | supply directions. | ||||
| * | PEP8 tweaks. | Erik Johnston | 2014-08-27 | 1 | -3/+9 |
| | | |||||
| * | Implement presence event source. Change the way the notifier indexes listeners | Erik Johnston | 2014-08-27 | 1 | -5/+10 |
| | | |||||
| * | Enable presence again. Fix up api to match old api. | Erik Johnston | 2014-08-26 | 1 | -2/+2 |
| | | |||||
| * | WIP: Completely change how event streaming and pagination work. This ↵ | Erik Johnston | 2014-08-26 | 1 | -21/+25 |
| | | | | | | | | reflects the change in the underlying storage model. | ||||
* | | add _get_room_member, fix datastore methods | Mark Haines | 2014-08-27 | 1 | -1/+1 |
| | | |||||
* | | Start updating state handling to use snapshots | Mark Haines | 2014-08-27 | 1 | -3/+10 |
| | | |||||
* | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -1/+5 |
|\| | |||||
| * | Respect 'limit' param in initialSync api | Erik Johnston | 2014-08-26 | 1 | -1/+5 |
| | | |||||
* | | Fold federation/handler into handlers/federation | Mark Haines | 2014-08-26 | 1 | -1/+2 |
| | | |||||
* | | Move new event boilerplate in room handlers into a method on a base clase. | Mark Haines | 2014-08-26 | 1 | -51/+14 |
| | | |||||
* | | Use state_key rather than target_user_id | Mark Haines | 2014-08-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-26 | 1 | -13/+36 |
|\| | | | | | | | | | | | | | Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py | ||||
| * | Fix pyflakes errors | Mark Haines | 2014-08-26 | 1 | -5/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-08-26 | 1 | -4/+29 |
| |\ | | | | | | | | | | client_server_url_rename | ||||
| | * | Turn off more spammy logging. | Erik Johnston | 2014-08-22 | 1 | -1/+1 |
| | | | |||||
| | * | Change IM sync api to also return the current presence list. | Erik Johnston | 2014-08-21 | 1 | -3/+21 |
| | | | |||||
| | * | In the initial sync api, return the inviter for rooms in the 'invited' state | Erik Johnston | 2014-08-21 | 1 | -0/+4 |
| | | | |||||
| | * | Return the current state in the initial sync api. | Erik Johnston | 2014-08-21 | 1 | -0/+3 |
| | | | |||||
| * | | Removed member list servlet: now using generic state paths. | Kegan Dougal | 2014-08-26 | 1 | -7/+9 |
| |/ | |||||
* | | fix a few pyflakes errors | Mark Haines | 2014-08-26 | 1 | -4/+3 |
| | | |||||
* | | Take a snapshot of the state of the room before performing updates | Mark Haines | 2014-08-22 | 1 | -42/+55 |
|/ | |||||
* | Use the "collect_presencelike_data" distributor signal instead of ↵ | Paul "LeoNerd" Evans | 2014-08-20 | 1 | -30/+2 |
| | | | | re-implementing its behaviour | ||||
* | Fix exception name in _fill_out_join_content() exception | Paul "LeoNerd" Evans | 2014-08-20 | 1 | -1/+3 |
| | |||||
* | Kill the "_homeserver_" injected messages for room membership changes | Paul "LeoNerd" Evans | 2014-08-20 | 1 | -56/+4 |
| | |||||
* | Better handle the edge cases of trying to remote join rooms | Erik Johnston | 2014-08-20 | 1 | -37/+10 |
| | |||||
* | Don't generate room membership messages. Include previous state of in ↵ | Erik Johnston | 2014-08-20 | 1 | -7/+10 |
| | | | | membership messages. | ||||
* | Change the way pagination works to support out of order events. | Erik Johnston | 2014-08-19 | 1 | -1/+2 |
| | |||||
* | Fix typos in SQL and where we still had rowid's (which no longer exist) | Erik Johnston | 2014-08-18 | 1 | -1/+1 |
| | |||||
* | Make snapshot_all_rooms return results in the correct form, including start ↵ | Erik Johnston | 2014-08-18 | 1 | -2/+7 |
| | | | | and end tokens. | ||||
* | Disable the ability to GET individualy messages. We need to think about the ↵ | Erik Johnston | 2014-08-18 | 1 | -5/+7 |
| | | | | correct API to do this, as the current one doesn't make much sense. | ||||
* | Fix typo of key name | Erik Johnston | 2014-08-15 | 1 | -1/+1 |
| | |||||
* | PEP8 cleanups | Erik Johnston | 2014-08-15 | 1 | -7/+10 |
| | |||||
* | Fix pagination to work with new db schema | Erik Johnston | 2014-08-15 | 1 | -24/+24 |
| | |||||
* | Correctly return new token when returning events. Serialize events correctly. | Erik Johnston | 2014-08-15 | 1 | -1/+4 |
| | |||||
* | Start chagning the events stream to work with the new DB schema | Erik Johnston | 2014-08-15 | 1 | -36/+43 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-15 | 1 | -2/+2 |
|\ | | | | | | | | | Conflicts: synapse/storage/stream.py | ||||
| * | Reflect user's messages up to themselves before pushing it to federatoin; ↵ | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -2/+2 |
| | | | | | | | | also release roomlock before touching federation so we don't halt progress on the world | ||||
* | | Reimplement the get public rooms api to work with new DB schema | Erik Johnston | 2014-08-15 | 1 | -1/+1 |
| | | |||||
* | | Fix up typos and correct sql queries | Erik Johnston | 2014-08-14 | 1 | -8/+2 |
| | | |||||
* | | Start fixing places that use the data store. | Erik Johnston | 2014-08-14 | 1 | -13/+4 |
|/ | |||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 1 | -0/+1 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 1 | -0/+808 |