summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #631 from matrix-org/markjh/py3v1Mark Haines2016-03-082-2/+2
|\ | | | | Use syntax that's valid on both py2.7 and py3
| * Use syntax that works on both py2.7 and py3Mark Haines2016-03-072-2/+2
| |
* | Send the user ID matching the guest access token, since there is no Matrix ↵David Baker2016-03-071-0/+5
|/ | | | API to discover what user ID an access token is for.
* Merge pull request #626 from matrix-org/erikj/visibilityErik Johnston2016-03-071-0/+26
|\ | | | | Send history visibility on boundary changes
| * Send history visibility on boundary changesErik Johnston2016-03-041-0/+26
| |
* | Merge pull request #618 from matrix-org/markjh/pushrule_streamMark Haines2016-03-042-2/+24
|\ \ | | | | | | Add a stream for push rule updates
| * | Merge branch 'develop' into markjh/pushrule_streamMark Haines2016-03-0410-80/+162
| |\|
| * | Hook up the push rules stream to account_data in /syncMark Haines2016-03-041-0/+22
| | |
| * | Hook up the push rules to the notifierMark Haines2016-03-031-2/+2
| | |
* | | Merge pull request #625 from matrix-org/erikj/kick_ban_syncErik Johnston2016-03-041-3/+9
|\ \ \ | | | | | | | | Always include kicks and bans in full /sync
| * | | Always include kicks and bans in full /syncErik Johnston2016-03-041-3/+9
| | |/ | |/|
* | | SpellingErik Johnston2016-03-041-1/+1
| | |
* | | Add profile information to invitesErik Johnston2016-03-041-2/+15
|/ /
* | Merge pull request #598 from Rugvip/invite-stateErik Johnston2016-03-041-6/+2
|\ \ | | | | | | config,handlers/_base: added homeserver config for what state is included in a room invite
| * | config,handlers/_base: added homeserver config for what state is included in ↵Patrik Oldsberg2016-03-041-6/+2
| | | | | | | | | | | | | | | | | | a room invite Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | Merge pull request #596 from Rugvip/createErik Johnston2016-03-041-0/+6
|\ \ \ | |/ / |/| | handlers/_base: don't allow room create event to be changed
| * | handlers/_base: don't allow room create event to be changedPatrik Oldsberg2016-02-231-0/+6
| | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | Merge pull request #610 from Rugvip/unique-userErik Johnston2016-03-041-0/+1
|\ \ \ | | | | | | | | handlers/register: make sure another user id is generated when a collision occurs
| * | | handlers/register: make sure another user id is generated when a collision ↵Patrik Oldsberg2016-02-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | occurs Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | | Merge pull request #623 from matrix-org/rav/fix_createroom_raceRichard van der Hoff2016-03-041-1/+1
|\ \ \ \ | | | | | | | | | | Make sure we add all invited members before returning from createRoom
| * | | | Make sure we add all invited members before returning from createRoomRichard van der Hoff2016-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | add a missing yield.
* | | | | Merge pull request #614 from matrix-org/erikj/alias_deleteErik Johnston2016-03-041-6/+21
|\ \ \ \ \ | | | | | | | | | | | | Allow alias creators to delete aliases
| * | | | | Allow alias creators to delete aliasesErik Johnston2016-03-011-6/+21
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642Richard van der Hoff2016-03-037-57/+85
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #621 from matrix-org/daniel/ratelimitingDaniel Wagner-Hall2016-03-036-56/+84
| |\ \ \ \ | | | | | | | | | | | | Pass whole requester to ratelimiting
| | * | | | Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-036-56/+84
| | | | | | | | | | | | | | | | | | | | | | | | This will enable more detailed decisions
| * | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use ↵David Baker2016-03-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | `bcrypt.hashpw(password, hashed) == hashed` as per the bcrypt README.
* | | | | Merge branch 'develop' into rav/SYN-642Richard van der Hoff2016-03-033-2/+37
|\| | | |
| * | | | Merge pull request #612 from matrix-org/erikj/cache_sizeErik Johnston2016-03-022-2/+4
| |\ \ \ \ | | |_|_|/ | |/| | | Add environment variable SYNAPSE_CACHE_FACTOR, default it to 0.1
| | * | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1Erik Johnston2016-03-012-2/+4
| | |/ /
| * / / Add a /replication API for extracting the updates that happened onMark Haines2016-03-012-0/+33
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates.
* | | Fix typoRichard van der Hoff2016-03-031-1/+1
| | |
* | | Move arg default to the start of the functionRichard van der Hoff2016-03-021-2/+3
| | | | | | | | | | | | Also don't overwrite the list that gets passed in.
* | | fix pyflakes quibbleRichard van der Hoff2016-03-021-1/+2
| | |
* | | Address review commentsRichard van der Hoff2016-03-022-8/+17
| | |
* | | Fix pyflakes warningRichard van der Hoff2016-03-011-1/+1
| | |
* | | Handle rejections of invites from local users locallyRichard van der Hoff2016-03-012-8/+31
|/ / | | | | | | | | Slightly hacky fix to SYN-642, which avoids the federation codepath when trying to reject invites from local users.
* | Send the invier's member event in room invite state so the invitee has their ↵David Baker2016-02-251-1/+7
| | | | | | | | display name and avatar.
* | Generate guest access token on 3pid invitesDaniel Wagner-Hall2016-02-242-0/+23
| | | | | | | | | | | | | | | | | | 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.
* | Check presence token interval is less than 100, rather than the token itselfErik Johnston2016-02-231-4/+4
| |
* | Merge pull request #602 from matrix-org/erikj/presenceErik Johnston2016-02-231-19/+45
|\ \ | | | | | | Change the way we figure out presence updates for small deltas
| * | Handle get_all_entities_changed returning NoneErik Johnston2016-02-231-0/+3
| | |
| * | Add commentsErik Johnston2016-02-231-0/+4
| | |
| * | Change the way we figure out presence updates for small deltasErik Johnston2016-02-231-17/+36
| | |
* | | Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-232-29/+131
| | |
* | | Merge pull request #600 from matrix-org/erikj/presenceErik Johnston2016-02-231-26/+30
|\| | | | | | | | Measure PresenceEventSource.get_new_events
| * | Don't include defer.returnValue in Measure blockErik Johnston2016-02-231-9/+12
| | |
| * | Measure PresenceEventSource.get_new_eventsErik Johnston2016-02-231-34/+35
| | |
* | | handlers/sync: style fix, line too longPatrik Oldsberg2016-02-231-1/+5
| | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | Pick up currently_active across federationErik Johnston2016-02-231-0/+1
| | |
* | | handlers/sync: fix SyncResult not counting account_data change when ↵Patrik Oldsberg2016-02-231-1/+1
| |/ |/| | | | | | | | | | | | | converting to bool This fixes account_data events not triggering an immediate /sync response Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | Merge pull request #587 from matrix-org/rav/guest_access_after_room_joinRichard van der Hoff2016-02-222-15/+40
|\ \ | |/ |/| Allow guest users access to messages in rooms they have joined
| * address review commentsRichard van der Hoff2016-02-221-7/+2
| | | | | | | | drop commented-out special casing for historyvisibility event s/he/they/ for users
| * Interpret unknown visibilities the same as sharedRichard van der Hoff2016-02-191-11/+13
| |
| * Merge branch 'develop' into rav/guest_access_after_room_joinRichard van der Hoff2016-02-199-1348/+1160
| |\
| * | Allow guest users access to messages in rooms they have joinedRichard van der Hoff2016-02-192-13/+41
| | | | | | | | | | | | | | | | | | | | | There should be no difference between guest users and non-guest users in terms of access to messages. Define the semantics of the is_peeking argument to filter_events_for_clients (slightly) better; interpret it appropriately, and set it correctly from /sync.
* | | Remove superfluous call to get_state_at when we already have an event for ↵Erik Johnston2016-02-221-4/+12
| | | | | | | | | | | | that stream position
* | | Correctly filter statesErik Johnston2016-02-191-2/+2
| | |
* | | Only send presence updates to remote hosts if user is oursErik Johnston2016-02-191-2/+10
| | |
* | | Add Measures to presenceErik Johnston2016-02-191-57/+62
| |/ |/|
* | Add presence metricErik Johnston2016-02-191-0/+3
| |
* | Remove spurious extra metricsErik Johnston2016-02-191-1/+0
| |
* | Merge pull request #586 from matrix-org/erikj/presenceErik Johnston2016-02-191-6/+26
|\ \ | | | | | | Fix presence `currently_active`. Add presence metrics.
| * | Don't set currently_active for remote presenceErik Johnston2016-02-191-6/+12
| | |
| * | More metricsErik Johnston2016-02-191-0/+6
| | |
| * | Add presence metricsErik Johnston2016-02-191-0/+8
| | |
* | | Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-195-1028/+784
|\| | | | | | | | Rewrite presence for performance.
| * | Remove invalid arg.Erik Johnston2016-02-181-1/+0
| | |
| * | Add unit testErik Johnston2016-02-181-93/+187
| | |
| * | Add stuff pulled from the DB to the cacheErik Johnston2016-02-181-2/+4
| | |
| * | PEP8Erik Johnston2016-02-181-2/+2
| | |
| * | Prefix TS fields with _tsErik Johnston2016-02-181-27/+27
| | |
| * | Remove status_msg when going offline. Don't offline -> online if you send a ↵Erik Johnston2016-02-181-5/+15
| | | | | | | | | | | | message
| * | Check presence state is a valid oneErik Johnston2016-02-181-0/+6
| | |
| * | Move if statementErik Johnston2016-02-181-8/+8
| | |
| * | CommentErik Johnston2016-02-181-0/+2
| | |
| * | Remove spurious commentErik Johnston2016-02-171-1/+0
| | |
| * | Initial cutErik Johnston2016-02-175-1050/+694
| |/
* | Merge pull request #573 from matrix-org/erikj/sync_fixErik Johnston2016-02-181-5/+12
|\ \ | | | | | | Mitigate against incorrect old state in /sync.
| * | Mitigate against incorrect old state in /sync.Erik Johnston2016-02-121-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | There have been reports from the field that servers occasionally have incorrect notions of what the old state of a room is. This proves problematic as /sync relies on a correct old state. This patch makes /sync specifically include in the 'state' key any current state events that haven't been correctly included.
* | | Review commentsDaniel Wagner-Hall2016-02-183-7/+7
| | |
* | | 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-172-42/+61
| | | | | | | | | | | | | | | | | | | | | 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-162-23/+30
| | |
* | | Tidy? up room creation event sendingDaniel Wagner-Hall2016-02-161-63/+72
| | |
* | | Add commentDaniel Wagner-Hall2016-02-161-1/+1
| | |
* | | 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-154-69/+83
| | | | | | | | | | | | 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-152-20/+12
| | |
* | | Use update_membership to kick guestsDaniel Wagner-Hall2016-02-152-16/+19
| | |
* | | 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-153-33/+32
| | | | | | | | | | | | | | | 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-122-44/+11
| | | | | | | | | | | | This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check
* | Merge two of the room join codepathsDaniel Wagner-Hall2016-02-122-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Enforce user_id exclusivity for AS registrationsDaniel Wagner-Hall2016-02-111-5/+12
|/ | | | | This whole set of checks is kind of an ugly mess, which I may clean up at some point, but for now let's be correct.
* Return events in correct order for /eventsErik Johnston2016-02-111-0/+1
|
* Use _simple_select_many for _get_state_group_for_eventsErik Johnston2016-02-101-1/+1
|
* Only calculate initial sync for 10 rooms at a timeErik Johnston2016-02-101-24/+29
| | | | This helps to ensure we don't completely starve other requests.
* Atomically persit push actions when we persist the eventErik Johnston2016-02-092-11/+11
|
* Pass in current state to push action handlerErik Johnston2016-02-091-18/+13
|
* Remove dead codeErik Johnston2016-02-091-12/+0
|
* Don't load all ephemeral state for a room on every syncErik Johnston2016-02-091-14/+6
|
* Fix unit testsErik Johnston2016-02-091-1/+4
|
* Measure some /sync related thingsErik Johnston2016-02-092-150/+162
|
* Fix up logcontextsErik Johnston2016-02-087-87/+57
|
* Allocate guest user IDs numericcallyDaniel Wagner-Hall2016-02-051-19/+36
| | | | | | | | | The current random IDs are ugly and confusing when presented in UIs. This makes them prettier and easier to read. Also, disable non-automated registration of numeric IDs so that we don't need to worry so much about people carving out our automated address space and us needing to keep retrying ID registration.
* Merge pull request #555 from matrix-org/erikj/logcontextErik Johnston2016-02-031-0/+10
|\ | | | | Allowing tagging log contexts
| * Allowing tagging log contextsErik Johnston2016-02-031-0/+10
| |
* | Merge pull request #554 from matrix-org/erikj/event_pushErik Johnston2016-02-031-4/+2
|\ \ | | | | | | Change event_push_actions_rm_tokens schema
| * | Change event_push_actions_rm_tokens schemaErik Johnston2016-02-031-4/+2
| |/
* | 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-037-77/+117
|\| | | | | | | erikj/public_room_fix
| * Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-026-7/+7
| |
| * s/get_room_changes_for_user/get_membership_changes_for_user/Erik Johnston2016-02-022-2/+2
| |
| * Merge pull request #545 from matrix-org/erikj/syncErik Johnston2016-02-021-66/+99
| |\ | | | | | | Move /sync state calculations from rest to handler
| | * CommentsErik Johnston2016-02-011-5/+6
| | |
| | * Move state calculations from rest to handlerErik Johnston2016-02-011-66/+98
| | |
| * | Pass make_guest whne we autogen a user IDDavid Baker2016-02-021-1/+3
| | |
| * | 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
|/
* Add missing param to the log lineMark Haines2016-01-291-1/+2
|
* Merge remote-tracking branch 'origin/develop' into markjh/3pidMark Haines2016-01-292-253/+187
|\
| * Don't work out unread_notifs_for_room_id unless neededErik Johnston2016-01-291-11/+12
| |
| * Change load limit paramsErik Johnston2016-01-281-2/+2
| |
| * Amalgamate incremental and full sync for userErik Johnston2016-01-281-40/+16
| |
| * Allow paginating backwards from stream tokenErik Johnston2016-01-281-6/+9
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-281-22/+21
| |\
| * | Use the same path for incremental with gap or without gapErik Johnston2016-01-271-208/+144
| | |
| * | Add cache to room streamErik Johnston2016-01-271-12/+30
| | |
* | | Add config option for setting the trusted id servers, disabling checking the ↵Mark Haines2016-01-291-8/+17
| |/ |/| | | | | ID server in integration tests
* | Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-271-22/+21
|/ | | | | In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token.
* Federation: drop events which cause SynapseErrorsRichard van der Hoff2016-01-271-1/+7
| | | | | ... rather than rejecting any attempt to federate channels which contain such events.
* Merge pull request #524 from matrix-org/erikj/syncErik Johnston2016-01-251-41/+141
|\ | | | | Move some sync logic from rest to handlers pacakege
| * PEP8Erik Johnston2016-01-251-1/+0
| |
| * Remove weird stuffErik Johnston2016-01-251-6/+0
| |
| * Move logic from rest/ to handlers/Erik Johnston2016-01-251-41/+148
| |
* | Underscores are allowed in user idsErik Johnston2016-01-221-1/+1
|/
* Only fetch events for rooms and receiptsErik Johnston2016-01-211-3/+3
|
* Don't explode when given a unicode username in /register/Erik Johnston2016-01-201-3/+2
|
* Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-205-58/+57
|
* Merge pull request #506 from matrix-org/erikj/push_fastErik Johnston2016-01-191-28/+22
|\ | | | | Only compute unread notifications for rooms we send down stream
| * Only compute unread notifications for rooms we send down streamErik Johnston2016-01-191-28/+22
| |
* | Don't use form of get_state_for_events with None state_keyErik Johnston2016-01-191-6/+13
|/
* Add regex cache. Only caculate push actions for users that have sent read ↵Erik Johnston2016-01-192-2/+2
| | | | receipts, and are on that server
* Use all_ephemeral_by_room in incremental_sync_with_gap_for_roomErik Johnston2016-01-191-3/+5
|
* Return highlight_count in /syncErik Johnston2016-01-191-6/+36
|
* Re-enable urnead notificationsErik Johnston2016-01-182-10/+6
|
* Allow filtering events for multiple users at onceErik Johnston2016-01-181-39/+54
|
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-153-16/+100
|
* Remove unused parametersDaniel Wagner-Hall2016-01-152-16/+8
|
* M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-151-1/+1
|
* Add specific error code for invalid user names.David Baker2016-01-141-1/+2
|
* 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-134-19/+4
| | | | | | | | | | | | | | | | | | | | 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.
* | Use logger not loggingErik Johnston2016-01-141-2/+2
| |
* | Don't change signature. Return empty listErik Johnston2016-01-131-2/+2
| |
* | Temporarily disable notification branchErik Johnston2016-01-132-7/+11
| |
* | Merge pull request #480 from matrix-org/erikj/guest_event_tightloopErik Johnston2016-01-131-7/+0
|\ \ | | | | | | Dont fire user_joined_room when guest hits /events
| * | Dont fire user_joined_room when guest hits /eventsErik Johnston2016-01-121-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firing the 'user_joined_room' signal everytime a guest hits /events causes all presence for that room to be returned in the stream. This may sound helpful, but causes clients to tightloop calling /events. In general, guest users should get the initial presence from (room) intial sync and so we don't require presence to sbsequently come down the event stream.
* | | Don't include old left roomsErik Johnston2016-01-121-1/+5
|/ /
* | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-084-1/+80
|\ \ | | | | | | Send unread notification counts
| * | comma styleDavid Baker2016-01-061-1/+1
| | |
| * | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-061-107/+47
| |\ \
| * | | Add is_guest flag to users db to track whether a user is a guest user or ↵David Baker2016-01-063-9/+9
| | | | | | | | | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions.
| * | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-056-35/+53
| |\ \ \
| * | | | commaDavid Baker2016-01-041-1/+1
| | | | |
| * | | | Add unread_notif_count in incremental_sync_with_gapDavid Baker2016-01-041-0/+8
| | | | |
| * | | | Rename event-actions to event_push_actions as per PR requestDavid Baker2016-01-041-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-041-1/+24
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Address minor PR issuesDavid Baker2016-01-042-4/+4
| | | | |
| * | | | Fix merge fail with anon access stuffDavid Baker2015-12-221-2/+2
| | | | |
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-222-47/+128
| |\ \ \ \
| * | | | | Add some comments to areas that could be optimised.David Baker2015-12-221-0/+3
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2015-12-216-43/+140
| |\ \ \ \ \
| * | | | | | Only run pushers for users on this hs!David Baker2015-12-212-2/+2
| | | | | | |
| * | | | | | pep8David Baker2015-12-211-3/+3
| | | | | | |
| * | | | | | Make unread notification count sending work: put the correct count in ↵David Baker2015-12-181-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user...
| * | | | | | still very WIP, but now sends unread_notifications_count in the room object ↵David Baker2015-12-161-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).
| * | | | | | Having consulted The Erikle, this should go at the end of on_receive_pdu, ↵David Baker2015-12-101-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise it will be triggered whenever we backfill too.
| * | | | | | Very first cut of calculating actions for events as they come in. Doesn't ↵David Baker2015-12-102-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | store them yet. Not very efficient.
* | | | | | | Use logger not loggingErik Johnston2016-01-071-2/+2
| | | | | | |
* | | | | | | copyrightsMatthew Hodgson2016-01-0713-13/+13
| |_|_|_|_|/ |/| | | | |
* | | | | | Pass whether the user was a guest to some of the event streamsMark Haines2016-01-061-5/+3
| | | | | |
* | | | | | Guest users must be joined to a room to see it in /syncMark Haines2016-01-061-103/+49
| |_|_|_|/ |/| | | |
* | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-054-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-054-15/+32
| | | | |
* | | | | Return /sync when something under the 'leave' key has changedErik Johnston2016-01-051-1/+1
| | | | |
* | | | | Use named argsErik Johnston2016-01-051-2/+2
| | | | |
* | | | | Support inviting 3pids in /createRoomErik Johnston2016-01-051-0/+16
| |_|_|/ |/| | |
* | | | Move the doc string to the public facing methodMark Haines2015-12-221-16/+17
| | | |
* | | | Add a cache for initialSync responses that expires after 5 minutesMark Haines2015-12-221-1/+23
| |_|/ |/| |
* | | Include the list of bad room ids in the errorMark Haines2015-12-221-2/+8
| | |
* | | Use a list comprehensionMark Haines2015-12-221-3/+4
| | |
* | | Hook up read receipts and typing notifications for guest accessMark Haines2015-12-221-13/+11
| | |
* | | Merge branch 'develop' into markjh/guest_accessMark Haines2015-12-221-2/+21
|\ \ \
| * | | 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
* | | Allow guest access to /syncMark Haines2015-12-221-46/+98
| | |
* | | Allow guest access if the user provides a list of rooms in the filterMark Haines2015-12-221-0/+1
|/ /
* | Merge pull request #450 from matrix-org/matthew/no-identiconsMatthew Hodgson2015-12-181-19/+3
|\ \ | | | | | | Matthew/no identicons
| * | fix indentation levelMatthew Hodgson2015-12-171-3/+3
| | |
| * | stop generating default identicons. reverts most of ↵Matthew Hodgson2015-12-171-19/+3
| | | | | | | | | | | | 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346
* | | Merge branch 'release-v0.12.0' into developDavid Baker2015-12-181-1/+1
|\ \ \
| * | | Fix typo that broke registration on the mobile clientsDavid Baker2015-12-181-1/+1
| | | |
* | | | Add display_name to 3pid invite in m.room.member invitesDaniel Wagner-Hall2015-12-171-1/+31
| |/ / |/| |
* | | Strip address and such out of 3pid invitesDaniel Wagner-Hall2015-12-171-1/+12
|/ / | | | | | | We're not meant to leak that into the graph
* | Give the IS a bunch more 3pid invite contextDaniel Wagner-Hall2015-12-161-7/+60
| | | | | | | | This allows it to form richer emails
* | Merge branch 'release-v0.12.0' into developMark Haines2015-12-161-3/+8
|\ \
| * | Fix a race between started/stopped streamMark Haines2015-12-141-3/+8
| | |
* | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-141-4/+12
|\| |
| * | Do the /sync in parallel accross the rooms like /initialSync doesMark Haines2015-12-111-4/+12
| | |
* | | Merge branch 'release-v0.12.0' into developMark Haines2015-12-121-1/+1
|\| |
| * | Add caches for whether a room has been forgotten by a userMark Haines2015-12-101-1/+1
| |/
* | Merge pull request #435 from matrix-org/erikj/searchErik Johnston2015-12-111-1/+7
|\ \ | | | | | | Include approximate count of search results
| * | Include approximate count of search resultsErik Johnston2015-12-111-1/+7
| |/
* / Ensure that the event that gets persisted is the one that was signedPaul "LeoNerd" Evans2015-12-101-6/+6
|/
* Merge pull request #405 from matrix-org/erikj/search-tsErik Johnston2015-12-081-6/+4
|\ | | | | Change the result dict to be a list in /search response
| * Change the result tict to be a listErik Johnston2015-12-011-6/+4
| |
* | Only include the archived rooms if a include_leave flag in set in the filterMark Haines2015-12-041-6/+6
| |
* | Merge pull request #419 from matrix-org/markjh/reuse_captcha_clientMark Haines2015-12-031-4/+2
|\ \ | | | | | | Reuse the captcha client rather than creating a new one for each request
| * | Reuse the captcha client rather than creating a new one for each requestMark Haines2015-12-031-4/+2
| | |
* | | Flatten devices into a dict, not a listDaniel Wagner-Hall2015-12-031-4/+3
|/ /
* | Merge pull request #418 from matrix-org/daniel/whoisDaniel Wagner-Hall2015-12-031-17/+11
|\ \ | | | | | | Merge pull request #418 from matrix-org/daniel/whois
| * | Fix implementation of /admin/whoisDaniel Wagner-Hall2015-12-021-17/+11
| | |
* | | Make state updates in the C+S API idempotentMark Haines2015-12-021-0/+12
|/ /
* | Merge pull request #410 from matrix-org/markjh/edu_frequencyMark Haines2015-12-022-5/+15
|\ \ | | | | | | Only fire user_joined_room if the user has actually joined.
| * | Use the context returned by _handle_new_eventMark Haines2015-12-021-4/+1
| | |
| * | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-021-1/+1
| |\ \
| * | | Add commentsMark Haines2015-12-022-0/+6
| | | |
| * | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-028-56/+90
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py
| * | | | Only fire user_joined_room if the membership has changedMark Haines2015-12-011-3/+8
| | | | |
| * | | | Merge branch 'develop' into markjh/edu_frequencyMark Haines2015-12-015-91/+173
| |\ \ \ \
| * | | | | Only fire user_joined_room on the distributor if the user has actually ↵Mark Haines2015-12-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | joined the room
* | | | | | Reuse a single http client, rather than creating new onesMark Haines2015-12-021-9/+5
| |_|_|/ / |/| | | |
* | | | | Fix typo in collect_presencelike_dataMark Haines2015-12-021-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #408 from matrix-org/markjh/distributor_facadeMark Haines2015-12-027-53/+78
|\ \ \ \ | | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions
| * | | | Wrap calls to distributor.fire in appropriately named functions so that ↵Mark Haines2015-12-017-53/+78
| | |/ / | |/| | | | | | | | | | static analysis can work out want is calling what
* | | | Merge pull request #406 from matrix-org/erikj/searchErik Johnston2015-12-021-3/+12
|\ \ \ \ | |/ / / |/| | | Search: Don't disregard grouping info in pagination tokens
| * | | Search: Don't disregard grouping info in pagination tokensErik Johnston2015-12-011-3/+12
| | | |
* | | | Add API for setting account_data globaly or on a per room basisMark Haines2015-12-013-22/+111
|/ / /
* | | Merge pull request #404 from matrix-org/markjh/trivial_renameMark Haines2015-12-011-1/+1
|\ \ \ | |_|/ |/| | Rename presence_handler.send_invite
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 21:08:19 +0000