Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 2 | -6/+15 |
|\ | |||||
| * | Avoid extra db lookups | Richard van der Hoff | 2018-08-02 | 2 | -35/+15 |
| | | | | | | | | | | 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 | -0/+29 |
| | | | | | | | | | | | | | | 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 | -2/+12 |
|\ \ | | | | | | | Split out DB writes in federation handler | ||||
| * | | update docs | Erik Johnston | 2018-08-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-30 | 11 | -67/+225 |
| |\ \ | | | | | | | | | | | | | erikj/split_fed_store | ||||
| * | | | Split out DB writes in federation handler | Erik Johnston | 2018-07-25 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+27 |
|\ \ \ \ | | | | | | | | | | | Initial impl of capping MAU | ||||
| * | | | | improve clarity | Neil Johnson | 2018-08-01 | 1 | -4/+5 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Neil Johnson | 2018-08-01 | 6 | -6/+10 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | neilj/mau_sign_in_log_in_limits | ||||
| * | | | | | remove errant print | Neil Johnson | 2018-08-01 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | make count_monthly_users async synapse/handlers/auth.py | Neil Johnson | 2018-08-01 | 1 | -13/+13 |
| | | | | | | |||||
| * | | | | | coding style | Neil Johnson | 2018-07-31 | 2 | -3/+2 |
| | | | | | | |||||
| * | | | | | actually close conn | Neil Johnson | 2018-07-30 | 1 | -4/+8 |
| | | | | | | |||||
| * | | | | | factor out metrics from __init__ to app/homeserver | Neil Johnson | 2018-07-30 | 1 | -24/+13 |
| | | | | | | |||||
| * | | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 1 | -0/+34 |
| | |_|/ / | |/| | | | |||||
* | | | | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 2 | -5/+11 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #3612 from matrix-org/rav/store_heirarchy | Richard van der Hoff | 2018-07-31 | 6 | -6/+10 |
|\ \ \ \ | |/ / / |/| | | | Make EventStore inherit from EventFederationStore | ||||
| * | | | reinstate explicit include of EventsWorkerStore | Richard van der Hoff | 2018-07-31 | 1 | -1/+3 |
| | | | | |||||
| * | | | Make EventStore inherit from EventFederationStore | Richard van der Hoff | 2018-07-26 | 6 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (since it uses methods therein) Turns out that we had a bunch of things which were incorrectly importing EventWorkerStore from events.py rather than events_worker.py, which broke once I removed the import into events.py. | ||||
* | | | | make /context lazyload & filter aware (#3567) | Matthew Hodgson | 2018-07-27 | 1 | -3/+11 |
| | | | | | | | | | | | | make /context lazyload & filter aware. | ||||
* | | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_content | Richard van der Hoff | 2018-07-26 | 3 | -2/+98 |
|\ \ \ \ | | | | | | | | | | | Stop populating events.content | ||||
| * | | | | Create the column nullable | Richard van der Hoff | 2018-07-26 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | There's no real point in ever making the column non-nullable, and doing so breaks the sytests. | ||||
| * | | | | Stop populating events.content | Richard van der Hoff | 2018-07-26 | 2 | -1/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field is no longer read from, so we should stop populating it. Once we're happy that this doesn't break everything, and a rollback is unlikely, we can think about dropping the column. | ||||
* | | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_id | Richard van der Hoff | 2018-07-26 | 2 | -8/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove some redundant joins on event_edges.room_id | ||||
| * | | | | | Remove some redundant joins on event_edges.room_id | Richard van der Hoff | 2018-07-26 | 2 | -8/+6 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've long passed the point where it's possible to have the same event_id in different tables, so these join conditions are redundant: we can just join on event_id. event_edges is of non-trivial size, and the room_id column is wasteful, so let's stop reading from it. In future, we can stop writing to it, and then drop it. | ||||
* | | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_calls | Richard van der Hoff | 2018-07-26 | 5 | -6/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix some looping_call calls which were broken in #3604 | ||||
| * | | | | Fix some looping_call calls which were broken in #3604 | Richard van der Hoff | 2018-07-26 | 5 | -6/+8 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* / / / | comment on event_edges | Richard van der Hoff | 2018-07-26 | 1 | -1/+2 |
|/ / / | |||||
* | | | switch missing_types to be a bool | Matthew Hodgson | 2018-07-25 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-25 | 8 | -125/+187 |
|\| | | |||||
| * | | Merge pull request #3603 from matrix-org/erikj/handle_outliers | Erik Johnston | 2018-07-25 | 1 | -6/+8 |
| |\ \ | | | | | | | | | Correctly handle outliers during persist events | ||||
| | * | | Actually fix it by adding continue | Erik Johnston | 2018-07-25 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix typo in conditional | Erik Johnston | 2018-07-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | Correctly handle outliers during persist events | Erik Johnston | 2018-07-25 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We incorrectly asserted that all contexts must have a non None state group without consider outliers. This would usually be fine as the assertion would never be hit, as there is a shortcut during persistence if the forward extremities don't change. However, if the outlier is being persisted with non-outlier events, the function would be called and the assertion would be hit. Fixes #3601 | ||||
| * | | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_more | Richard van der Hoff | 2018-07-25 | 2 | -5/+10 |
| |\ \ \ | | | | | | | | | | | Fix another logcontext leak in _persist_events | ||||
| | * | | | Fix another logcontext leak in _persist_events | Richard van der Hoff | 2018-07-25 | 2 | -5/+10 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to run the errback in the sentinel context to avoid losing our own context. Also: add logging to runInteraction to help identify where "Starting db connection from sentinel context" warnings are coming from | ||||
| * | | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error | Richard van der Hoff | 2018-07-25 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Fix occasional 'tuple index out of range' error | ||||
| | * | | | Fix occasional 'tuple index out of range' error | Richard van der Hoff | 2018-07-25 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in _delete_existing_rows_txn which was introduced in #3435 (though it's been on matrix-org-hotfixes for *years*). This code is only called when there is some sort of conflict the first time we try to persist an event, so it only happens rarely. Still, the exceptions are annoying. | ||||
| * / / | Wrap a number of things that run in the background | Richard van der Hoff | 2018-07-25 | 4 | -10/+26 |
| |/ / | | | | | | | | | | | | | This will reduce the number of "Starting db connection from sentinel context" warnings, and will help with our metrics. | ||||
| * | | Pull out did_forget to worker store | Erik Johnston | 2018-07-24 | 1 | -25/+27 |
| | | | |||||
| * | | Merge pull request #3595 from matrix-org/erikj/use_deltas | Erik Johnston | 2018-07-24 | 1 | -53/+118 |
| |\ \ | | | | | | | | | Use deltas to calculate current state deltas | ||||
| | * | | Expand on docstring comment about return value | Erik Johnston | 2018-07-24 | 1 | -0/+5 |
| | | | | |||||
| | * | | Remove unnecessary iteritems | Erik Johnston | 2018-07-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixup comment (and indent) | Erik Johnston | 2018-07-24 | 1 | -16/+20 |
| | | | | |||||
| | * | | Don't fetch state from the database unless needed | Erik Johnston | 2018-07-24 | 1 | -12/+18 |
| | | | | |||||
| | * | | Have _get_new_state_after_events return delta | Erik Johnston | 2018-07-24 | 1 | -17/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | If we have a delta from the existing to new current state, then we can reuse that rather than manually working it out by fetching both lots of state. | ||||
| | * | | Don't require to_delete to have event_ids | Erik Johnston | 2018-07-24 | 1 | -36/+55 |
| | | | | |||||
| * | | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 2 | -28/+0 |
| |\ \ \ | | |/ / | |/| | | Remove redundant checks on room forgottenness | ||||
| | * | | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-24 | 2 | -15/+31 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room | Richard van der Hoff | 2018-07-23 | 5 | -26/+70 |
| | |\ \ \ | |||||
| | * | | | | Remove redundant checks on room forgottenness | Richard van der Hoff | 2018-07-23 | 2 | -28/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3550 | ||||
* | | | | | | incorporate more review. | Matthew Hodgson | 2018-07-25 | 1 | -16/+14 |
| | | | | | | |||||
* | | | | | | handle the edge case for _get_some_state_from_cache where types is [] | Matthew Hodgson | 2018-07-24 | 1 | -1/+7 |
| | | | | | | |||||
* | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 1 | -12/+4 |
|\| | | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-07-24 | 2 | -13/+24 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | erikj/speed_up_calculate_state_delta | ||||
| * | | | | | Remove unnecessary if | Erik Johnston | 2018-07-24 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Speed up _calculate_state_delta | Erik Johnston | 2018-07-24 | 1 | -10/+3 |
| | | | | | | |||||
* | | | | | | consider non-filter_type types as wildcards, thus missing from the ↵ | Matthew Hodgson | 2018-07-24 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | state-group-cache | ||||
* | | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 2 | -14/+25 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'develop' into rav/logcontext_fixes | Richard van der Hoff | 2018-07-24 | 1 | -11/+21 |
| |\ \ \ \ \ | |||||
| | * | | | | | fix idiocy | Richard van der Hoff | 2018-07-24 | 1 | -2/+8 |
| | | | | | | | |||||
| | * | | | | | Add some measure blocks to persist_events | Richard van der Hoff | 2018-07-23 | 1 | -11/+15 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | ... to help us figure out where 40% of CPU is going | ||||
| * / / / / | Logcontext fixes | Richard van der Hoff | 2018-07-24 | 2 | -3/+4 |
| |/ / / / | | | | | | | | | | | | | | | | Fix some random logcontext leaks. | ||||
* | | | | | incorporate more review | Matthew Hodgson | 2018-07-24 | 1 | -27/+9 |
| | | | | | |||||
* | | | | | handle case where types is [] on postgres correctly | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 5 | -26/+75 |
|\| | | | | |||||
| * | | | | Comments | Erik Johnston | 2018-07-23 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Only get cached state from context in persist_event | Erik Johnston | 2018-07-23 | 1 | -1/+3 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | We don't want to bother pulling out the current state from the DB since until we know we have to. Checking the context for state is just an optimisation. | ||||
| * | | | Use new getters | Erik Johnston | 2018-07-23 | 3 | -5/+11 |
| | | | | |||||
| * | | | Merge branch 'develop' into matthew/sync_deleted_devices | Matthew Hodgson | 2018-07-23 | 6 | -23/+49 |
| |\| | | |||||
| * | | | add trailing comma | Matthew Hodgson | 2018-07-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | yes, we do need to invalidate the device_id_exists_cache when deleting a ↵ | Matthew Hodgson | 2018-07-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | remote device | ||||
| * | | | spell out that include_deleted_devices requires include_all_devices | Matthew Hodgson | 2018-07-19 | 1 | -1/+5 |
| | | | | |||||
| * | | | shift to using an explicit deleted flag on m.device_list_update EDUs | Matthew Hodgson | 2018-07-12 | 2 | -20/+25 |
| | | | | | | | | | | | | | | | | and generally make it work. | ||||
| * | | | WIP to announce deleted devices over federation | Matthew Hodgson | 2018-07-12 | 2 | -13/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | Previously we queued up the poke correctly when the device was deleted, but then the actual EDU wouldn't get sent, as the device was no longer known. Instead, we now send EDUs for deleted devices too if there's a poke for them. | ||||
* | | | | incorporate review | Matthew Hodgson | 2018-07-23 | 1 | -12/+8 |
| | | | | |||||
* | | | | fix thinkos; unbreak tests | Matthew Hodgson | 2018-07-19 | 1 | -2/+2 |
| | | | | |||||
* | | | | incorporate review | Matthew Hodgson | 2018-07-19 | 1 | -3/+4 |
| | | | | |||||
* | | | | add a filtered_types param to limit filtering to specific types | Matthew Hodgson | 2018-07-19 | 1 | -53/+60 |
| | | | | |||||
* | | | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 50 | -375/+550 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | revert 00bc979 | Richard van der Hoff | 2018-07-19 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | ... we've fixed the things that caused the warnings, so we should reinstate the warning. | ||||
| * | | | Merge remote-tracking branch 'origin/release-v0.33.0' into develop | Richard van der Hoff | 2018-07-19 | 1 | -3/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Disable logcontext warning | Richard van der Hoff | 2018-07-19 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | Temporary workaround to #3518 while we release 0.33.0. | ||||
| * | | | Run things as background processes | Richard van der Hoff | 2018-07-18 | 4 | -16/+29 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | This fixes #3518, and ensures that we get useful logs and metrics for lots of things that happen in the background. (There are certainly more things that happen in the background; these are just the common ones I've found running a single-process synapse locally). | ||||
| * | | Merge pull request #3505 from matrix-org/erikj/receipts_cahce | Erik Johnston | 2018-07-12 | 1 | -6/+19 |
| |\ \ | | |/ | |/| | Use stream cache in get_linearized_receipts_for_room | ||||
| | * | Update return value docstring | Erik Johnston | 2018-07-12 | 1 | -1/+1 |
| | | | |||||
| | * | Use 'is not None' and add comments | Erik Johnston | 2018-07-10 | 1 | -2/+6 |
| | | | |||||
| | * | Use stream cache in get_linearized_receipts_for_room | Erik Johnston | 2018-07-10 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | This avoids us from uncessarily hitting the database when there has been no change for the room | ||||
| * | | s/becuase/because/g | Matthew Hodgson | 2018-07-10 | 1 | -2/+2 |
| |/ | |||||
| * | Attempt to include db threads in cpu usage stats (#3496) | Richard van der Hoff | 2018-07-10 | 2 | -18/+17 |
| | | | | | | | | | | Let's try to include time spent in the DB threads in the per-request/block cpu usage metrics. | ||||
| * | Add CPU metrics for _fetch_event_list | Richard van der Hoff | 2018-07-09 | 1 | -19/+32 |
| | | | | | | | | | | add a Measure block on _fetch_event_list, in the hope that we can better measure CPU usage here. | ||||
| * | run isort | Amber Brown | 2018-07-09 | 49 | -246/+244 |
| | | |||||
| * | Invalidate cache on correct thread | Erik Johnston | 2018-07-02 | 1 | -1/+2 |
| | | |||||
| * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 19 | -28/+35 |
| | | |||||
| * | Fix error on deleting users pending deactivation | David Baker | 2018-06-26 | 1 | -1/+3 |
| | | | | | | | | Use simple_delete instead of simple_delete_one as commented | ||||
| * | Revert "Revert "Merge pull request #3431 from ↵ | Erik Johnston | 2018-06-25 | 3 | -0/+126 |
| | | | | | | | | | | | | matrix-org/rav/erasure_visibility"" This reverts commit 1d009013b3c3e814177afc59f066e02a202b21cd. | ||||
| * | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 3 | -126/+0 |
| | | | | | | | | | | This reverts commit ce0d911156b355c5bf452120bfb08653dad96497, reversing changes made to b4a5d767a94f1680d07edfd583aae54ce422573e. | ||||
| * | Deleting from event_push_actions needs to use an index | Mark Haines | 2018-06-22 | 1 | -1/+8 |
| | | |||||
| * | Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterable | Richard van der Hoff | 2018-06-22 | 1 | -1/+1 |
| |\ | | | | | | | Make _get_joined_hosts_cache cache non-iterable | ||||
| | * | Make _get_joined_hosts_cache cache non-iterable | Erik Johnston | 2018-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #3430 from matrix-org/rav/configurable_push_action_rotation | Richard van der Hoff | 2018-06-22 | 1 | -3/+5 |
| |\ \ | | |/ | |/| | Make push actions rotation configurable | ||||
| | * | Make push actions rotation configurable | Erik Johnston | 2018-06-22 | 1 | -3/+5 |
| | | | |||||
| * | | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 3 | -0/+126 |
| |\ \ | | | | | | | | | Support hiding events from deleted users | ||||
| | * | | UserErasureStore | Richard van der Hoff | 2018-06-12 | 3 | -0/+126 |
| | | | | | | | | | | | | | | | | to store which users have been erased | ||||
| * | | | Merge pull request #3427 from matrix-org/erikj/remove_filters | Erik Johnston | 2018-06-22 | 1 | -20/+1 |
| |\| | | | |/ | |/| | remove dead filter_events_for_clients | ||||
| | * | remove dead filter_events_for_clients | Richard van der Hoff | 2018-06-12 | 1 | -20/+1 |
| | | | | | | | | | | | | | | | | | | This is only used by filter_events_for_client, so we can simplify the whole thing by just doing one user at a time, and removing a dead storage function to boot. | ||||
| * | | Disable partial state group caching for wildcard lookups | Richard van der Hoff | 2018-06-22 | 1 | -13/+43 |
| | | | | | | | | | | | | | | | | | | | | | When _get_state_for_groups is given a wildcard filter, just do a complete lookup. Hopefully this will give us the best of both worlds by not filling up the ram if we only need one or two keys, but also making the cache still work for the federation reader usecase. | ||||
| * | | Merge pull request #3382 from matrix-org/rav/optimise_state_groups | Richard van der Hoff | 2018-06-22 | 1 | -5/+1 |
| |\ \ | | | | | | | | | Optimise state_group_cache update | ||||
| | * | | Optimise state_group_cache update | Richard van der Hoff | 2018-06-11 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | (1) matrix-org-hotfixes has removed the intern calls; let's do the same here. (2) remove redundant iteritems() so we can used an optimised db update. | ||||
| * | | | Merge pull request #3419 from matrix-org/rav/events_per_request | Richard van der Hoff | 2018-06-22 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | | | Log number of events fetched from DB | ||||
| | * | | | Indirect evt_count updates via method call | Richard van der Hoff | 2018-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | so that we can stub it for the sentinel and not have a billion failing UTs | ||||
| | * | | | Log number of events fetched from DB | Richard van der Hoff | 2018-06-21 | 1 | -0/+4 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we finish processing a request, log the number of events we fetched from the database to handle it. [I'm trying to figure out which requests are responsible for large amounts of event cache churn. It may turn out to be more helpful to add counts to the prometheus per-request/block metrics, but that is an extension to this code anyway.] | ||||
| * / | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 4 | -9/+9 |
| |/ / | |||||
| * | | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 1 | -9/+0 |
| |\ \ | | | | | | | | | Remove email addresses / phone numbers from ID servers when they're removed from synapse | ||||
| | * \ | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 1 | -9/+6 |
| | |\ \ | |||||
| | * | | | Hit the 3pid unbind endpoint on deactivation | David Baker | 2018-05-23 | 1 | -9/+0 |
| | | | | | |||||
* | | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-10 | 2 | -29/+3 |
|\| | | | | |||||
| * | | | | Fix sql error in _get_state_groups_from_groups | Richard van der Hoff | 2018-06-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | If this was called with a `(type, None)` entry in types (which is supposed to return all state of type `type`), it would explode with a sql error. | ||||
| * | | | | Merge pull request #3324 from matrix-org/rav/remove_dead_method | Richard van der Hoff | 2018-06-04 | 1 | -26/+0 |
| |\ \ \ \ | | | | | | | | | | | | | Remove was_forgotten_at | ||||
| | * | | | | Remove was_forgotten_at | Richard van der Hoff | 2018-06-01 | 1 | -26/+0 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | This is unused. IT MUST DIE!!!1 ̧̪͈̱̹̳͖͙H̵̰̤̰͕̖e̛ ͚͉̗̼̞w̶̩̥͉̮h̩̺̪̩͘ͅọ͎͉̟ ̜̩͔̦̘ͅW̪̫̩̣̲͔̳a͏͔̳͖i͖͜t͓̤̠͓͙s̘̰̩̥̙̝ͅ ̲̠̬̥Be̡̙̫̦h̰̩i̛̫͙͔̭̤̗̲n̳͞d̸ ͎̻͘T̛͇̝̲̹̠̗ͅh̫̦̝ͅe̩̫͟ ͓͖̼W͕̳͎͚̙̥ą̙l̘͚̺͔͞ͅl̳͍̙̤̤̮̳.̢ ̟̺̜̙͉Z̤̲̙̙͎̥̝A͎̣͔̙͘L̥̻̗̳̻̳̳͢G͉̖̯͓̞̩̦O̹̹̺!̙͈͎̞̬ * | ||||
| * / | | | Add hacky cache factor override system | Erik Johnston | 2018-06-04 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 12 | -92/+179 |
|\| | | | |||||
| * | | | Merge pull request #3264 from matrix-org/neil/sign-up-stats | Neil Johnson | 2018-06-01 | 3 | -1/+56 |
| |\ \ \ | | | | | | | | | | | daily user type phone home stats | ||||
| | * | | | remove unnecessary INSERT | Neil Johnson | 2018-06-01 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | create users index on creation_ts | Neil Johnson | 2018-05-29 | 1 | -0/+20 |
| | | | | | |||||
| | * | | | create index in background | Neil Johnson | 2018-05-29 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | bump version | Neil Johnson | 2018-05-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | daily user type phone home stats | Neil Johnson | 2018-05-22 | 1 | -0/+29 |
| | |/ / | |||||
| * | | | Handle RRs which arrive before their events | Richard van der Hoff | 2018-06-01 | 1 | -25/+19 |
| | | | | |||||
| * | | | Ignore depth when updating read-receipts | Richard van der Hoff | 2018-06-01 | 1 | -30/+37 |
| | | | | | | | | | | | | | | | | Order read receipts by stream ordering instead of depth | ||||
| * | | | Consistently use six's iteritems and wrap lazy keys/values in list() if ↵ | Amber Brown | 2018-05-31 | 5 | -54/+59 |
| | | | | | | | | | | | | | | | | they're not meant to be lazy (#3307) | ||||
| * | | | Merge pull request #3303 from NotAFile/py3-memoryview | Amber Brown | 2018-05-30 | 3 | -6/+30 |
| |\ \ \ | | | | | | | | | | | use memoryview in py3 | ||||
| | * | | | add remaining memoryview changes | Adrian Tschira | 2018-05-29 | 2 | -4/+12 |
| | | | | | |||||
| | * | | | use memoryview in py3 | Adrian Tschira | 2018-05-29 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | Merge pull request #3281 from NotAFile/py3-six-isinstance | Amber Brown | 2018-05-30 | 1 | -2/+3 |
| |\ \ \ \ | | | | | | | | | | | | | remaining isintance fixes | ||||
| | * | | | | remaining isintance fixes | Adrian Tschira | 2018-05-24 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | | | Exempt AS-registered users from doing gdpr | Richard van der Hoff | 2018-05-29 | 1 | -0/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | add pydoc | Matthew Hodgson | 2018-05-29 | 1 | -22/+54 |
| | | | | | |||||
* | | | | | merge develop | Matthew Hodgson | 2018-05-29 | 40 | -519/+1165 |
|\| | | | | |||||
| * | | | | update metrics to be in seconds | Amber Brown | 2018-05-28 | 1 | -15/+15 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 10 | -43/+60 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #3279 from NotAFile/py3-more-iteritems | Amber Brown | 2018-05-24 | 1 | -4/+6 |
| | |\ \ \ \ | | | | | | | | | | | | | | | more six iteritems | ||||
| | | * | | | | more iteritems | Adrian Tschira | 2018-05-24 | 1 | -4/+6 |
| | | |/ / / | |||||
| | * / / / | Misc. py3 fixes | Adrian Tschira | 2018-05-24 | 3 | -3/+3 |
| | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| | * | | | Merge pull request #3278 from NotAFile/py3-storage-base | Amber Brown | 2018-05-24 | 1 | -17/+22 |
| | |\ \ \ | | | | | | | | | | | | | Py3 storage/_base.py | ||||
| | | * | | | Py3 storage/_base.py | Adrian Tschira | 2018-05-24 | 1 | -17/+22 |
| | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| | * | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 4 | -9/+16 |
| | |\ \ \ | | | | | | | | | | | | | replace some iteritems with six | ||||
| | | * | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 4 | -9/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| | * | | | | Merge pull request #3247 from NotAFile/py3-misc | Amber Brown | 2018-05-24 | 1 | -1/+7 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | Misc Python3 fixes | ||||
| | | * | | | use stand-in value if maxint is not available | Adrian Tschira | 2018-05-19 | 1 | -1/+7 |
| | | |/ / | | | | | | | | | | | | | | | | Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| | * | | | Remove unused string formatting param | Erik Johnston | 2018-05-22 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Don't support limitless pagination | Erik Johnston | 2018-05-22 | 1 | -8/+6 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | The pagination storage function supported not specifiying a limit on the number of events returned. This was triggered when using the search or context API with a limit of zero, which the storage function took to mean not being limited. | ||||
| * | | | cleanup | Amber Brown | 2018-05-22 | 1 | -3/+6 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 11 | -75/+286 |
| |\| | | |||||
| | * | | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 2 | -7/+59 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Tighter filtering for user_daily_visits | Neil Johnson | 2018-05-18 | 1 | -1/+5 |
| | |/ | |||||
| | * | fix psql compatability bug | Neil Johnson | 2018-05-18 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #3235 from matrix-org/rav/fix_receipts_deferred | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 |
| | |\ | | | | | | | | | Fix error in handling receipts | ||||
| | | * | Fix error in handling receipts | Richard van der Hoff | 2018-05-18 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an error which has been happening ever since #2158 (v0.21.0-rc1): > TypeError: argument of type 'ObservableDeferred' is not iterable fixes #3234 | ||||
| | * | | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -24/+53 |
| | |\ \ | | | |/ | | |/| | Make purge_history operate on tokens | ||||
| | | * | Clarify comment | Erik Johnston | 2018-05-16 | 1 | -1/+2 |
| | | | | |||||
| | | * | Comments | Erik Johnston | 2018-05-16 | 1 | -0/+8 |
| | | | | |||||
| | | * | Move and rename variable | Erik Johnston | 2018-05-16 | 1 | -3/+3 |
| | | | | |||||
| | | * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | As we're soon going to change how topological_ordering works | ||||
| | | * | Use events_to_purge table rather than token | Erik Johnston | 2018-05-15 | 1 | -15/+34 |
| | | | | |||||
| | * | | Merge pull request #3212 from matrix-org/erikj/epa_stream | Erik Johnston | 2018-05-17 | 2 | -38/+16 |
| | |\ \ | | | | | | | | | | | Use stream rather depth ordering for push actions | ||||
| | | * | | Use stream rather depth ordering for push actions | Erik Johnston | 2018-05-11 | 2 | -38/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies things as it is, but will also allow us to change the way we traverse topologically without having to update the way push actions work. | ||||
| | * | | | Merge pull request #3163 from matrix-org/cohort_analytics | Neil Johnson | 2018-05-16 | 5 | -5/+113 |
| | |\ \ \ | | | | | | | | | | | | | user visit data | ||||
| | | * | | | remove empty line | Neil Johnson | 2018-05-16 | 1 | -1/+0 |
| | | | | | | |||||
| | | * | | | style and further contraining query | Neil Johnson | 2018-05-16 | 1 | -8/+12 |
| | | | | | | |||||
| | | * | | | Limit query load of generate_user_daily_visits | Neil Johnson | 2018-05-15 | 1 | -13/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | The aim is to keep track of when it was last called and only query from that point in time | ||||
| | | * | | | instead of inserting user daily visit data at the end of the day, instead ↵ | Neil Johnson | 2018-05-14 | 1 | -40/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | insert incrementally through the day | ||||
| | | * | | | Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵ | Neil Johnson | 2018-05-14 | 10 | -290/+380 |
| | | |\| | | | | | | | | | | | | | | | | | | | | cohort_analytics | ||||
| | | * | | | remove user agent from data model, will just join on user_ips | Neil Johnson | 2018-05-01 | 1 | -12/+11 |
| | | | | | | |||||
| | | * | | | add inidexes based on usage | Neil Johnson | 2018-05-01 | 1 | -6/+2 |
| | | | | | | |||||
| | | * | | | pep8 | Neil Johnson | 2018-04-25 | 1 | -3/+4 |
| | | | | | | |||||
| | | * | | | Generate user daily stats | Neil Johnson | 2018-04-25 | 5 | -5/+106 |
| | | | | | | |||||
| | * | | | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 2 | -0/+36 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | ConsentResource to gather policy consent from users | ||||
| | | * | | | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 2 | -0/+36 |
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | Hopefully there are enough comments and docs in this that it makes sense on its own. | ||||
| * | / | | rest of the changes | Amber Brown | 2018-05-21 | 2 | -27/+18 |
| |/ / / | |||||
| * | | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate | David Baker | 2018-05-14 | 2 | -0/+64 |
| |\ \ \ | | |/ / | |/| | | Part user from rooms on account deactivate | ||||
| | * | | Many docstrings | David Baker | 2018-05-10 | 1 | -0/+12 |
| | | | | |||||
| | * | | Add the schema file | David Baker | 2018-05-09 | 1 | -0/+25 |
| | | | | |||||
| | * | | Part deactivated users in the background | David Baker | 2018-05-09 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | One room at a time so we don't take out the whole server with leave events, and restart at server restart. | ||||
| * | | | Merge pull request #3199 from matrix-org/erikj/pagination_sync | Erik Johnston | 2018-05-09 | 1 | -39/+36 |
| |\ \ \ | | | | | | | | | | | Refactor sync APIs to reuse pagination API | ||||
| | * | | | Refactor sync APIs to reuse pagination API | Erik Johnston | 2018-05-09 | 1 | -38/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sync API often returns events in a topological rather than stream ordering, e.g. when the user joined the room or on initial sync. When this happens we can reuse existing pagination storage functions. | ||||
| | * | | | Don't unnecessarily require token to be stream token | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This allows calling the `get_recent_event_ids_for_room` function in more situations. | ||||
| * | | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_pagination | Erik Johnston | 2018-05-09 | 1 | -1/+15 |
| |\ \ \ \ | | | | | | | | | | | | | Refactor get_recent_events_for_room return type | ||||
| | * | | | | Fix up comment | Erik Johnston | 2018-05-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-05-09 | 1 | -5/+6 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | erikj/fixup_return_pagination | ||||
| | * | | | | Refactor get_recent_events_for_room return type | Erik Johnston | 2018-05-09 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to return a tuple of tokens when the last token is always the token passed as an argument. Changing it makes it consistent with other storage APIs | ||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-05-09 | 1 | -5/+6 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | erikj/remove_membership_change | ||||
| | * | | | | Update comments | Erik Johnston | 2018-05-09 | 1 | -5/+6 |
| | |/ / / | |||||
| * / / / | Remove unused code path from member change DB func | Erik Johnston | 2018-05-09 | 1 | -24/+10 |
| |/ / / | | | | | | | | | | | | | | | | | The function is never called without a from_key, so we can remove all the handling for that scenario. | ||||
| * | | | Refactor pagination DB API to return concrete type | Erik Johnston | 2018-05-09 | 1 | -28/+48 |
| | | | | | | | | | | | | | | | | | | | | This makes it easier to document what is being returned by the storage functions and what some functions expect as arguments. | ||||
| * | | | Remove unused from_token param | Erik Johnston | 2018-05-09 | 1 | -7/+4 |
| | | | | |||||
| * | | | Refactor recent events func to use pagination func | Erik Johnston | 2018-05-09 | 1 | -48/+27 |
| | | | | | | | | | | | | | | | | This also removes a cache that is unlikely to ever get hit. | ||||
| * | | | Fix up comments and make function private | Erik Johnston | 2018-05-09 | 1 | -7/+7 |
| | | | | |||||
| * | | | Reuse existing pagination code for context API | Erik Johnston | 2018-05-08 | 1 | -75/+15 |
| | | | | |||||
| * | | | Parse tokens before calling DB function | Erik Johnston | 2018-05-08 | 1 | -14/+18 |
| | | | | |||||
| * | | | Only fetch required fields from database | Erik Johnston | 2018-05-08 | 1 | -1/+2 |
| | | | | |||||
| * | | | Split paginate_room_events storage function | Erik Johnston | 2018-05-08 | 1 | -28/+72 |
| |/ / | |||||
| * | | Merge pull request #3141 from matrix-org/erikj/fixup_state | Erik Johnston | 2018-05-03 | 1 | -37/+67 |
| |\ \ | | | | | | | | | Refactor event storage to prepare for changes in state calculations | ||||
| | * | | Fix up grammar | Erik Johnston | 2018-05-03 | 1 | -3/+3 |
| | | | | |||||
| | * | | Refactor event storage to not require state | Erik Johnston | 2018-04-27 | 1 | -37/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for using contexts that may or may not have the current_state_ids set. This will allow us to avoid unnecessarily pulling out state for an event on the master process when using workers. We also add a check to see if the state groups of the old extremities are the same as the new ones. | ||||
| * | | | Merge pull request #3129 from matrix-org/matthew/fix_group_dups | Matthew Hodgson | 2018-04-30 | 1 | -0/+57 |
| |\ \ \ | | | | | | | | | | | remove duplicates from groups tables | ||||
| | * | | | fix missing import | Matthew Hodgson | 2018-04-28 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | pep8 | Matthew Hodgson | 2018-04-28 | 1 | -3/+5 |
| | | | | | |||||
| | * | | | make it work with sqlite | Matthew Hodgson | 2018-04-28 | 2 | -34/+54 |
| | | | | | |||||
| | * | | | remove duplicates from groups tables | Matthew Hodgson | 2018-04-25 | 1 | -0/+34 |
| | | |/ | | |/| | | | | | | | | | | | | | and rename inconsistently named indexes. Based on https://github.com/matrix-org/synapse/pull/3128 - thanks @vurpo\! | ||||
| * | | | Merge branch 'develop' into py3-xrange-1 | Richard van der Hoff | 2018-04-30 | 2 | -4/+6 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 2 | -8/+18 |
| | |\ \ \ | |||||
| | * | | | | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 2 | -4/+6 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | While I was going through uses of preserve_fn for other PRs, I converted places which only use the wrapped function once to use run_in_background, to avoid creating the function object. | ||||
| * | | | | Move more xrange to six | Adrian Tschira | 2018-04-28 | 4 | -4/+12 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | plus a bonus next() Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions | Richard van der Hoff | 2018-04-27 | 1 | -7/+17 |
| |\ \ \ | | | | | | | | | | | Improve exception handling for background processes | ||||
| | * | | | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 1 | -7/+17 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a bunch of places where we fire off a process to happen in the background, but don't have any exception handling on it - instead relying on the unhandled error being logged when the relevent deferred gets garbage-collected. This is unsatisfactory for a number of reasons: - logging on garbage collection is best-effort and may happen some time after the error, if at all - it can be hard to figure out where the error actually happened. - it is logged as a scary CRITICAL error which (a) I always forget to grep for and (b) it's not really CRITICAL if a background process we don't care about fails. So this is an attempt to add exception handling to everything we fire off into the background. | ||||
| * / / | Add missing consumeErrors | Richard van der Hoff | 2018-04-27 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | In general we want defer.gatherResults to consumeErrors, rather than having exceptions hanging around and getting logged as CRITICAL unhandled errors. | ||||
| * | | Fix media admin APIs | Erik Johnston | 2018-04-26 | 1 | -2/+2 |
| | | | |||||
| * | | Also fix reindexing of search | Erik Johnston | 2018-04-25 | 1 | -1/+1 |
| | | | |||||
| * | | Fix quarantine media admin API | Erik Johnston | 2018-04-25 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3110 from NotAFile/py3-six-queue | Richard van der Hoff | 2018-04-20 | 1 | -2/+4 |
| |\ | | | | | | | Replace Queue with six.moves.queue | ||||
| | * | Replace Queue with six.moves.queue | Adrian Tschira | 2018-04-16 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | and a six.range change which I missed the last time Signed-off-by: Adrian Tschira <nota@notafile.com> | ||||
| * | | Merge pull request #3117 from matrix-org/rav/refactor_have_events | Richard van der Hoff | 2018-04-20 | 1 | -7/+42 |
| |\ \ | | | | | | | | | Refactor store.have_events | ||||
| | * | | Refactor store.have_events | Richard van der Hoff | 2018-04-20 | 1 | -7/+42 |
| | |/ | | | | | | | | | | | | | | | | It turns out that most of the time we were calling have_events, we were only using half of the result. Replace have_events with have_seen_events and get_rejection_reasons, so that we can see what's going on a bit more clearly. | ||||
| * / | Avoid creating events with huge numbers of prev_events | Richard van der Hoff | 2018-04-16 | 1 | -16/+41 |
| |/ | | | | | | | | | | | In most cases, we limit the number of prev_events for a given event to 10 events. This fixes a particular code path which created events with huge numbers of prev_events. | ||||
| * | Format docstring | Erik Johnston | 2018-04-12 | 1 | -2/+3 |
| | | |||||
| * | Doc we raise on unknown event | Erik Johnston | 2018-04-12 | 1 | -2/+3 |
| | | |||||
| * | Track last processed event received_ts | Erik Johnston | 2018-04-11 | 1 | -0/+18 |
| | | |||||
| * | Track where event stream processing have gotten up to | Erik Johnston | 2018-04-11 | 1 | -0/+3 |
| | | |||||
| * | Merge pull request #2760 from Valodim/pypy | Richard van der Hoff | 2018-04-11 | 2 | -1/+6 |
| |\ | | | | | | | Synapse on PyPy | ||||
| | * | Fix pep8 error on psycopg2cffi hack | Richard van der Hoff | 2018-04-10 | 1 | -6/+5 |
| | | | |||||
| | * | Use psycopg2cffi module instead of psycopg2 if running on pypy | Vincent Breitmoser | 2018-04-10 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | The psycopg2 package isn't available for PyPy. This commit adds a check if the runtime is PyPy, and if it is uses psycopg2cffi module in favor of psycopg2. This is almost a drop-in replacement, except for one place where an additional cast to string is required. | ||||
| * | | fix typo | Neil Johnson | 2018-04-10 | 1 | -2/+2 |
| | | | |||||
| * | | remove errant print v0.27.3-rc2 | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| | | | |||||
| * | | Fix msec to sec, again | Neil Johnson | 2018-04-09 | 1 | -3/+3 |
| | | | |||||
| * | | Fix msec to sec | Neil Johnson | 2018-04-09 | 1 | -1/+1 |
| | | | |||||
| * | | Fix psycopg2 interpolation | Neil Johnson | 2018-04-09 | 1 | -5/+5 |
| |/ | |||||
| * | Don't use redundant inlineCallbacks | Luke Barnard | 2018-04-06 | 1 | -4/+1 |
| | | |||||
| * | join_rule -> join_policy | Luke Barnard | 2018-04-06 | 1 | -1/+1 |
| | | |||||
| * | is_joinable -> join_rule | Luke Barnard | 2018-04-06 | 1 | -4/+1 |
| | | |||||
| * | pep8 | David Baker | 2018-04-06 | 1 | -1/+2 |
| | | |||||
| * | Implement group join API | David Baker | 2018-04-06 | 1 | -3/+9 |
| | | |||||
| * | Merge pull request #3045 from matrix-org/dbkr/group_joinable | Luke Barnard | 2018-04-05 | 3 | -0/+42 |
| |\ | | | | | | | Add joinability for groups | ||||
| | * | NON NULL -> NOT NULL | Luke Barnard | 2018-04-05 | 1 | -1/+1 |
| | | | |||||
| | * | Use DEFAULT join_policy of "invite" in db | Luke Barnard | 2018-04-05 | 1 | -1/+1 |
| | | | |||||
| | * | Document set_group_join_policy | Luke Barnard | 2018-04-05 | 1 | -0/+6 |
| | | | |||||
| | * | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 2 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API is now under /groups/$group_id/setting/m.join_policy and expects a JSON blob of the shape ```json { "m.join_policy": { "type": "invite" } } ``` where "invite" could alternatively be "open". | ||||
| | * | OK, smallint it is then | David Baker | 2018-03-28 | 1 | -1/+1 |
| | | | |||||
| | * | Grr. Copy the definition from is_admin | David Baker | 2018-03-28 | 1 | -1/+1 |
| | | |