Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3879 from matrix-org/matthew/fix-autojoin | Richard van der Hoff | 2018-09-18 | 1 | -0/+1 |
|\ | | | | | don't ratelimit autojoins | ||||
| * | don't ratelimit autojoins | Matthew Hodgson | 2018-09-15 | 1 | -0/+1 |
| | | |||||
* | | Reinstate missing null check | Richard van der Hoff | 2018-09-17 | 1 | -1/+1 |
| | | |||||
* | | Return a 404 when deleting unknown room alias | Richard van der Hoff | 2018-09-17 | 1 | -3/+16 |
|/ | | | | | | As per https://github.com/matrix-org/matrix-doc/issues/1675 Fixes https://github.com/matrix-org/synapse/issues/2782 | ||||
* | don't filter membership events based on history visibility (#3874) | Matthew Hodgson | 2018-09-14 | 1 | -8/+1 |
| | | | | | | | | don't filter membership events based on history visibility as we will already have filtered the messages in the timeline, and state events are always visible. and because @erikjohnston said so. | ||||
* | show heroes if a room has a 'deleted' name/canonical_alias (#3851) | Matthew Hodgson | 2018-09-12 | 1 | -2/+15 |
| | |||||
* | argh pep8 | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | |||||
* | correctly log gappy sync metrics | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | |||||
* | fix logline | Matthew Hodgson | 2018-09-12 | 1 | -1/+1 |
| | |||||
* | Speed up lazy loading (#3827) | Matthew Hodgson | 2018-09-12 | 1 | -30/+88 |
| | | | | | * speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840) | ||||
* | Don't send empty tags list down sync | Erik Johnston | 2018-09-06 | 1 | -0/+5 |
| | |||||
* | Send existing room tags down sync on join | Erik Johnston | 2018-09-06 | 1 | -0/+8 |
| | | | | | | | | When a user joined a room any existing tags were not sent down the sync stream. Ordinarily this isn't a problem because the user needs to be in the room to have set tags in it, however synapse will sometimes add tags for a user to a room, e.g. for server notices, which need to come down sync. | ||||
* | Merge pull request #3795 from matrix-org/erikj/faster_sync_state | Amber Brown | 2018-09-07 | 1 | -8/+8 |
|\ | | | | | User iter* during sync state calculations | ||||
| * | User iter* during sync state calculations | Erik Johnston | 2018-09-05 | 1 | -8/+8 |
| | | |||||
* | | Port handlers/ to Python 3 (#3803) | Amber Brown | 2018-09-07 | 6 | -19/+22 |
|/ | |||||
* | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func | Erik Johnston | 2018-09-03 | 1 | -1/+1 |
|\ | | | | | Remove unnecessary resolve_events_with_state_map | ||||
| * | Remove unnecessary resolve_events_with_state_map | Erik Johnston | 2018-08-22 | 1 | -1/+1 |
| | | | | | | | | | | We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version. | ||||
* | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -1/+2 |
| | | |||||
* | | don't return non-LL-member state in incremental sync state blocks (#3760) | Matthew Hodgson | 2018-08-28 | 1 | -1/+8 |
|/ | | | don't return non-LL-member state in incremental sync state blocks | ||||
* | Merge pull request #3659 from matrix-org/erikj/split_profiles | Erik Johnston | 2018-08-22 | 2 | -9/+26 |
|\ | | | | | Allow profile updates to happen on workers | ||||
| * | Rename WorkerProfileHandler to BaseProfileHandler | Erik Johnston | 2018-08-22 | 1 | -3/+10 |
| | | |||||
| * | Add assert to ensure handler is only run on master | Erik Johnston | 2018-08-22 | 1 | -0/+2 |
| | | |||||
| * | Remove redundant vars | Erik Johnston | 2018-08-22 | 1 | -3/+0 |
| | | |||||
| * | Add some fixmes | Erik Johnston | 2018-08-17 | 1 | -0/+4 |
| | | |||||
| * | Call UserDirectoryHandler methods directly | Erik Johnston | 2018-08-17 | 1 | -21/+5 |
| | | | | | | | | | | | | | | | | Turns out that the user directory handling is fairly racey as a bunch of stuff assumes that the processing happens on master, which it doesn't when there is a synapse.app.user_dir worker. So lets just call the function directly until we actually get round to fixing it, since it doesn't make the situation any worse. | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-17 | 15 | -84/+409 |
| |\ | | | | | | | | | | erikj/split_profiles | ||||
| * | | Split ProfileHandler into master and worker | Erik Johnston | 2018-08-17 | 1 | -7/+14 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| |\ \ | | | | | | | | | | | | | erikj/split_profiles | ||||
| * | | | Allow profile changes to happen on workers | Erik Johnston | 2018-08-07 | 1 | -5/+21 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-20 | 16 | -109/+445 |
|\ \ \ \ | | | | | | | | | | | | | | | | erikj/refactor_state_handler | ||||
| * \ \ \ | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| |\ \ \ \ | | | | | | | | | | | | | Fix logcontexts for running pushers | ||||
| | * | | | | Fix logcontexts for running pushers | Richard van der Hoff | 2018-08-17 | 3 | -17/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts. | ||||
| * | | | | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 3 | -8/+25 |
| | |_|_|/ | |/| | | | |||||
| * | | | | block event creation and room creation on hitting resource limits | Neil Johnson | 2018-08-16 | 2 | -1/+9 |
| |/ / / | |||||
| * | | | lazyload aware /messages (#3589) | Matthew Hodgson | 2018-08-16 | 1 | -1/+34 |
| | | | | |||||
| * | | | initial cut at a room summary API (#3574) | Matthew Hodgson | 2018-08-16 | 1 | -10/+149 |
| | | | | |||||
| * | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus | Neil Johnson | 2018-08-15 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Fix Mau off by one errors | ||||
| | * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-15 | 4 | -31/+108 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | * | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| | * | | | | fix off by 1s on mau | Neil Johnson | 2018-08-14 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | * \ \ \ \ | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -13/+14 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| | * \ \ \ \ \ | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | neilj/fix_off_by_1+maus | ||||
| * | | | | | | | | speed up /members and add at= and membership params (#3568) | Matthew Hodgson | 2018-08-15 | 1 | -12/+76 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federation | Erik Johnston | 2018-08-15 | 1 | -17/+57 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Move more federation APIs to workers | ||||
| | * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-15 | 14 | -27/+78 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| | * | | | | | | | | Use federation handler function rather than duplicate | Erik Johnston | 2018-08-15 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves renaming _persist_events to be a public function. | ||||
| | * | | | | | | | | Move clean_room_for_join to master | Erik Johnston | 2018-08-09 | 1 | -2/+14 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-09 | 6 | -55/+112 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | erikj/split_federation | ||||
| | * | | | | | | | | Add EDU/query handling over replication | Erik Johnston | 2018-08-06 | 1 | -11/+13 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add replication APIs for persisting federation events | Erik Johnston | 2018-08-06 | 1 | -9/+35 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3687 from matrix-org/neilj/admin_email | Neil Johnson | 2018-08-15 | 1 | -14/+4 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | support admin_email config and pass through into blocking errors, | ||||
| | * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | remove blank line | Neil Johnson | 2018-08-14 | 1 | -1/+0 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Update register.py | Neil Johnson | 2018-08-14 | 1 | -10/+0 |
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | remove comments | ||||
| | * | | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| * | | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbind | Erik Johnston | 2018-08-15 | 3 | -14/+51 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | ||||
| | * | | | | | Log when we 3pid/unbind request fails | Erik Johnston | 2018-08-09 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Don't fail requests to unbind 3pids for non supporting ID servers | Erik Johnston | 2018-08-08 | 3 | -14/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older identity servers may not support the unbind 3pid request, so we shouldn't fail the requests if we received one of 400/404/501. The request still fails if we receive e.g. 500 responses, allowing clients to retry requests on transient identity server errors that otherwise do support the API. Fixes #3661 | ||||
| * | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_block | Neil Johnson | 2018-08-14 | 1 | -2/+11 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | | Block ability to read via sync if mau limit exceeded | ||||
| | * | | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -1/+6 |
| | | | | | | |||||
| | * | | | | block sync if auth checks fail | Neil Johnson | 2018-08-09 | 1 | -7/+5 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-09 | 5 | -34/+69 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | neilj/mau_sync_block | ||||
| | * | | | | sync auth blocking | Neil Johnson | 2018-08-08 | 1 | -5/+11 |
| | | | | | | |||||
| * | | | | | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
| * | | | | | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -13/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | AuthError in all cases | ||||
| * | | | | | Run tests under PostgreSQL (#3423) | Amber Brown | 2018-08-13 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678) | Amber Brown | 2018-08-10 | 11 | -11/+11 |
| | |/ / / | |/| | | | |||||
* | | | | | Remove redundant room_version checks | Erik Johnston | 2018-08-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Revert spurious change | Erik Johnston | 2018-08-20 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Choose state algorithm based on room version | Erik Johnston | 2018-08-09 | 2 | -4/+9 |
|/ / / / | |||||
* | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet | Erik Johnston | 2018-08-09 | 2 | -31/+21 |
|\ \ \ \ | | |_|/ | |/| | | Add helper base class for generating new replication endpoints | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-08-03 | 5 | -141/+210 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/refactor_repl_servlet | ||||
| * | | | | Use new helper base class for membership requests | Erik Johnston | 2018-07-31 | 1 | -24/+17 |
| | | | | | |||||
| * | | | | Use new helper base class for ReplicationSendEventRestServlet | Erik Johnston | 2018-07-31 | 1 | -7/+4 |
| | | | | | |||||
* | | | | | Merge pull request #3664 from matrix-org/rav/federation_metrics | Richard van der Hoff | 2018-08-08 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | more metrics for the federation and appservice senders | ||||
| * | | | | | more metrics for the federation and appservice senders | Richard van der Hoff | 2018-08-07 | 1 | -0/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 2 | -3/+38 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Support for room versioning | ||||
| * | | | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | include known room versions in outgoing make_joins | Richard van der Hoff | 2018-08-06 | 1 | -2/+11 |
| | | | | | |||||
| * | | | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 1 | -1/+26 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first tranche of support for room versioning. It includes: * setting the default room version in the config file * new room_version param on the createRoom API * storing the version of newly-created rooms in the m.room.create event * fishing the version of existing rooms out of the m.room.create event | ||||
* | | | | Merge pull request #3633 from matrix-org/neilj/mau_tracker | Neil Johnson | 2018-08-08 | 2 | -21/+6 |
|\ \ \ \ | |_|/ / |/| | | | API for monthly_active_users table | ||||
| * | | | py3 fix | Neil Johnson | 2018-08-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | bug fixes | Neil Johnson | 2018-08-03 | 2 | -17/+6 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 3 | -114/+140 |
| |\| | | |||||
| * | | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 2 | -12/+8 |
| | | | | |||||
* | | | | Return M_NOT_FOUND when a profile could not be found. (#3596) | Will Hunt | 2018-08-03 | 1 | -31/+58 |
| |/ / |/| | | |||||
* | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -17/+8 |
|\ \ \ | | | | | | | | | Clean up handling of errors from outbound requests | ||||
| * | | | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -17/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code brings the SimpleHttpClient into line with the MatrixFederationHttpClient by having it raise HttpResponseExceptions when a request fails (rather than trying to parse for matrix errors and maybe raising MatrixCodeMessageException). Then, whenever we were checking for MatrixCodeMessageException and turning them into SynapseErrors, we now need to check for HttpResponseExceptions and call to_synapse_error. | ||||
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -10/+44 |
|\ \ \ \ | |||||
| * | | | | Check room visibility for /event/ requests | Richard van der Hoff | 2018-08-02 | 1 | -4/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the user has permission to view the requeseted event for /event/{eventId} and /room/{roomId}/event/{eventId} requests. Also check that the event is in the given room for /room/{roomId}/event/{eventId}, for sanity. | ||||
| * | | | | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 1 | -27/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to look up the events themselves anyway, we can skip the extra db queries here. | ||||
| * | | | | Validation for events/rooms in fed requests | Richard van der Hoff | 2018-08-02 | 1 | -1/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we get a federation request which refers to an event id, make sure that said event is in the room the caller claims it is in. (patch supplied by @turt2live) | ||||
* | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_store | Erik Johnston | 2018-08-02 | 1 | -87/+88 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Split out DB writes in federation handler | ||||
| * | | | | update docs | Erik Johnston | 2018-08-01 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | _persist_auth_tree no longer returns anything | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-30 | 6 | -30/+177 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | erikj/split_fed_store | ||||
| * | | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 1 | -83/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to easily add an internal replication API to proxy these reqeusts to master, so that we can move federation APIs to workers. | ||||
* | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 2 | -3/+35 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Initial impl of capping MAU | ||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-01 | 1 | -14/+14 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits | ||||
| * | | | | | count_monthly_users() async | Neil Johnson | 2018-08-01 | 1 | -4/+7 |
| | | | | | | |||||
| * | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 1 | -4/+5 |
| | | | | | | |||||
| * | | | | | coding style | Neil Johnson | 2018-07-31 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 2 | -2/+29 |
| | |_|/ / | |/| | | | |||||
* | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -10/+21 |
| |/ / / |/| | | | |||||
* | | | | rename replication_layer to federation_client | Richard van der Hoff | 2018-07-31 | 1 | -14/+14 |
|/ / / | | | | | | | | | | | | | I have HAD ENOUGH of trying to remember wtf a replication layer is in terms of classes. | ||||
* | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 2 | -4/+22 |
| | | | | | | | | | make /context lazyload & filter aware. | ||||
* | | | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid | Richard van der Hoff | 2018-07-27 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | if inviter_display_name == ""||None then default to inviter MXID | ||||
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Michael Telatynski | 2018-07-24 | 31 | -1534/+3975 |
| |\ \ \ | | | | | | | | | | | | | | | | t3chguy/default_inviter_display_name_3pid | ||||
| * | | | | if inviter_display_name == ""||None then default to inviter MXID | Michael Telatynski | 2018-06-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | to prevent email invite from "None" | ||||
* | | | | | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -25/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * attempt at deduplicating lazy-loaded members as per the proposal; we can deduplicate redundant lazy-loaded members which are sent in the same sync sequence. we do this heuristically rather than requiring the client to somehow tell us which members it has chosen to cache, by instead caching the last N members sent to a client, and not sending them again. For now we hardcode N to 100. Each cache for a given (user,device) tuple is in turn cached for up to X minutes (to avoid the caches building up). For now we hardcode X to 30. * add include_redundant_members filter option & make it work * remove stale todo * add tests for _get_some_state_from_cache * incorporate review | ||||
* | | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that looping_call does check the deferred returned by its callback, and (at least in the case of client_ips), we were relying on this, and I broke it in #3604. Update run_as_background_process to return the deferred, and make sure we return it to clock.looping_call. | ||||
* | | | | | Merge pull request #2970 from matrix-org/matthew/filter_members | Matthew Hodgson | 2018-07-26 | 1 | -14/+102 |
|\ \ \ \ \ | | | | | | | | | | | | | Implement the lazy_load_members room state filter parameter | ||||
| * \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 3 | -13/+21 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | clarify comment on p_ids | Matthew Hodgson | 2018-07-24 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | rather than adding ll_ids, remove them from p_ids | Matthew Hodgson | 2018-07-24 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 6 | -282/+307 |
| |\ \ \ \ \ | |||||
| * | | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 1 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 4 | -43/+77 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 1 | -40/+27 |
| | | | | | | | | |||||
| * | | | | | | | incorporate review | Matthew Hodgson | 2018-07-19 | 1 | -17/+27 |
| | | | | | | | | |||||
| * | | | | | | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 1 | -29/+36 |
| | | | | | | | | |||||
| * | | | | | | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 30 | -416/+441 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 11 | -30/+45 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | more comments | Matthew Hodgson | 2018-06-04 | 1 | -0/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 1 | -5/+13 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 20 | -472/+970 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | reshuffle todo & comments | Matthew Hodgson | 2018-03-19 | 1 | -2/+10 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | only get member state IDs for incremental syncs if we're filtering | Matthew Hodgson | 2018-03-18 | 1 | -5/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | remove debug | Matthew Hodgson | 2018-03-16 | 1 | -4/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | fix tsm search again | Matthew Hodgson | 2018-03-16 | 1 | -5/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | add state_ids for timeline entries | Matthew Hodgson | 2018-03-16 | 1 | -4/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | simplify timeline_start_members | Matthew Hodgson | 2018-03-16 | 1 | -14/+13 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | make incr syncs work | Matthew Hodgson | 2018-03-16 | 1 | -3/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-03-14 | 3 | -101/+293 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | add copyright to nudge CI | Matthew Hodgson | 2018-03-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | oops | Matthew Hodgson | 2018-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | make it work | Matthew Hodgson | 2018-03-13 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | merge proper fix to bug 2969 | Matthew Hodgson | 2018-03-13 | 13 | -73/+223 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | ensure we always include the members for a given timeline block | Matthew Hodgson | 2018-03-13 | 1 | -4/+32 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | typos | Matthew Hodgson | 2018-03-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | WIP experiment in lazyloading room members | Matthew Hodgson | 2018-03-11 | 1 | -12/+31 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Fix a minor documentation typo in on_make_leave | Travis Ralston | 2018-07-25 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Fix updating of cached remote profiles | Richard van der Hoff | 2018-07-25 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _update_remote_profile_cache was missing its `defer.inlineCallbacks`, so when it was called, would just return a generator object, without actually running any of the method body. | ||||
* | | | | | | | | | | | | | Replace usage of get_current_toke with StreamToken.START | Erik Johnston | 2018-07-24 | 1 | -5/+7 |
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to handle /context/ requests on the client_reader worker without having to pull in all the various stream handlers (e.g. precence, typing, pushers etc). The only thing the token gets used for is pagination, and that ignores everything but the room portion of the token. | ||||
* | | | | | | | | | | | | Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groups | Richard van der Hoff | 2018-07-24 | 1 | -7/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | Fixes and optimisations for resolve_state_groups | ||||
| * | | | | | | | | | | | Handle delta_ids being None in _update_context_for_auth_events | Richard van der Hoff | 2018-07-23 | 1 | -7/+6 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's easier to create the new state group as a delta from the existing one. (There's an outside chance this will help with https://github.com/matrix-org/synapse/issues/3364) | ||||
* | | | | | | | | | | | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 4 | -264/+282 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 4 | -32/+66 |
| |\| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-23 | 2 | -11/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erikj/client_apis_move | ||||
| * | | | | | | | | | | | | Move PaginationHandler to its own file | Erik Johnston | 2018-07-20 | 2 | -240/+267 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -34/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Move RoomContextHandler out of Handlers | Erik Johnston | 2018-07-18 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for moving GET /context/ to a worker | ||||
| * | | | | | | | | | | | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 2 | -133/+150 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will let us call the read only parts from workers, and so be able to move some APIs off of master, e.g. the `/state` API. | ||||
* | | | | | | | | | | | | another couple of logcontext leaks | Richard van der Hoff | 2018-07-24 | 2 | -5/+10 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Logcontext fixes | Richard van der Hoff | 2018-07-24 | 1 | -13/+15 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some random logcontext leaks. | ||||
* | | | | | | | | | | | Fix missing attributes on workers. | Erik Johnston | 2018-07-23 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missed during the transition from attribute to getter for getting state from context. | ||||
* | | | | | | | | | | | Add support for updating state | Erik Johnston | 2018-07-23 | 1 | -9/+23 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Use new getters | Erik Johnston | 2018-07-23 | 4 | -21/+40 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Make the rest of the .iterwhatever go away (#3562) | Amber Brown | 2018-07-21 | 1 | -9/+9 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Combine Limiter and Linearizer | Richard van der Hoff | 2018-07-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linearizer was effectively a Limiter with max_count=1, so rather than maintaining two sets of code, let's combine them. | ||||
* | | | | | | | | | | Improvements to the Limiter | Richard van der Hoff | 2018-07-20 | 1 | -1/+1 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * give them names, to improve logging * use a deque rather than a list for efficiency | ||||
* | | | | | | | | | Merge pull request #3367 from matrix-org/rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-18 | 1 | -43/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | Remove event re-signing hacks | ||||
| * | | | | | | | | Merge branch 'develop' into rav/drop_re_signing_hacks | Richard van der Hoff | 2018-07-04 | 12 | -111/+313 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove event re-signing hacks | Richard van der Hoff | 2018-06-07 | 1 | -43/+0 |
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These "temporary fixes" have been here three and a half years, and I can't find any events in the matrix.org database where the calculated signature differs from what's in the db. It's time for them to go away. | ||||
* | | | | | | | | | Merge pull request #3541 from matrix-org/rav/optimize_filter_events_for_server | Richard van der Hoff | 2018-07-17 | 1 | -138/+6 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor and optimze filter_events_for_server | ||||
| * | | | | | | | | | Move filter_events_for_server out of FederationHandler | Richard van der Hoff | 2018-07-16 | 1 | -138/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for easier unit testing. | ||||
* | | | | | | | | | | typo | Matthew Hodgson | 2018-07-13 | 1 | -3/+3 |
|/ / / / / / / / / | |||||
* | | | | | | | | | s/becuase/because/g | Matthew Hodgson | 2018-07-10 | 2 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | run isort | Amber Brown | 2018-07-09 | 30 | -184/+186 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking | Erik Johnston | 2018-06-29 | 1 | -28/+68 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Check the state of prev_events a bit more thoroughly when coming over federation | ||||
| * | | | | | | | | try and clean up | Amber Brown | 2018-06-27 | 1 | -3/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | pep8 | Amber Brown | 2018-06-27 | 1 | -6/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | cleanups | Amber Brown | 2018-06-27 | 1 | -13/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | handle federation not telling us about prev_events | Amber Brown | 2018-06-27 | 1 | -25/+62 |
| | | | | | | | | | |||||
* | | | | | | | | | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 4 | -9/+8 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #3448 from matrix-org/matthew/gdpr-deactivate-admin-api | Matthew Hodgson | 2018-06-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add GDPR erase param to deactivate API | ||||
| * | | | | | | | | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3442 from matrix-org/matthew/allow-unconsented-parts | Erik Johnston | 2018-06-25 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | allow non-consented users to still part rooms (to let us autopart them) | ||||
| * | | | | | | | | | allow non-consented users to still part rooms (to let us autopart them) | Matthew Hodgson | 2018-06-25 | 1 | -2/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Actually fix it | Erik Johnston | 2018-06-25 | 1 | -3/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Comment | Erik Johnston | 2018-06-25 | 1 | -0/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix bug with assuming wrong type | Erik Johnston | 2018-06-25 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Add fast path to _filter_events_for_server | Erik Johnston | 2018-06-25 | 1 | -1/+34 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most rooms have a trivial history visibility like "shared" or "world_readable", especially large rooms, so lets not bother getting the full membership of those rooms in that case. | ||||
* | | | | | | | | typos | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | typo | Matthew Hodgson | 2018-06-25 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3441 from matrix-org/erikj/redo_erasure | Erik Johnston | 2018-06-25 | 2 | -1/+19 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix user erasure and re-enable | ||||
| * | | | | | | | | Revert "Revert "Merge pull request #3431 from ↵ | Erik Johnston | 2018-06-25 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/erasure_visibility"" This reverts commit 1d009013b3c3e814177afc59f066e02a202b21cd. | ||||
* | | | | | | | | | Remove all global reactor imports & pass it around explicitly (#3424) | Amber Brown | 2018-06-25 | 3 | -6/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 2 | -19/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ce0d911156b355c5bf452120bfb08653dad96497, reversing changes made to b4a5d767a94f1680d07edfd583aae54ce422573e. | ||||
* | | | | | | | | Also log number of events for serach context | Erik Johnston | 2018-06-22 | 1 | -0/+5 |
| | | | | | | | | |||||
* | | | | | | | | Add some logging to search queries | Erik Johnston | 2018-06-22 | 1 | -0/+9 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 2 | -1/+19 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Support hiding events from deleted users | ||||
| * | | | | | | | | Filter out erased messages | Richard van der Hoff | 2018-06-12 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redact any messges sent by erased users. | ||||
| * | | | | | | | | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 1 | -1/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3428 from matrix-org/erikj/persisted_pdu | Erik Johnston | 2018-06-22 | 1 | -18/+26 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify get_persisted_pdu | ||||
| * | | | | | | | | simplify get_persisted_pdu | Richard van der Hoff | 2018-06-12 | 1 | -18/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it doesn't make much sense to use get_persisted_pdu on the receive path: just get the event straight from the store. | ||||
* | | | | | | | | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 3 | -15/+25 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #3399 from costacruise/master | Richard van der Hoff | 2018-06-20 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add error code to room creation error | ||||
| * | | | | | | | | | Add error code to room creation error | Michael Wagner | 2018-06-14 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error code is mentioned in the documentation at https://matrix.org/docs/api/client-server/#!/Room32creation/createRoom | ||||
| * | | | | | | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 5 | -26/+5 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 3 | -2/+82 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Remove email addresses / phone numbers from ID servers when they're removed from synapse | ||||
| * | | | | | | | doc fixes | David Baker | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fix comment | David Baker | 2018-06-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Missing yield | David Baker | 2018-06-04 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | docstring | David Baker | 2018-06-04 | 1 | -1/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 5 | -16/+46 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | pep8 | David Baker | 2018-05-24 | 3 | -7/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | comment | David Baker | 2018-05-24 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Unbind 3pids when they're deleted too | David Baker | 2018-05-24 | 1 | -0/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Hit the 3pid unbind endpoint on deactivation | David Baker | 2018-05-23 | 2 | -1/+56 |
| | | | | | | | | | |||||
* | | | | | | | | | Fix event filtering in get_missing_events handler | Richard van der Hoff | 2018-06-08 | 1 | -0/+4 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵ | Amber Brown | 2018-05-31 | 10 | -29/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they're not meant to be lazy (#3307) | ||||
* | | | | | | | | Update some comments and docstrings in SyncHandler | Richard van der Hoff | 2018-05-29 | 1 | -1/+11 |
| | | | | | | | | |||||
* | | | | | | | | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 1 | -0/+3 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 10 | -61/+105 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #3287 from matrix-org/rav/allow_leaving_server_notices_room | Richard van der Hoff | 2018-05-25 | 1 | -10/+14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Let users leave the server notice room after joining | ||||
| | * | | | | | | | Let users leave the server notice room after joining | Richard van der Hoff | 2018-05-25 | 1 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They still can't reject invites, but we let them leave it. | ||||
| * | | | | | | | | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 2 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 6 | -27/+35 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | replace some iteritems with six | ||||
| | * | | | | | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 6 | -27/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | | | | Remove users from user directory on deactivate | David Baker | 2018-05-24 | 2 | -0/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3261 from matrix-org/erikj/pagination_fixes | Erik Johnston | 2018-05-24 | 1 | -9/+22 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix federation backfill bugs | ||||
| | * | | | | | | | | Use iter* methods | Erik Johnston | 2018-05-22 | 1 | -7/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix that states is a dict of dicts | Erik Johnston | 2018-05-22 | 1 | -1/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | get_domains_from_state returns list of tuples | Erik Johnston | 2018-05-22 | 1 | -2/+12 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #3267 from matrix-org/erikj/iter_filter | Erik Johnston | 2018-05-24 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | Use iter* methods for _filter_events_for_server | ||||
| | * | | | | | | | | s/values/itervalues/ | Erik Johnston | 2018-05-23 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Use iter* methods for _filter_events_for_server | Erik Johnston | 2018-05-23 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 1 | -1/+4 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to put the URI in the error message and the server notice that get sent by the server | ||||
| * / / / / / / / / | Use the localpart in the consent uri | Richard van der Hoff | 2018-05-23 | 1 | -1/+3 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because it's shorter. | ||||
| * | | / / / / / | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | comment typo | David Baker | 2018-05-22 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | cleanup | Amber Brown | 2018-05-22 | 2 | -7/+14 |
| | | | | | | | | |||||
* | | | | | | | | cleanups, self-registration | Amber Brown | 2018-05-22 | 1 | -3/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 8 | -75/+192 |
|\| | | | | | | | |||||
| * | | | | | | | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 2 | -1/+89 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns an M_CONSENT_NOT_GIVEN error (cf https://github.com/matrix-org/matrix-doc/issues/1252) if consent is not yet given. | ||||
| * | | | | | | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and have the sync endpoints call it directly rather than obsure indirection via PresenceHandler | ||||
| * | | | | | | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 1 | -1/+9 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | When a user first syncs, we will send them a server notice asking them to consent to the privacy policy if they have not already done so. | ||||
| * | | | | | Merge pull request #3232 from matrix-org/rav/server_notices_room | Richard van der Hoff | 2018-05-18 | 4 | -6/+80 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Infrastructure for a server notices room | ||||
| | * | | | | | Make sure we reject attempts to invite the notices user | Richard van der Hoff | 2018-05-18 | 2 | -0/+15 |
| | | | | | | | |||||
| | * | | | | | fix missing yield for server_notices_room | Richard van der Hoff | 2018-05-17 | 1 | -3/+4 |
| | | | | | | | |||||
| | * | | | | | Infrastructure for a server notices room | Richard van der Hoff | 2018-05-17 | 3 | -6/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Server Notices use a special room which the user can't dismiss. They are created on demand when some other bit of the code calls send_notice. (This doesn't actually do much yet becuse we don't call send_notice anywhere) | ||||
| * | | | | | | Merge pull request #3233 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2018-05-18 | 1 | -55/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove unused `update_external_syncs` | ||||
| | * | | | | | | Remove unused `update_external_syncs` | Richard van der Hoff | 2018-05-17 | 1 | -55/+0 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | This method isn't used anywhere. Burninate it. | ||||
| * | | | | | | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -6/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Make purge_history operate on tokens |