summary refs log tree commit diff
path: root/synapse/handlers/room.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Generate guest access token on 3pid invitesDaniel Wagner-Hall2016-02-241-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 /joinDaniel Wagner-Hall2016-02-231-8/+59
|
* Review commentsDaniel Wagner-Hall2016-02-181-5/+4
|
* Some cleanupDaniel Wagner-Hall2016-02-171-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 contextDaniel Wagner-Hall2016-02-171-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 doDaniel Wagner-Hall2016-02-161-68/+60
|
* Some cleanupDaniel Wagner-Hall2016-02-161-19/+20
|
* Tidy? up room creation event sendingDaniel Wagner-Hall2016-02-161-63/+72
|
* Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-161-3/+3
|\ | | | | | | | | Conflicts: synapse/handlers/room.py
| * Simplify room creation codeDaniel Wagner-Hall2016-02-151-40/+28
| |
* | Branch off member and non member sendsDaniel Wagner-Hall2016-02-151-34/+46
| | | | | | | | Unclean, needs tidy-up, but works
* | Simplify room creation codeDaniel Wagner-Hall2016-02-151-37/+25
| |
* | Use update_membership for profile updatesDaniel Wagner-Hall2016-02-151-4/+0
| |
* | Use update_membership to kick guestsDaniel Wagner-Hall2016-02-151-2/+9
| |
* | Reuse update_membership from /joinDaniel Wagner-Hall2016-02-151-3/+9
| |
* | Inline _do_local_membership_updateDaniel Wagner-Hall2016-02-151-18/+7
| |
* | Inline _do_join as it now only has one callerDaniel Wagner-Hall2016-02-151-48/+47
| | | | | | | | | | | | Also, consistently apply rate limiting. Again, ugly, but a step in the right direction.
* | Merge implementation of /join by alias or IDDaniel Wagner-Hall2016-02-151-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 codepathsDaniel Wagner-Hall2016-02-151-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-Hall2016-02-121-35/+9
| | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check
* Merge two of the room join codepathsDaniel Wagner-Hall2016-02-121-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 /eventsErik Johnston2016-02-111-0/+1
|
* Fix up logcontextsErik Johnston2016-02-081-2/+9
|
* PEP8Erik Johnston2016-02-031-1/+1
|
* Remove unused methodErik Johnston2016-02-031-8/+0
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-02-031-3/+8
|\ | | | | | | erikj/public_room_fix
| * Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-021-1/+1
| |
| * s/get_room_changes_for_user/get_membership_changes_for_user/Erik Johnston2016-02-021-1/+1
| |
| * WARN if we get a topo token instead of stream.Erik Johnston2016-02-021-1/+6
| |
* | Change the way we do public room list fetchingErik Johnston2016-02-021-23/+63
|/
* Order things correctlyErik Johnston2016-02-011-1/+1
|
* Switch over /events to use per room cachesErik Johnston2016-02-011-5/+20
|
* Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-201-1/+1
|
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-151-2/+53
|
* Remove unused parametersDaniel Wagner-Hall2016-01-151-11/+5
|
* Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-12/+23
|\
| * Add 'event' result to 'context' endpointRichard van der Hoff2016-01-131-12/+23
| | | | | | | | ... because the context isn't much use without the event.
| * Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-131-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 requestsDaniel Wagner-Hall2016-01-051-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 accountsDaniel Wagner-Hall2016-01-051-1/+1
| |
* | Use named argsErik Johnston2016-01-051-2/+2
| |
* | Support inviting 3pids in /createRoomErik Johnston2016-01-051-0/+16
|/
* Return room avatar URLs in /publicRoomsDaniel Wagner-Hall2015-12-211-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 contextDaniel Wagner-Hall2015-12-161-7/+60
| | | | This allows it to form richer emails
* Add caches for whether a room has been forgotten by a userMark Haines2015-12-101-1/+1
|
* Add commentsMark Haines2015-12-021-0/+3
|
* Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-9/+15
|\ | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py
| * Wrap calls to distributor.fire in appropriately named functions so that ↵Mark Haines2015-12-011-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 Haines2015-12-011-4/+6
|/ | | | joined the room
* Allow users to forget roomsDaniel Wagner-Hall2015-11-171-0/+3
|
* Fix missing profile data in federation joinsErik Johnston2015-11-121-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 APIDaniel Wagner-Hall2015-11-111-3/+9
|
* Allow guest users to join and message roomsDaniel Wagner-Hall2015-11-101-1/+15
|
* Get display name from identity server, not clientDaniel Wagner-Hall2015-11-091-5/+3
|
* Exchange 3pid invites for m.room.member invitesDaniel Wagner-Hall2015-11-051-8/+11
|
* Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-051-1/+10
| | | | Squash-merge of PR #345 from daniel/anonymousevents
* Remove more unused parametersDaniel Wagner-Hall2015-11-021-1/+0
|
* DocsErik Johnston2015-10-281-0/+13
|
* Add room context apiErik Johnston2015-10-281-0/+42
|
* Allow rejecting invitesDaniel Wagner-Hall2015-10-201-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 certificatesDaniel Wagner-Hall2015-10-161-2/+29
|
* Use non-placeholder name for endpointDaniel Wagner-Hall2015-10-151-1/+1
|
* Look for keys on the right objectsDaniel Wagner-Hall2015-10-151-2/+2
|
* Move logic into handlerDaniel Wagner-Hall2015-10-131-0/+132
|
* Move event contents into third_party_layout fieldDaniel Wagner-Hall2015-10-131-4/+7
|
* Merge branch 'develop' into daniel/3pidinvitesDaniel Wagner-Hall2015-10-051-2/+21
|\
| * Add 'trusted_private_chat' to room creation presetsErik Johnston2015-10-021-0/+5
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-021-65/+12
| |\
| | * Merge pull request #287 from matrix-org/erikj/canonical_aliasErik Johnston2015-09-301-1/+10
| | |\ | | | | | | | | Set m.room.canonical_alias on room creation.
| | | * Remove double indentationErik Johnston2015-09-301-7/+6
| | | |
| | | * Set m.room.canonical_alias on room creation.Erik Johnston2015-09-231-1/+11
| | | |
| * | | Add flag which disables federation of the roomErik Johnston2015-09-011-2/+6
| | | |
* | | | Implement third party identifier invitesDaniel Wagner-Hall2015-10-011-0/+4
| |/ / |/| |
* | | Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-281-26/+0
|\ \ \ | |_|/ |/| | Remove some of the unused definitions from synapse
| * | synapse/handlers/room.py:_should_invite_join was unusedMark Haines2015-09-231-26/+0
| | |
* | | Merge pull request #271 from matrix-org/erikj/default_historyErik Johnston2015-09-231-1/+1
|\ \ \ | |/ / |/| | Change default history visibility for private rooms
| * | Change default history visibility for private roomsErik Johnston2015-09-091-1/+1
| |/
* | Remove undocumented and unimplemented 'feedback' parameter from the ↵Mark Haines2015-09-091-1/+0
| | | | | | | | Client-Server API
* | Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-091-36/+0
|/ | | | they left
* Add m.room.avatar to default power levels. Change default required power ↵Erik Johnston2015-08-201-2/+3
| | | | levels of such events to 50
* Merge pull request #233 from matrix-org/erikj/canonical_aliasErik Johnston2015-08-201-0/+1
|\ | | | | Add server side support for canonical aliases
| * Add canonical alias to the default power levelsErik Johnston2015-08-191-0/+1
| |
* | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_usersErik Johnston2015-08-191-8/+2
|/
* Implement specifying custom initial state for /createRoomErik Johnston2015-07-161-40/+60
|
* s/everyone_ops/original_invitees_have_ops/Erik Johnston2015-07-141-3/+3
|
* Capitalize contantsErik Johnston2015-07-141-4/+4
|
* Implement presets at room creationErik Johnston2015-07-131-22/+60
|
* Add m.room.history_visibility to newly created rooms' m.room.power_levelsErik Johnston2015-07-061-0/+1
|
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-05-221-3/+1
|\
| * Add caches for things requested by the pushersMark Haines2015-05-211-3/+1
| |
* | Throw error when creating room if alias contains whitespace #SYN-335David Baker2015-05-141-0/+5
| |
* | Merge pull request #144 from matrix-org/erikj/logging_contextMark Haines2015-05-121-2/+2
|\ \ | | | | | | Preserving logging contexts
| * | Unwrap defer.gatherResults failuresErik Johnston2015-05-121-2/+2
| |/
* / Make get_current_token accept a direction parameter, which tells whether the ↵Erik Johnston2015-05-121-2/+2
|/ | | | source whether we want a token for going 'forwards' or 'backwards'
* One too many lensErik Johnston2015-05-011-1/+1
|
* Change public room list to use defer.gatherResultsErik Johnston2015-05-011-5/+13
|
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-281-1/+2
|\
| * Create an 'invite' powerlevel when making new roomsPaul "LeoNerd" Evans2015-04-211-1/+2
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-271-4/+4
|\|
| * SYN-350: Don't ratelimit the individual events generated during room creationMark Haines2015-04-211-4/+4
| |
* | Sanitize RoomMemberStoreErik Johnston2015-03-231-19/+0
|/
* Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This ↵Erik Johnston2015-03-091-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 /eventsKegan Dougal2015-02-261-1/+3
|
* Add stub functions and work out execution flow to implement AS event stream ↵Kegan Dougal2015-02-251-9/+25
| | | | polling.
* Remove debug loggingErik Johnston2015-02-111-2/+0
|
* Don't unfreeze when using FreezeEvent.get_dict, as we are using a ↵Erik Johnston2015-02-111-1/+3
| | | | JSONEncoder that understands FrozenDict
* Pass through list of room hosts from room alias query to federation so that ↵Erik Johnston2015-02-051-7/+5
| | | | it can retry against different room hosts
* Pass the current time to serialize event, rather than passing anMark Haines2015-01-261-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_stringMark Haines2015-01-231-2/+0
|
* Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-231-7/+7
|
* PEP8 and pyflakes warningsKegan Dougal2015-01-071-1/+3
|
* SYN-154: Tweak how the m.room.create check is done.Kegan Dougal2015-01-071-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 Dougal2015-01-071-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-perfMark Haines2015-01-061-8/+5
|\ | | | | Database performance improvements.
| * Add RoomMemberStore.get_users_in_room, so that we can get the list of joined ↵Erik Johnston2015-01-061-8/+5
| | | | | | | | users without having to retrieve the full events
* | Update copyright noticesMark Haines2015-01-061-1/+1
|/
* Set a state_key for the topic and room name, otherwise they won't be treated ↵Mark Haines2014-12-191-0/+2
| | | | as room state
* Set display name when joining via aliasMark Haines2014-12-191-0/+5
|
* s/user_id/sender/Mark Haines2014-12-191-1/+1
|
* Kill off synapse.api.events.*Erik Johnston2014-12-161-16/+12
|
* Rename MessageHandler.handle_event. Add a few comments.Erik Johnston2014-12-151-4/+4
|
* Get current member state from current_state snapshot. Fix leave test.Erik Johnston2014-12-151-3/+3
|
* Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-151-0/+7
|\ | | | | | | | | Conflicts: tests/handlers/test_room.py
| * Add a 'user_left_room' distributor signal analogous to 'user_joined_room'Paul "LeoNerd" Evans2014-12-111-0/+7
| |
* | .from_string() no longer takes a HSErik Johnston2014-12-101-2/+2
| |
* | Try and figure out how and why signatures are being changed.Erik Johnston2014-12-101-5/+2
| |
* | PEP8Erik Johnston2014-12-091-1/+1
| |
* | Fix joining from an inviteErik Johnston2014-12-091-13/+3
| |
* | More bug fixesErik Johnston2014-12-081-3/+8
| |
* | More bug fixesErik Johnston2014-12-081-6/+1
| |
* | More bug fixesErik Johnston2014-12-081-2/+2
| |
* | Convert rest and handlers to use new event structureErik Johnston2014-12-041-77/+53
| |
* | Begin converting things to use the new Event structureErik Johnston2014-12-041-0/+1
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-031-1/+5
|\|
| * Squash room_ids list to a set() to remove duplicates - with TODO marker as I ↵Paul "LeoNerd" Evans2014-12-021-1/+5
| | | | | | | | have no idea /why/ the dups are happening in the first place
* | Change DomainSpecificString so that it doesn't use a HomeServer objectErik Johnston2014-12-021-8/+11
|/
* Fix pep8 codestyle warningsMark Haines2014-11-201-2/+3
|
* Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵Mark Haines2014-11-201-2/+2
| | | | because they don't interact well with the logging contexts
* Don't add a 'prev' key to m.room.member messagesErik Johnston2014-11-191-3/+0
|
* SYN-149: Enable auth for events added during room creation since they should ↵Mark Haines2014-11-181-1/+1
| | | | pass auth checks
* SYN-149: Send join event immediately after the room create eventMark Haines2014-11-181-24/+26
|
* Split out sending the room alias events from creating the alias so that we ↵Mark Haines2014-11-181-7/+10
| | | | can do them in the right point when creating a room
* SYN-148: Add the alias after creating the roomMark Haines2014-11-171-9/+9
|
* Fix bugs with invites/joins across federatiom.Erik Johnston2014-11-121-2/+8
| | | | | Both in terms of auth and not trying to fetch missing PDUs for invites, joins etc.
* Implement invite part of invite join danceErik Johnston2014-11-071-20/+12
|
* Amalgamate all power levels.Erik Johnston2014-11-061-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_stateErik Johnston2014-11-061-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 testsErik Johnston2014-11-041-1/+0
|
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-10-301-20/+6
|\ | | | | | | federation_authorization
| * Construct a source-specific 'SourcePaginationConfig' to pass into ↵Paul "LeoNerd" Evans2014-10-291-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_roomMark Haines2014-10-271-5/+0
| |
* | Begin making auth use event.old_state_eventsErik Johnston2014-10-151-10/+9
|/
* Merge branch 'deletions' of github.com:matrix-org/synapse into developErik Johnston2014-09-251-0/+1
|\
| * Rename deletions to redactionsErik Johnston2014-09-241-1/+1
| |
| * SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops ↵Erik Johnston2014-09-231-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 Johnston2014-09-241-11/+0
|/ | | | didn't supply a name
* Correctly handle the 'age' key in events and pdusErik Johnston2014-09-151-1/+1
|
* Added num_joined_users key to /publicRooms for each room. Show this ↵Kegan Dougal2014-09-081-0/+6
| | | | information in the webclient.
* Add support for inviting people when you create a roomErik Johnston2014-09-061-0/+26
|
* Generate m.room.aliases event when the HS creates a room aliasErik Johnston2014-09-051-5/+7
|
* Change the default power levels to be 0, 50 and 100Erik Johnston2014-09-051-8/+8
|
* When creating a room and a user supplies a room_alias but no name, use the ↵Erik Johnston2014-09-031-0/+11
| | | | room_alias as the name.
* fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵Matthew Hodgson2014-09-031-1/+1
| | | | hasn't been incorporated in time for launch.
* Add copyright notices and fix pyflakes errorsMark Haines2014-09-031-2/+0
|
* Merge branch 'ratelimiting' into developMark Haines2014-09-031-0/+1
|\
| * rate limiting for message sendingMark Haines2014-09-021-0/+1
| |
* | By default, only room ops can change the name and topic.Erik Johnston2014-09-021-0/+2
|/
* Add support for setting room name and topic when creating roomsErik Johnston2014-09-021-4/+29
|
* Don't set a 'default' key in the creation eventErik Johnston2014-09-011-1/+0
|
* Don't put required power levels on permission state eventsErik Johnston2014-09-011-2/+4
|
* Add all the necessary checks to make banning work.Erik Johnston2014-09-011-1/+11
|
* Add beginnings of ban support.Erik Johnston2014-09-011-20/+29
|
* Implement power level lists, default power levels and ↵Erik Johnston2014-09-011-9/+22
| | | | send_evnet_level/add_state_level events.
* Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-011-0/+46
|\
| * Renamed get_current_token_part to get_current_keyPaul "LeoNerd" Evans2014-08-291-2/+2
| |
| * Have EventSource's get_new_events_for_user() API work only on keys within ↵Paul "LeoNerd" Evans2014-08-291-5/+3
| | | | | | | | that source, not overall eventstream tokens
| * Rename 'events_key' to 'room_key' so it matches the name of the event sourcePaul "LeoNerd" Evans2014-08-291-5/+5
| |
| * Move the *EventSource classes into the handlers they relate to, so it's ↵Paul "LeoNerd" Evans2014-08-291-0/+48
| | | | | | | | easier to find the code
* | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-08-291-1/+2
|\|
| * Fix bug where we used UserID objects instead of strignsErik Johnston2014-08-281-1/+2
| |
* | Create the correct events with the right configuration when creating a new room.Erik Johnston2014-08-281-19/+54
|/
* Split out MessageHandlerErik Johnston2014-08-271-275/+2
|
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-271-28/+41
|\ | | | | | | | | | | Conflicts: synapse/handlers/room.py synapse/storage/stream.py
| * Remove stale FIXMEsErik Johnston2014-08-271-2/+0
| |
| * Remove store_id from notifier.on_new_room_event calls.Erik Johnston2014-08-271-12/+7
| |
| * Index sources in a nicer fashion.Erik Johnston2014-08-271-2/+2
| |
| * Convert get_paginat_rows to use PaginationConfig. This allows people to ↵Erik Johnston2014-08-271-8/+7
| | | | | | | | supply directions.
| * PEP8 tweaks.Erik Johnston2014-08-271-3/+9
| |
| * Implement presence event source. Change the way the notifier indexes listenersErik Johnston2014-08-271-5/+10
| |
| * Enable presence again. Fix up api to match old api.Erik Johnston2014-08-261-2/+2
| |
| * WIP: Completely change how event streaming and pagination work. This ↵Erik Johnston2014-08-261-21/+25
| | | | | | | | reflects the change in the underlying storage model.
* | add _get_room_member, fix datastore methodsMark Haines2014-08-271-1/+1
| |
* | Start updating state handling to use snapshotsMark Haines2014-08-271-3/+10
| |
* | Merge branch 'develop' into storage_transactionsMark Haines2014-08-271-1/+5
|\|
| * Respect 'limit' param in initialSync apiErik Johnston2014-08-261-1/+5
| |
* | Fold federation/handler into handlers/federationMark Haines2014-08-261-1/+2
| |
* | Move new event boilerplate in room handlers into a method on a base clase.Mark Haines2014-08-261-51/+14
| |
* | Use state_key rather than target_user_idMark Haines2014-08-261-1/+1
| |
* | Merge branch 'develop' into storage_transactionsMark Haines2014-08-261-13/+36
|\| | | | | | | | | | | | | Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py
| * Fix pyflakes errorsMark Haines2014-08-261-5/+1
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Kegan Dougal2014-08-261-4/+29
| |\ | | | | | | | | | client_server_url_rename
| | * Turn off more spammy logging.Erik Johnston2014-08-221-1/+1
| | |
| | * Change IM sync api to also return the current presence list.Erik Johnston2014-08-211-3/+21
| | |
| | * In the initial sync api, return the inviter for rooms in the 'invited' stateErik Johnston2014-08-211-0/+4
| | |
| | * Return the current state in the initial sync api.Erik Johnston2014-08-211-0/+3
| | |
| * | Removed member list servlet: now using generic state paths.Kegan Dougal2014-08-261-7/+9
| |/
* | fix a few pyflakes errorsMark Haines2014-08-261-4/+3
| |
* | Take a snapshot of the state of the room before performing updatesMark Haines2014-08-221-42/+55
|/
* Use the "collect_presencelike_data" distributor signal instead of ↵Paul "LeoNerd" Evans2014-08-201-30/+2
| | | | re-implementing its behaviour
* Fix exception name in _fill_out_join_content() exceptionPaul "LeoNerd" Evans2014-08-201-1/+3
|
* Kill the "_homeserver_" injected messages for room membership changesPaul "LeoNerd" Evans2014-08-201-56/+4
|
* Better handle the edge cases of trying to remote join roomsErik Johnston2014-08-201-37/+10
|
* Don't generate room membership messages. Include previous state of in ↵Erik Johnston2014-08-201-7/+10
| | | | membership messages.
* Change the way pagination works to support out of order events.Erik Johnston2014-08-191-1/+2
|
* Fix typos in SQL and where we still had rowid's (which no longer exist)Erik Johnston2014-08-181-1/+1
|
* Make snapshot_all_rooms return results in the correct form, including start ↵Erik Johnston2014-08-181-2/+7
| | | | and end tokens.
* Disable the ability to GET individualy messages. We need to think about the ↵Erik Johnston2014-08-181-5/+7
| | | | correct API to do this, as the current one doesn't make much sense.
* Fix typo of key nameErik Johnston2014-08-151-1/+1
|
* PEP8 cleanupsErik Johnston2014-08-151-7/+10
|
* Fix pagination to work with new db schemaErik Johnston2014-08-151-24/+24
|
* Correctly return new token when returning events. Serialize events correctly.Erik Johnston2014-08-151-1/+4
|
* Start chagning the events stream to work with the new DB schemaErik Johnston2014-08-151-36/+43
|
* Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-151-2/+2
|\ | | | | | | | | Conflicts: synapse/storage/stream.py
| * Reflect user's messages up to themselves before pushing it to federatoin; ↵Paul "LeoNerd" Evans2014-08-141-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 schemaErik Johnston2014-08-151-1/+1
| |
* | Fix up typos and correct sql queriesErik Johnston2014-08-141-8/+2
| |
* | Start fixing places that use the data store.Erik Johnston2014-08-141-13/+4
|/
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-131-0/+1
|
* Reference Matrix Home Servermatrix.org2014-08-121-0/+808