Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 12 | -120/+552 |
|\ | |||||
| * | Fix SQL to supply arguments in the same order | Mark Haines | 2016-07-29 | 1 | -1/+1 |
| | | |||||
| * | Create separate methods for getting messages to push | Mark Haines | 2016-07-28 | 1 | -45/+154 |
| | | | | | | | | | | | | | | | | | | | | | | for the email and http pushers rather than trying to make a single method that will work with their conflicting requirements. The http pusher needs to get the messages in ascending stream order, and doesn't want to miss a message. The email pusher needs to get the messages in descending timestamp order, and doesn't mind if it misses messages. | ||||
| * | Comment get_unread_push_actions_for_user_in_range function | Kegan Dougal | 2016-07-28 | 1 | -2/+26 |
| | | |||||
| * | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload | Richard van der Hoff | 2016-07-27 | 2 | -0/+34 |
| |\ | | | | | | | Make the device id on e2e key upload optional | ||||
| | * | SQL syntax fix | Richard van der Hoff | 2016-07-27 | 1 | -1/+1 |
| | | | |||||
| | * | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -0/+15 |
| | | | |||||
| | * | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should now be able to get our device_id from the access_token, so the device_id on the upload request is optional. Where it is supplied, we should check that it matches. For active access_tokens without an associated device_id, we ought to register the device in the devices table. Also update the table on upgrade so that all of the existing e2e keys are associated with real devices. | ||||
| * | | Fix a couple of bugs in the transaction and keyring code | Mark Haines | 2016-07-26 | 1 | -1/+2 |
| |/ | |||||
| * | Fix typo | Richard van der Hoff | 2016-07-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device | Richard van der Hoff | 2016-07-26 | 1 | -50/+110 |
| |\ | |||||
| | * | Merge pull request #948 from matrix-org/markjh/auth_fixes | Mark Haines | 2016-07-26 | 1 | -50/+110 |
| | |\ | | | | | | | | | Don't add rejections to the state_group, persist all rejections | ||||
| | | * | Fix how push_actions are redacted. | Mark Haines | 2016-07-26 | 1 | -8/+10 |
| | | | | |||||
| | | * | Don't add rejected events if we've seen them befrore. Add some comments to ↵ | Mark Haines | 2016-07-26 | 1 | -5/+48 |
| | | | | | | | | | | | | | | | | explain what the code is doing mechanically | ||||
| | | * | Only update the events and event_json tables for rejected events | Mark Haines | 2016-07-25 | 2 | -52/+63 |
| | | | | |||||
| | | * | Don't add the events to forward extremities if the event is rejected | Mark Haines | 2016-07-25 | 1 | -3/+6 |
| | | | | |||||
| | | * | Don't add rejections to the state_group, persist all rejections | Mark Haines | 2016-07-25 | 2 | -5/+6 |
| | | | | |||||
| * | | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 1 | -13/+45 |
| |/ / | |||||
| * | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -1/+26 |
| | | | | | | | | | | | | You can update the displayname of devices now. | ||||
| * | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 4 | -4/+71 |
| |/ | |||||
| * | fix: defer.returnValue takes one argument | Mark Haines | 2016-07-25 | 1 | -1/+1 |
| | | |||||
| * | background updates: fix assert again | Richard van der Hoff | 2016-07-25 | 1 | -1/+1 |
| | | |||||
| * | background updates: Fix assertion to do something | Richard van der Hoff | 2016-07-25 | 1 | -2/+2 |
| | | |||||
| * | Fix background_update tests | Richard van der Hoff | 2016-07-25 | 1 | -7/+20 |
| | | | | | | | | | | | | A bit of a cleanup for background_updates, and make sure that the real background updates have run before we start the unit tests, so that they don't interfere with the tests. | ||||
| * | PEP8 | Richard van der Hoff | 2016-07-22 | 1 | -1/+0 |
| | | |||||
| * | Create index on user_ips in the background | Richard van der Hoff | 2016-07-22 | 3 | -12/+80 |
| | | | | | | | | | | | | | | | | user_ips is kinda big, so really we want to add the index in the background once we're running. Replace the schema delta with one which will do that. I've done this in a way that's reasonably easy to reuse as there a few other indexes I need, and I don't suppose they will be the last. | ||||
* | | Add more key storage funcs into slave store | Erik Johnston | 2016-07-28 | 1 | -18/+16 |
| | | |||||
* | | Split out a FederationReader process | Erik Johnston | 2016-07-21 | 1 | -0/+4 |
|/ | |||||
* | storage/client_ips: remove some dead code | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 |
| | |||||
* | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 1 | -1/+2 |
|\ | | | | | | | (pick up PR #938 in the hope of fixing the UTs) | ||||
| * | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 1 | -1/+2 |
| | | | | | | | | | | Record the device_id when we add a client ip; it's somewhat redundant as we could get it via the access_token, but it will make querying rather easier. | ||||
* | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 3 | -1/+109 |
|/ | | | | | | | implement a GET /devices endpoint which lists all of the user's devices. It also returns the last IP where we saw that device, so there is some dancing to fish that out of the user_ips table. | ||||
* | More doc-comments | Richard van der Hoff | 2016-07-20 | 1 | -7/+12 |
| | | | | Fix some more comments on some things | ||||
* | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 1 | -2/+4 |
|\ | | | | | Further registration refactoring | ||||
| * | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change. | ||||
* | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 3 | -1/+197 |
|\ \ | |/ |/| | Feature: Add filter to /messages. Add 'contains_url' to filter. | ||||
| * | Comment | Erik Johnston | 2016-07-20 | 1 | -0/+4 |
| | | |||||
| * | Add support for filters in paginate_room_events | Erik Johnston | 2016-07-14 | 1 | -1/+51 |
| | | |||||
| * | Add sender and contains_url field to events table | Erik Johnston | 2016-07-14 | 2 | -0/+142 |
| | | |||||
* | | schema fix | Richard van der Hoff | 2016-07-19 | 1 | -1/+1 |
| | | | | | | | | device_id should be text, not bigint. | ||||
* | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 5 | -10/+135 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'devices' table to the storage, as well as a 'device_id' column to refresh_tokens. Allow the client to pass a device_id, and initial_device_display_name, to /login. If login is successful, then register the device in the devices table if it wasn't known already. If no device_id was supplied, make one up. Associate the device_id with the access token and refresh token, so that we can get at it again later. Ensure that the device_id is copied from the refresh token to the access_token when the token is refreshed. | ||||
* | | Fix /purge_history bug | Erik Johnston | 2016-07-15 | 1 | -19/+15 |
| | | | | | | | | This was caused by trying to insert duplicate backward extremeties | ||||
* | | Pull out min stream_ordering from ex_outlier_stream | Erik Johnston | 2016-07-15 | 1 | -1/+2 |
| | | |||||
* | | event_backwards_extremeties may not be empty | Erik Johnston | 2016-07-15 | 1 | -1/+11 |
|/ | |||||
* | Add a comment explaining allow_none | Mark Haines | 2016-07-08 | 1 | -0/+2 |
| | |||||
* | Ensure that the guest user is in the database when upgrading accounts | Mark Haines | 2016-07-08 | 1 | -0/+13 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-08 | 3 | -3/+14 |
|\ | |||||
| * | Merge pull request #886 from matrix-org/markjh/async_commit | Mark Haines | 2016-06-29 | 3 | -3/+14 |
| |\ | | | | | | | Optionally make committing to postgres asynchronous. | ||||
| | * | Optionally make committing to postgres asynchronous. | Mark Haines | 2016-06-20 | 3 | -3/+14 |
| | | | | | | | | | | | | | | | Useful when running tests when you don't care whether the server will lose data that it claims that it has committed. | ||||
* | | | Comment | Erik Johnston | 2016-07-07 | 1 | -0/+3 |
| | | | |||||
* | | | Return 400 rather than 500 | Erik Johnston | 2016-07-07 | 1 | -1/+4 |
| | | | |||||
* | | | Add rest servlet. Fix SQL. | Erik Johnston | 2016-07-06 | 1 | -5/+4 |
| | | | |||||
* | | | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 3 | -83/+131 |
|\ \ \ | |||||
| * | | | Remove spurious txn | Erik Johnston | 2016-07-05 | 1 | -9/+0 |
| | | | | |||||
| * | | | Fix for postgres | Erik Johnston | 2016-07-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -23/+38 |
| | | | | |||||
| * | | | Fix typo | Mark Haines | 2016-07-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make get_events_around more efficient on sqlite3 | Mark Haines | 2016-07-05 | 1 | -13/+49 |
| | | | | |||||
| * | | | Use true/false for boolean parameter inclusive to avoid potential for sqli, ↵ | Mark Haines | 2016-07-05 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | and possibly make the code clearer | ||||
| * | | | Use different SQL for postgres and sqlite3 for when using multicolumn indexes | Mark Haines | 2016-07-04 | 2 | -59/+59 |
| | | | | |||||
| * | | | Use a query that postgresql optimises better for get_events_around | Mark Haines | 2016-07-04 | 1 | -12/+16 |
| | | | | |||||
* | | | | Add ReadWriteLock for pagination and history prune | Erik Johnston | 2016-07-05 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add purge_history API | Erik Johnston | 2016-07-05 | 1 | -0/+6 |
| | | | | |||||
* | | | | Add storage function to purge history for a room | Erik Johnston | 2016-07-04 | 1 | -0/+140 |
|/ / / | |||||
* | | | Feature: Add deactivate account admin API | Erik Johnston | 2016-06-30 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>` | ||||
* | | | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 1 | -0/+29 |
| | | | |||||
* | | | Track approximate last access time for remote media | Erik Johnston | 2016-06-29 | 3 | -1/+47 |
| | | | |||||
* | | | more pep8 | David Baker | 2016-06-24 | 1 | -1/+0 |
| | | | |||||
* | | | Use similar naming we use in email notifs for push | David Baker | 2016-06-24 | 2 | -50/+0 |
| | | | | | | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1654 | ||||
* | | | Actually we need to order these properly | David Baker | 2016-06-22 | 1 | -2/+12 |
| | | | | | | | | | | | | otherwise we'll end up returning the wrong 20 | ||||
* | | | Style | David Baker | 2016-06-22 | 1 | -1/+1 |
| | | | |||||
* | | | Put most recent 20 messages in notif | David Baker | 2016-06-22 | 1 | -3/+4 |
|/ / | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1648 | ||||
* | | Add the create_profile method back since the tests use it | Mark Haines | 2016-06-17 | 1 | -0/+6 |
| | | |||||
* | | Remove registered_users from the distributor. | Mark Haines | 2016-06-17 | 2 | -9/+14 |
|/ | | | | | | | | | | The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed. | ||||
* | Don't hit DB for noop replications queries | Erik Johnston | 2016-06-08 | 4 | -0/+12 |
| | |||||
* | Remove dead code. | Mark Haines | 2016-06-07 | 1 | -7/+0 |
| | | | | | | | | | | | Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed. | ||||
* | Fix AS retries, but with correct ordering | Erik Johnston | 2016-06-07 | 1 | -2/+2 |
| | |||||
* | Fix AS retries | Erik Johnston | 2016-06-07 | 1 | -2/+2 |
| | |||||
* | Merge pull request #841 from matrix-org/erikj/event_counter | Erik Johnston | 2016-06-06 | 1 | -0/+9 |
|\ | | | | | Add metric counter for number of persisted events | ||||
| * | Add metric counter for number of persisted events | Erik Johnston | 2016-06-06 | 1 | -0/+9 |
| | | |||||
* | | Add events to cache when we persist them | Erik Johnston | 2016-06-06 | 1 | -0/+41 |
|/ | |||||
* | Don't rely on options when inserting event into cache | Erik Johnston | 2016-06-03 | 1 | -40/+43 |
| | |||||
* | Change the way we cache events | Erik Johnston | 2016-06-03 | 1 | -39/+41 |
| | |||||
* | Remove event fetching from DB threads | Erik Johnston | 2016-06-03 | 5 | -194/+74 |
| | |||||
* | Move insert_client_ip to a separate class | Mark Haines | 2016-06-03 | 2 | -45/+71 |
| | |||||
* | Merge pull request #828 from matrix-org/erikj/joined_hosts_for_room | Erik Johnston | 2016-06-03 | 1 | -16/+3 |
|\ | | | | | Make get_joined_hosts_for_room use get_users_in_room | ||||
| * | Make get_joined_hosts_for_room use get_users_in_room | Erik Johnston | 2016-06-03 | 1 | -16/+3 |
| | | |||||
* | | Merge pull request #825 from matrix-org/erikj/cache_push_rules | Erik Johnston | 2016-06-03 | 2 | -2/+38 |
|\ \ | | | | | | | Load push rules in storage layer so that they get cached | ||||
| * | | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -1/+37 |
| | | | |||||
| * | | Only get local users | Erik Johnston | 2016-06-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #824 from matrix-org/markjh/slaved_presence_store | Mark Haines | 2016-06-03 | 1 | -3/+3 |
|\ \ | |/ |/| | Add a slaved store for presence | ||||
| * | Add a slaved store for presence | Mark Haines | 2016-06-03 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #811 from matrix-org/erikj/state_users_in_room | Erik Johnston | 2016-06-03 | 3 | -17/+27 |
|\ \ | | | | | | | Use state to calculate get_users_in_room | ||||
| * | | Use state to calculate get_users_in_room | Erik Johnston | 2016-06-01 | 3 | -17/+27 |
| | | | |||||
* | | | Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room | Erik Johnston | 2016-06-03 | 1 | -0/+28 |
|\| | | |/ |/| | Add get_users_with_read_receipts_in_room cache | ||||
| * | Add get_users_with_read_receipts_in_room cache | Erik Johnston | 2016-06-01 | 1 | -0/+28 |
| | | |||||
* | | Fix setting the _clock in SQLBaseStore | Mark Haines | 2016-06-02 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #807 from matrix-org/erikj/push_rules_cache | Erik Johnston | 2016-06-01 | 1 | -1/+2 |
|\ \ | | | | | | | Ensure we always return boolean in push rules | ||||
| * | | Force boolean | Erik Johnston | 2016-05-31 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #806 from matrix-org/erikj/hash_cache | Erik Johnston | 2016-06-01 | 1 | -9/+16 |
|\ \ \ | | | | | | | | | Cache get_event_reference_hashes | ||||
| * | | | Cache get_event_reference_hashes | Erik Johnston | 2016-05-31 | 1 | -9/+16 |
| | |/ | |/| | |||||
* | | | Limit number of notifications in an email notification | David Baker | 2016-06-01 | 1 | -2/+4 |
| | | | |||||
* | | | Fix synapse/storage/schema/delta/30/as_users.py | Mark Haines | 2016-05-31 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #805 from matrix-org/erikj/push_rules_cache | Erik Johnston | 2016-05-31 | 1 | -2/+8 |
|\ \ \ | | |/ | |/| | Fix GET /push_rules | ||||
| * | | Fix typo | Erik Johnston | 2016-05-31 | 1 | -1/+1 |
| | | | |||||
| * | | Change fix | Erik Johnston | 2016-05-31 | 1 | -2/+8 |
| |/ | |||||
* | | Merge pull request #804 from matrix-org/erikj/push_rules_cache | Erik Johnston | 2016-05-31 | 1 | -6/+10 |
|\| | | | | | Add caches to bulk_get_push_rules* | ||||
| * | Add caches to bulk_get_push_rules* | Erik Johnston | 2016-05-31 | 1 | -6/+10 |
| | | |||||
* | | Fix to allow start with postgres | Erik Johnston | 2016-05-27 | 1 | -2/+7 |
| | | |||||
* | | Remove debug logging | David Baker | 2016-05-23 | 1 | -1/+0 |
| | | |||||
* | | Oops, missing comma | David Baker | 2016-05-20 | 1 | -1/+1 |
| | | |||||
* | | Remove stale line | David Baker | 2016-05-20 | 1 | -2/+0 |
| | | |||||
* | | Handle empty events table | David Baker | 2016-05-20 | 1 | -0/+3 |
| | | |||||
* | | Make deleting push actions more efficient | David Baker | 2016-05-20 | 3 | -13/+68 |
| | | | | | | | | There's no index on received_ts, so manually binary search using the stream_ordering index, and only update it once an hour. | ||||
* | | Only delete push actions after 30 days | David Baker | 2016-05-20 | 2 | -6/+38 |
|/ | |||||
* | Add desc to get_presence_for_users | Erik Johnston | 2016-05-18 | 1 | -0/+1 |
| | |||||
* | Move the functions for parsing app service config | Mark Haines | 2016-05-17 | 1 | -102/+3 |
| | |||||
* | get_room_members is unused now | Mark Haines | 2016-05-16 | 1 | -18/+0 |
| | |||||
* | Spell "domain" correctly | Mark Haines | 2016-05-16 | 1 | -2/+2 |
| | | | | s/domian/domain/g | ||||
* | Allow receipts for events we haven't seen in the db | Mark Haines | 2016-05-13 | 1 | -4/+6 |
| | |||||
* | Merge pull request #778 from matrix-org/erikj/add_pusher | Erik Johnston | 2016-05-13 | 2 | -4/+17 |
|\ | | | | | Fixup add_pusher | ||||
| * | Spelling | Erik Johnston | 2016-05-13 | 1 | -1/+1 |
| | | |||||
| * | Fixup add_pusher | Erik Johnston | 2016-05-13 | 2 | -4/+17 |
| | | |||||
* | | Merge pull request #769 from matrix-org/erikj/push_actions_delete | Erik Johnston | 2016-05-13 | 2 | -9/+29 |
|\ \ | | | | | | | Delete old pushers | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-05-06 | 7 | -46/+210 |
| |\ \ | | | | | | | | | | | | | erikj/push_actions_delete | ||||
| * | | | Delete old pushers | Erik Johnston | 2016-05-03 | 2 | -9/+29 |
| | | | | |||||
* | | | | Merge pull request #779 from matrix-org/erikj/receipts | Erik Johnston | 2016-05-13 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Use tree cache for get_linearized_receipts_for_room | ||||
| * | | | | Use tree cache for get_linearized_receipts_for_room | Erik Johnston | 2016-05-13 | 1 | -3/+3 |
| | |_|/ | |/| | | |||||
* | | | | Remove topics table | Erik Johnston | 2016-05-13 | 1 | -1/+0 |
| | | | | |||||
* | | | | Annotate the removed indicies with why they were removed. | Mark Haines | 2016-05-13 | 1 | -18/+15 |
| | | | | |||||
* | | | | Remove unused indices | Erik Johnston | 2016-05-13 | 1 | -0/+42 |
|/ / / | | | | | | | | | | | | | This includes removing both unused indices and indices that are subsets of other indices. | ||||
* | | | unbreak schema | Matrix | 2016-05-10 | 2 | -0/+0 |
| | | | |||||
* | | | Merge pull request #759 from matrix-org/dbkr/email_notifs | Matthew Hodgson | 2016-05-10 | 5 | -13/+104 |
|\ \ \ | | | | | | | | | Send email notifications for missed messages | ||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 10 | -62/+364 |
| |\ \ \ | |||||
| * | | | | Correct SQL statement for postgres | David Baker | 2016-05-04 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently). | ||||
| * | | | | Remove unused function | David Baker | 2016-04-29 | 1 | -22/+0 |
| | | | | | |||||
| * | | | | Use explicit join | David Baker | 2016-04-29 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Oops, actually specify the user id | David Baker | 2016-04-29 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Remove unnecessary if | David Baker | 2016-04-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Put spaces at start of line | David Baker | 2016-04-29 | 1 | -16/+16 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 8 | -12/+199 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Send a rather basic email notif | David Baker | 2016-04-20 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | Also pep8 fixes | ||||
| * | | | | First bits of emailpusher | David Baker | 2016-04-19 | 5 | -7/+118 |
| | | | | | | | | | | | | | | | | | | | | Mostly logic of when to send an email | ||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 1 | -5/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #773 from matrix-org/erikj/get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -5/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Add and use get_domain_from_id | ||||
| | * | | | | Add and use get_domian_from_id | Erik Johnston | 2016-05-09 | 1 | -5/+2 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-09 | 6 | -56/+317 |
|\| | | | | |||||
| * | | | | Merge pull request #772 from matrix-org/erikj/get_user_cache | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Add cache to get_user_by_id | ||||
| | * | | | | Add cache to get_user_by_id | Erik Johnston | 2016-05-09 | 1 | -0/+3 |
| | |/ / / | |||||
| * | | | | Remove unused import | Erik Johnston | 2016-05-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Pull loop one level up | Erik Johnston | 2016-05-06 | 1 | -36/+41 |
| | | | | | |||||
| * | | | | Queue events for persistence | Erik Johnston | 2016-05-06 | 1 | -11/+144 |
| |/ / / | |||||
| * | | | Pull prev txn from in memory | Erik Johnston | 2016-05-06 | 1 | -5/+13 |
| | | | | |||||
| * | | | Don't needlessly enter transaction | Erik Johnston | 2016-05-06 | 1 | -9/+9 |
| | | | | |||||
| * | | | Reduce database inserts when sending transactions | Erik Johnston | 2016-05-06 | 1 | -44/+113 |
| | | | | |||||
| * | | | Add an openidish mechanism for proving to third parties that you own a given ↵ | Mark Haines | 2016-05-05 | 3 | -1/+44 |
| | | | | | | | | | | | | | | | | user_id | ||||
* | | | | Add bulk fetch storage API | Erik Johnston | 2016-05-05 | 1 | -3/+22 |
| | | | | |||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user | Erik Johnston | 2016-05-04 | 4 | -1/+45 |
|\| | | | |||||
| * | | | Add primary key | Erik Johnston | 2016-05-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 3 | -1/+8 |
| | | | | |||||
| * | | | Add /report endpoint | Erik Johnston | 2016-05-04 | 3 | -1/+38 |
| | |/ | |/| | |||||
* / | | Implement basic ignore user | Erik Johnston | 2016-05-04 | 1 | -0/+31 |
|/ / | |||||
* | | Check that somethign has happend before running the selects | Mark Haines | 2016-04-27 | 3 | -2/+14 |
| | | |||||
* | | Simplify query and handle finishing correctly | Erik Johnston | 2016-04-22 | 2 | -17/+16 |
| | | |||||
* | | Order NULLs first | Erik Johnston | 2016-04-21 | 2 | -5/+16 |
| | | |||||
* | | Fix query | Erik Johnston | 2016-04-21 | 1 | -2/+2 |
| | | |||||
* | | Use special UPDATE syntax | Erik Johnston | 2016-04-21 | 2 | -22/+14 |
| | | |||||
* | | Typo | Erik Johnston | 2016-04-21 | 1 | -1/+1 |
| | | |||||
* | | Need to do _background_update_progress_txn in actual transaction | Erik Johnston | 2016-04-21 | 1 | -6/+8 |
| | | |||||
* | | Update progress when creating index | Erik Johnston | 2016-04-21 | 1 | -0/+7 |
| | | |||||
* | | Fix SQL statement | Erik Johnston | 2016-04-21 | 1 | -3/+3 |
| | | |||||
* | | Create index must be on a conn | Erik Johnston | 2016-04-21 | 1 | -6/+13 |
| | | |||||
* | | Create index concurrently | Erik Johnston | 2016-04-21 | 2 | -6/+14 |
| | | |||||
* | | Add missing run_upgrade | Erik Johnston | 2016-04-21 | 1 | -0/+4 |
| | | |||||
* | | Optimise event_search in postgres | Erik Johnston | 2016-04-21 | 3 | -5/+137 |
| | | |||||
* | | Add cache to _get_state_groups_from_groups | Erik Johnston | 2016-04-19 | 1 | -3/+16 |
|/ | |||||
* | Add desc arg | Erik Johnston | 2016-04-14 | 1 | -1/+5 |
| | |||||
* | Add index | Erik Johnston | 2016-04-14 | 1 | -0/+18 |
| | |||||
* | Fix query for get_unread_push_actions_for_user_in_range | Erik Johnston | 2016-04-14 | 1 | -1/+2 |
| | |||||
* | pep8 | David Baker | 2016-04-13 | 1 | -1/+1 |
| | |||||
* | Only return unread notifications | David Baker | 2016-04-13 | 1 | -9/+50 |
| | | | | Make get_unread_push_actions_for_user_in_range only return unread event actions, being more true to its name. Done in two separate sql queries to get actions after a read receipt and those in a room wiht no receipt at all. SQL queries by Erik. | ||||
* | Merge pull request #716 from matrix-org/dbkr/get_pushers | David Baker | 2016-04-12 | 1 | -14/+30 |
|\ | | | | | Add get endpoint for pushers | ||||
| * | Unneccessarywhitespaceisunnecessary | David Baker | 2016-04-12 | 1 | -1/+0 |
| | | |||||
| * | Oops, forgot the desc. | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | Tidy up get_pusher functions | David Baker | 2016-04-12 | 1 | -32/+30 |
| | | | | | | | | Decodes pushers rows on the main thread rather than the db thread and uses _simple_select_list. Also do the same to the function I copied and factor out the duplication into a helper function. | ||||
| * | Mis-named function | David Baker | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | Add get endpoint for pushers | David Baker | 2016-04-11 | 1 | -0/+19 |
| | | | | | | | | As per https://github.com/matrix-org/matrix-doc/pull/308 | ||||
* | | Add back backfilled parameter that was removed | Erik Johnston | 2016-04-12 | 1 | -3/+4 |
| | | |||||
* | | Check if we've already backfilled events | Erik Johnston | 2016-04-12 | 1 | -0/+16 |
|/ | |||||
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions | David Baker | 2016-04-11 | 7 | -52/+209 |
|\ | | | | | Change pushers to use the event_actions table | ||||
| * | Fix invite pushes | David Baker | 2016-04-08 | 1 | -0/+7 |
| | | | | | | | | | | | | * If the event is an invite event, add the invitee to list of user we run push rules for (if they have a pusher etc) * Move invite_for_me to be higher prio than member events otherwise member events matches them * Spell override right | ||||
| * | Literally a dictionary | David Baker | 2016-04-07 | 1 | -17/+17 |
| | | |||||
| * | generate id in the main thread | David Baker | 2016-04-07 | 1 | -3/+3 |
| | | |||||
| * | Oops, inequality fail | David Baker | 2016-04-07 | 1 | -1/+1 |
| | | |||||
| * | pep8 | David Baker | 2016-04-07 | 1 | -0/+1 |
| | | |||||
| * | Fix port script for changes merged from develop | David Baker | 2016-04-07 | 1 | -1/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into ↵ | David Baker | 2016-04-07 | 14 | -107/+91 |
| |\ | | | | | | | | | | dbkr/pushers_use_event_actions | ||||
| * | | Send badge count pushes. | David Baker | 2016-04-07 | 1 | -3/+6 |
| | | | | | | | | | | | | Also fix bugs with retrying. | ||||
| * | | pep8 | David Baker | 2016-04-06 | 4 | -4/+8 |
| | | | |||||
| * | | Make pushers use the event_push_actions table instead of listening on an ↵ | David Baker | 2016-04-06 | 6 | -49/+188 |
| | | | | | | | | | | | | | | | | | | | | | event stream & running the rules again. Sytest passes, but remaining to do: * Make badges work again * Remove old, unused code | ||||
* | | | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 2 | -1/+83 |
|\ \ \ | | | | | | | | | URL previewing support | ||||
| * | | | move local_media_repository_url_cache.sql to schema v31 | Matthew Hodgson | 2016-04-08 | 1 | -0/+0 |
| | | | | |||||
| * | | | fix error checking for new SQL | Matthew Hodgson | 2016-04-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | fix SQL based on PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -2/+4 |
| | | | | |||||
| * | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-07 | 18 | -140/+280 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 14 | -162/+346 |
| |\ \ \ | |||||
| * | | | | pep8 | Matthew Hodgson | 2016-04-03 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | add a persistent cache of URL lookups, and fix up the in-memory one to work | Matthew Hodgson | 2016-04-03 | 2 | -1/+80 |
| | | | | | |||||
* | | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 5 | -151/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want | ||||
* | | | | | Add tests for redactions | Mark Haines | 2016-04-07 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #697 from matrix-org/markjh/slaveI | Mark Haines | 2016-04-06 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Add a slaved events store class | ||||
| * | | | | Add a slaved events store class | Mark Haines | 2016-04-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a test to check that get_room_names_and_aliases does the same thing on both the master and on the slave data store. | ||||
* | | | | | Merge pull request #698 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-04-06 | 9 | -68/+51 |
|\ \ \ \ \ | |/ / / / |/| | | | | Don't require config to create database | ||||
| * | | | | Don't require config to create database | Erik Johnston | 2016-04-06 | 9 | -68/+51 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #694 from matrix-org/markjh/caches | Mark Haines | 2016-04-06 | 2 | -33/+34 |
|\ \ \ \ | | | | | | | | | | | Move _get_cache_dict into the SQLBaseStore | ||||
| * | | | | Move _get_cache_dict into the SQLBaseStore | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| |/ / / | |||||
* / / / | Make the cache objects be per instance rather than being global | Mark Haines | 2016-04-06 | 3 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 2 | -1/+21 |
|\ \ \ | | | | | | | | | Fix stuck invites | ||||
| * | | | Fix stuck invites | Erik Johnston | 2016-04-05 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject. | ||||
* | | | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 4 | -31/+151 |
|\| | | | | | | | | | | | Store invites in a separate table. | ||||
| * | | | Docs and indents | Erik Johnston | 2016-04-04 | 2 | -13/+27 |
| | | | | |||||
| * | | | Add upgrade path, rename table | Erik Johnston | 2016-04-04 | 2 | -6/+20 |
| | | | | |||||
| * | | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 4 | -31/+123 |
| | | | | |||||
* | | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 1 | -0/+16 |
|\| | | | |_|/ |/| | | Do checks for memberships before creating events | ||||
| * | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 1 | -0/+16 |
| | | | |||||
* | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 3 | -13/+20 |
|\ \ \ | |/ / |/| | | Use google style doc strings. | ||||
| * | | Use google style doc strings. | Mark Haines | 2016-04-01 | 3 | -13/+20 |
| | | | | | | | | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | ||||
* | | | Merge pull request #684 from matrix-org/markjh/backfill_id_gen | Mark Haines | 2016-04-01 | 11 | -61/+71 |
|\ \ \ | | | | | | | | | Use a stream id generator for backfilled ids | ||||
| * | | | Assert that the step != 0 | Mark Haines | 2016-04-01 | 1 | -0/+1 |
| | | | | |||||
| * | | | use google style doc strings | Mark Haines | 2016-04-01 | 1 | -11/+12 |
| | | | | |||||
| * | | | Rename direction to step, apply checks consistently | Mark Haines | 2016-04-01 | 2 | -16/+16 |
| | | | | |||||
| * | | | Use a stream id generator for backfilled ids | Mark Haines | 2016-04-01 | 11 | -61/+69 |
| |/ / | |||||
* / / | Fix the invalidation of the names and aliases cache | Mark Haines | 2016-04-01 | 1 | -1/+1 |
|/ / | |||||
* | | Move the check for backfilled outside the for loop | Mark Haines | 2016-03-31 | 1 | -5/+5 |
| | | |||||
* | | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 1 | -40/+50 |
| | | | | | | | | | | | | | | | | | | Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms. | ||||
* | | Merge pull request #676 from matrix-org/markjh/replicate_stateIII | Mark Haines | 2016-03-31 | 2 | -2/+114 |
|\ \ | | | | | | | Add replication streams for ex outliers and current state resets | ||||
| * | | Use a namedtuple rather than tuple unpacking | Mark Haines | 2016-03-31 | 1 | -2/+9 |
| | | | |||||
| * | | Add replication streams for ex outliers and current state resets | Mark Haines | 2016-03-30 | 2 | -1/+97 |
| | | | |||||
| * | | Add a entry to current_state_resets table when the current state is reset | Mark Haines | 2016-03-30 | 1 | -0/+9 |
| | | | |||||
* | | | return the state_group for backfill | Mark Haines | 2016-03-30 | 1 | -1/+2 |
|/ / | |||||
* | | Add a replication stream for state groups | Mark Haines | 2016-03-30 | 2 | -1/+35 |
| | | |||||
* | | Use a stream id generator to assign state group ids | Mark Haines | 2016-03-30 | 3 | -49/+59 |
|/ | |||||
* | Don't bother interning keys that are already interned | Erik Johnston | 2016-03-23 | 1 | -3/+1 |
| | |||||
* | Intern all the things | Erik Johnston | 2016-03-23 | 3 | -17/+17 |
| | |||||
* | String intern | Erik Johnston | 2016-03-23 | 1 | -3/+9 |
| | |||||
* | Merge pull request #664 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-03-23 | 1 | -0/+23 |
|\ | | | | | Don't require alias in public room list. | ||||
| * | Comment about weird SQL | Erik Johnston | 2016-03-23 | 1 | -1/+3 |
| | | |||||
| * | SQLite and postgres doesn't share a true literal | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| | | |||||
| * | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 1 | -0/+21 |
| | | |||||
* | | Merge pull request #663 from matrix-org/erikj/invite_for_user | Erik Johnston | 2016-03-23 | 1 | -6/+4 |
|\ \ | | | | | | | Make get_invites return RoomsForUser |