summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #850 from matrix-org/erikj/gc_thresholdErik Johnston2016-06-082-0/+28
|\ | | | | Add gc_threshold to pusher and synchrotron
| * Add gc_threshold to pusher and synchrotronErik Johnston2016-06-072-0/+28
| |
* | Don't track total objects as its too expensive to calculateErik Johnston2016-06-071-1/+0
| |
* | Record some more GC metricsErik Johnston2016-06-071-0/+5
| |
* | Merge pull request #849 from matrix-org/erikj/gc_thresholdErik Johnston2016-06-074-6/+38
|\| | | | | Allow setting of gc.set_thresholds
| * Allow setting of gc.set_thresholdsErik Johnston2016-06-074-6/+38
| |
* | Remove dead code.Mark Haines2016-06-074-54/+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.
* Also record number of unreachable objectsErik Johnston2016-06-071-2/+4
|
* Change the way we do statsErik Johnston2016-06-071-7/+3
|
* Merge pull request #771 from matrix-org/erikj/gc_tickErik Johnston2016-06-071-0/+26
|\ | | | | Manually run GC on reactor tick.
| * Count number of GC collectsErik Johnston2016-05-161-5/+11
| |
| * Add a commentErik Johnston2016-05-131-0/+5
| |
| * Manually run GC on reactor tick.Erik Johnston2016-05-091-0/+15
| | | | | | | | This also adds a metric for amount of time spent in GC.
* | Notify users for events in rooms they join.Mark Haines2016-06-071-8/+6
| | | | | | | | | | | | Change how the notifier updates the map from room_id to user streams on receiving a join event. Make it update the map when it notifies for the join event, rather than using the "user_joined_room" distributor signal
* | Fix AS retries, but with correct orderingErik Johnston2016-06-071-2/+2
| |
* | Fix AS retriesErik Johnston2016-06-071-2/+2
| |
* | Merge pull request #845 from matrix-org/markjh/synchrotron_presenceMark Haines2016-06-061-1/+4
|\ \ | | | | | | Fix a KeyError in the synchrotron presence
| * | Fix a KeyError in the synchrotron presenceMark Haines2016-06-061-1/+4
| | |
* | | Merge pull request #844 from matrix-org/markjh/yield_on_sleepMark Haines2016-06-062-2/+2
|\ \ \ | | | | | | | | Yield on the sleeps intended to backoff replication
| * | | Yield on the sleeps intended to backoff replicationMark Haines2016-06-062-2/+2
| |/ /
* | | .values() returns list of setsErik Johnston2016-06-061-1/+2
| | |
* | | Fix typosErik Johnston2016-06-061-32/+36
| | |
* | | Fire after 30s not 8hErik Johnston2016-06-061-1/+1
|/ /
* | Merge pull request #841 from matrix-org/erikj/event_counterErik Johnston2016-06-061-0/+9
|\ \ | | | | | | Add metric counter for number of persisted events
| * | Add metric counter for number of persisted eventsErik Johnston2016-06-061-0/+9
| | |
* | | Add events to cache when we persist themErik Johnston2016-06-061-0/+41
|/ /
* | Merge pull request #836 from matrix-org/erikj/change_event_cacheErik Johnston2016-06-031-54/+59
|\ \ | | | | | | Change the way we cache events
| * | Don't rely on options when inserting event into cacheErik Johnston2016-06-031-40/+43
| | |
| * | Change the way we cache eventsErik Johnston2016-06-031-39/+41
| | |
* | | Fix spellingMark Haines2016-06-031-1/+1
| | |
* | | Add get_presence_list_accepted to the broken caches in synchrotronMark Haines2016-06-031-4/+9
|/ /
* | Merge pull request #835 from matrix-org/erikj/get_event_txnErik Johnston2016-06-036-199/+74
|\ \ | | | | | | Remove event fetching from DB threads
| * | Remove event fetching from DB threadsErik Johnston2016-06-036-199/+74
| | |
* | | 3rd time lucky: we'd already calculated it aboveDavid Baker2016-06-031-3/+1
| | |
* | | Oops, we're using the dict formDavid Baker2016-06-031-1/+3
| | |
* | | Add substitutions to email notif FromDavid Baker2016-06-031-1/+1
|/ /
* | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into developErik Johnston2016-06-031-1/+1
|\ \
| * | Bump changelog and versionErik Johnston2016-06-031-1/+1
| | |
| * | Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into ↵Erik Johnston2016-06-031-1/+1
| |\ \ | | | | | | | | | | | | release-v0.16.0
| | * | Bump changelog and version v0.15.0-rc1Erik Johnston2016-04-261-1/+1
| | | |
* | | | Merge pull request #831 from matrix-org/markjh/synchrotronIIMark Haines2016-06-031-0/+510
|\ \ \ \ | | | | | | | | | | Add a separate process that can handle /sync requests
| * | | | Clear the list of ongoing syncs on shutdownMark Haines2016-06-031-0/+9
| | | | |
| * | | | Appease flake8Mark Haines2016-06-031-1/+1
| | | | |
| * | | | Use ClientIpStore to record client ipsMark Haines2016-06-031-3/+4
| | | | |
| * | | | Merge branch 'develop' into markjh/synchrotronIIMark Haines2016-06-0313-115/+187
| |\ \ \ \
| * | | | | Send updates to the syncing users every ten seconds or immediately if ↵Mark Haines2016-06-031-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | they've just come online
| * | | | | Add a separate process that can handle /sync requestsMark Haines2016-06-031-0/+467
| | | | | |
* | | | | | Merge pull request #832 from matrix-org/erikj/presence_coountErik Johnston2016-06-031-5/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Change def of small delta in presence stream. Add metrics.
| * | | | | Change metric styleErik Johnston2016-06-031-5/+4
| | | | | |
| * | | | | Presence metrics. Change def of small deltaErik Johnston2016-06-031-5/+10
| | | | | |
* | | | | | Move insert_client_ip to a separate classMark Haines2016-06-032-45/+71
| |_|/ / / |/| | | |
* | | | | Fix typoErik Johnston2016-06-031-1/+1
|/ / / /
* | | | Merge branch 'develop' into matthew/brand-from-headerMatthew Hodgson2016-06-0334-193/+680
|\ \ \ \
| * \ \ \ Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into developErik Johnston2016-06-032-10/+34
| |\ \ \ \
| | * | | | Pull out update_results_dictErik Johnston2016-06-031-8/+7
| | | | | |
| | * | | | Small optimisation to CacheListDescriptorErik Johnston2016-06-033-14/+21
| | | | | |
| | * | | | Make cachedList go a bit fasterErik Johnston2016-06-032-20/+46
| | | | | |
| * | | | | Merge pull request #830 from matrix-org/erikj/metrics_perfErik Johnston2016-06-037-57/+72
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Change CacheMetrics to be quicker
| | * | | | Change CacheMetrics to be quickerErik Johnston2016-06-037-57/+72
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | We change it so that each cache has an individual CacheMetric, instead of having one global CacheMetric. This means that when a cache tries to increment a counter it does not need to go through so many indirections.
| * | | | Merge pull request #829 from matrix-org/erikj/poke_notifierErik Johnston2016-06-031-4/+7
| |\ \ \ \ | | | | | | | | | | | | Poke notifier on next reactor tick
| | * | | | Poke notifier on next reactor tickErik Johnston2016-06-031-4/+7
| | |/ / /
| * | | | Merge pull request #828 from matrix-org/erikj/joined_hosts_for_roomErik Johnston2016-06-031-16/+3
| |\ \ \ \ | | | | | | | | | | | | Make get_joined_hosts_for_room use get_users_in_room
| | * | | | Make get_joined_hosts_for_room use get_users_in_roomErik Johnston2016-06-031-16/+3
| | |/ / /
| * | | | Merge pull request #827 from matrix-org/markjh/more_slaved_methodsMark Haines2016-06-033-6/+81
| |\ \ \ \ | | | | | | | | | | | | Add methods to events, account data and receipt slaves
| | * | | | Add methods to events, account data and receipt slavesMark Haines2016-06-033-6/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the methods needed by /sync to the slaved events, account data and receipt stores.
| * | | | | Merge pull request #825 from matrix-org/erikj/cache_push_rulesErik Johnston2016-06-036-52/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | Load push rules in storage layer so that they get cached
| | * | | | | Load push rules in storage layer, so that they get cachedErik Johnston2016-06-035-44/+63
| | | | | | |
| | * | | | | Remove unnecessary setsErik Johnston2016-06-031-6/+3
| | | | | | |
| | * | | | | Only get local usersErik Johnston2016-06-032-3/+6
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #824 from matrix-org/markjh/slaved_presence_storeMark Haines2016-06-032-3/+62
| |\ \ \ \ \ | | | | | | | | | | | | | | Add a slaved store for presence
| | * | | | | Add a slaved store for presenceMark Haines2016-06-032-3/+62
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #823 from matrix-org/markjh/more_slaved_storesMark Haines2016-06-034-0/+152
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Add slaved stores for filters, tokens, and push rules
| | * | | | Add a comment explaining why the filter cache doesn't need exipiringMark Haines2016-06-031-0/+1
| | | | | |
| | * | | | Add slaved stores for filters, tokens, and push rulesMark Haines2016-06-034-0/+151
| | |/ / /
| * | | | Merge pull request #811 from matrix-org/erikj/state_users_in_roomErik Johnston2016-06-035-28/+45
| |\ \ \ \ | | | | | | | | | | | | Use state to calculate get_users_in_room
| | * | | | Use state to calculate get_users_in_roomErik Johnston2016-06-015-28/+45
| | | | | |
| * | | | | Merge pull request #809 from matrix-org/erikj/cache_receipts_in_roomErik Johnston2016-06-032-4/+32
| |\| | | | | | |/ / / | |/| | | Add get_users_with_read_receipts_in_room cache
| | * | | Add get_users_with_read_receipts_in_room cacheErik Johnston2016-06-012-4/+32
| | | | |
| * | | | Merge pull request #821 from matrix-org/dbkr/email_unsubscribeDavid Baker2016-06-026-17/+125
| |\ \ \ \ | | | | | | | | | | | | Email unsubscribe links that don't require logging in
| | * | | | peppateDavid Baker2016-06-021-1/+3
| | | | | |
| | * | | | Working unsubscribe links going straight to the HSDavid Baker2016-06-024-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | and authed by macaroons that let you delete pushers and nothing else
| | * | | | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ↵David Baker2016-06-022-29/+37
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | dbkr/email_unsubscribe
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribeDavid Baker2016-06-028-554/+806
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribeDavid Baker2016-06-0212-24/+38
| | |\ \ \ \ \ \
| | * | | | | | | Email unsubscribing that may in theory, workDavid Baker2016-06-023-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Were it not for that fact that you can't use the base handler in the pusher because it pulls in the world. Comitting while I fix that on a different branch.
| | * | | | | | | WIP on unsubscribing email notifs without logging inDavid Baker2016-06-012-10/+70
| | | | | | | | |
| * | | | | | | | Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_errorDavid Baker2016-06-021-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | Fix error in email notification string formatting
| | * | | | | | | Fix error in email notification string formattingDavid Baker2016-06-021-1/+1
| | | | | | | | |
* | | | | | | | | brand the email from headerMatthew Hodgson2016-06-022-2/+9
|/ / / / / / / /
* / / / / / / / add some branding debuggingMatthew Hodgson2016-06-021-0/+1
|/ / / / / / /
* | | / / / / Store the typing users as user_id strings. (#819)Mark Haines2016-06-021-28/+36
| |_|/ / / / |/| | | | | | | | | | | Rather than storing them as UserID objects.
* | | | | | Fix setting the _clock in SQLBaseStoreMark Haines2016-06-021-0/+1
| | | | | |
* | | | | | Deduplicate presence entries in sync (#818)Mark Haines2016-06-021-0/+3
| | | | | |
* | | | | | Allow external processes to mark a user as syncing. (#812)Mark Haines2016-06-023-13/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes
* | | | | | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handlerDavid Baker2016-06-028-13/+17
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Split out the auth handler
| * | | | | Split out the auth handlerDavid Baker2016-06-028-13/+17
| | | | | |
* | | | | | Disable INCLUDE_ALL_UNREAD_NOTIFSErik Johnston2016-06-021-1/+2
| | | | | |
* | | | | | Merge pull request #800 from matrix-org/erikj/sync_refactorErik Johnston2016-06-021-537/+607
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor SyncHandler
| * | | | | | Change short circuit pathErik Johnston2016-05-241-16/+26
| | | | | | |
| * | | | | | Don't send down all ephemeral eventsErik Johnston2016-05-241-1/+3
| | | | | | |
| * | | | | | Only work out newly_joined_users for incremental syncErik Johnston2016-05-241-6/+9
| | | | | | |
| * | | | | | Only include non-offline presence in initial syncErik Johnston2016-05-241-0/+3
| | | | | | |
| * | | | | | Spell builder correctlyErik Johnston2016-05-241-63/+63
| | | | | | |
| * | | | | | Inline function. Make load_filtered_recents privateErik Johnston2016-05-241-17/+7
| | | | | | |
| * | | | | | Add commentsErik Johnston2016-05-241-7/+105
| | | | | | |
| * | | | | | Shuffle things roomErik Johnston2016-05-241-37/+33
| | | | | | |
| * | | | | | Add back concurrently_executeErik Johnston2016-05-231-25/+9
| | | | | | |
| * | | | | | Refactor SyncHandlerErik Johnston2016-05-231-497/+481
| | | | | | |
* | | | | | | Merge pull request #814 from matrix-org/matthew/3pid_invite_authMatthew Hodgson2016-06-021-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | special case m.room.third_party_invite event auth to match invites,
| * | | | | | | special case m.room.third_party_invite event auth to match invites, ↵Matthew Hodgson2016-06-011-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise they get out of sync and you get https://github.com/vector-im/vector-web/issues/1208
* | | | | | | | if an email pusher specifies a brand param, use itMatthew Hodgson2016-06-022-3/+8
| |_|/ / / / / |/| | | | | |
* | | | | | | Use user_id in email greeting if display name is nullDavid Baker2016-06-021-0/+2
|/ / / / / /
* | | | | | Merge pull request #807 from matrix-org/erikj/push_rules_cacheErik Johnston2016-06-011-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ensure we always return boolean in push rules
| * | | | | | Force booleanErik Johnston2016-05-311-1/+2
| | | | | | |
* | | | | | | Merge pull request #806 from matrix-org/erikj/hash_cacheErik Johnston2016-06-011-9/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cache get_event_reference_hashes
| * | | | | | | Cache get_event_reference_hashesErik Johnston2016-05-311-9/+16
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fix room list spideringDavid Baker2016-06-011-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #808 from matrix-org/dbkr/room_list_spiderDavid Baker2016-06-016-3/+151
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add secondary_directory_servers option to fetch room list from other servers
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spiderDavid Baker2016-06-019-48/+58
| |\ \ \ \ \ \
| * | | | | | | pep8David Baker2016-06-011-1/+3
| | | | | | | |
| * | | | | | | Add cache to remote room listsDavid Baker2016-05-311-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Poll for updates from remote servers, waiting for the poll if there's no cache entry.
| * | | | | | | Add vector.im to default secondary_directory_servers and add comment ↵David Baker2016-05-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explaining it's not a permanent solution
| * | | | | | | Apparently I am not permitted to have two blank lines hereDavid Baker2016-05-311-1/+0
| | | | | | | |
| * | | | | | | Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-315-3/+68
| | | | | | | |
| * | | | | | | Fix c+p failDavid Baker2016-05-311-17/+0
| | | | | | | |
| * | | | | | | Add federation room list servletDavid Baker2016-05-312-1/+70
| | | | | | | |
* | | | | | | | Limit number of notifications in an email notificationDavid Baker2016-06-011-2/+4
| |/ / / / / / |/| | | | | |
* | | | | | | Fix synapse/storage/schema/delta/30/as_users.pyMark Haines2016-05-311-2/+2
| | | | | | |
* | | | | | | Merge pull request #805 from matrix-org/erikj/push_rules_cacheErik Johnston2016-05-311-2/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Fix GET /push_rules
| * | | | | | Fix typoErik Johnston2016-05-311-1/+1
| | | | | | |
| * | | | | | Change fixErik Johnston2016-05-312-5/+8
| | | | | | |
| * | | | | | Fix GET /push_rulesErik Johnston2016-05-311-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #804 from matrix-org/erikj/push_rules_cacheErik Johnston2016-05-312-9/+15
|\| | | | | | | | | | | | | | | | | Add caches to bulk_get_push_rules*
| * | | | | Add caches to bulk_get_push_rules*Erik Johnston2016-05-312-9/+15
| | | | | |
* | | | | | Move the AS handler out of the Handlers object.Mark Haines2016-05-316-35/+33
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Access it directly from the homeserver itself. It already wasn't inheriting from BaseHandler storing it on the Handlers object was already somewhat dubious.
* | | | | Split out the room list handlerDavid Baker2016-05-313-3/+7
| | | | | | | | | | | | | | | | | | | | So I can use it from federation bits without pulling in all the handlers.
* | | | | Fix to allow start with postgresErik Johnston2016-05-271-2/+7
| | | | |
* | | | | Send down correct error response if user not foundErik Johnston2016-05-271-2/+7
| | | | |
* | | | | Merge pull request #795 from matrix-org/dbkr/delete_push_actions_after_a_monthDavid Baker2016-05-244-7/+94
|\ \ \ \ \ | |/ / / / |/| | | | Only delete push actions after 30 days
| * | | | Remove debug loggingDavid Baker2016-05-231-1/+0
| | | | |
| * | | | Oops, missing commaDavid Baker2016-05-201-1/+1
| | | | |
| * | | | Remove stale lineDavid Baker2016-05-201-2/+0
| | | | |
| * | | | Handle empty events tableDavid Baker2016-05-201-0/+3
| | | | |
| * | | | Make deleting push actions more efficientDavid Baker2016-05-203-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 daysDavid Baker2016-05-202-6/+38
| |/ / /
* | | | Check for presence of 'avatar_url' keyDavid Baker2016-05-241-1/+3
| | | |
* | | | Merge pull request #799 from matrix-org/matthew/quieter-email-notifsDavid Baker2016-05-243-23/+72
|\ \ \ \ | | | | | | | | | | Tune email notifs to make them quieter:
| * | | | catch thinko in presentable namesMatthew Hodgson2016-05-231-4/+15
| | | | |
| * | | | fix NPE in room orderingMatthew Hodgson2016-05-231-2/+2
| | | | |
| * | | | consistency is the better part of valourMatthew Hodgson2016-05-231-1/+1
| | | | |
| * | | | Tune email notifs to make them quieter:Matthew Hodgson2016-05-232-18/+56
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * After initial 10 minute window, only alert every 24h for room notifs * Reset room state after 6h of idleness * Synchronise throttles for messages sent in the same notif, so the 24 hourly notifs 'line up' * Fix the email subjects to say what triggered the notification * Order the rooms in reverse activity order in the email, so the 'reason' room should always come first
* / / / Fix set profile error with Requester.Negi Fazeli2016-05-231-4/+5
|/ / / | | | | | | | | | | | | Replace flush_user with delete access token due to function removal Add a new test case for if the user is already registered
* | | Allow clients to specify a server_name to avoid 'No known servers'Kegan Dougal2016-05-191-1/+4
| | | | | | | | | | | | Multiple server_names are supported via ?server_name=foo&server_name=bar
* | | Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convoMatthew Hodgson2016-05-181-1/+3
|\ \ \ | | | | | | | | increment badge count per missed convo, not per msg
| * | | increment badge count per missed convo, not per msgMatthew Hodgson2016-05-181-1/+3
| | | |
* | | | Add desc to get_presence_for_usersErik Johnston2016-05-181-0/+1
| | | |
* | | | Move typing handler out of the Handlers objectMark Haines2016-05-175-25/+24
| | | |
* | | | Move the functions for parsing app service configMark Haines2016-05-172-103/+109
| | | |
* | | | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handlerMark Haines2016-05-175-25/+45
|\ \ \ \
| * | | | Merge pull request #786 from matrix-org/matthew/email_notifs_tuningMatthew Hodgson2016-05-172-9/+30
| |\| | | | | | | | | | | | | tune email notifs, fix CSS a bit, and add debugging details
| | * | | tune email notifs, fix CSS a bit, and add debugging detailsMatthew Hodgson2016-05-162-9/+30
| | | | |
| * | | | Remove unused get_joined_rooms_for_userMark Haines2016-05-171-15/+0
| | | | |
| * | | | Merge branch 'develop' into markjh/member_cleanupMark Haines2016-05-1713-36/+63
| |\ \ \ \
| | * \ \ \ Merge pull request #787 from matrix-org/markjh/liberate_presence_handlerMark Haines2016-05-1711-35/+48
| | |\ \ \ \ | | | | | | | | | | | | | | Move the presence handler out of the Handlers object
| | * \ \ \ \ Merge pull request #788 from matrix-org/markjh/domianMark Haines2016-05-176-19/+19
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Spell "domain" correctly
| | * | | | | | Fix emailpusher importDavid Baker2016-05-161-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try importing at the root level rather than conditionally importing, as per comment
| | * | | | | | os.environ requires a stringErik Johnston2016-05-161-1/+1
| | | | | | | |
| | * | | | | | Merge pull request #785 from matrix-org/erikj/cache_factor_synctlyErik Johnston2016-05-161-0/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make synctl read a cache factor from config file
| | | * | | | | | Make synctl read a cache factor from config fileErik Johnston2016-05-161-0/+4
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | Move SyncHandler out of the Handlers objectMark Haines2016-05-164-9/+11
| | | | | | | |
* | | | | | | | Merge branch 'markjh/liberate_presence_handler' into ↵Mark Haines2016-05-1611-35/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | markjh/liberate_sync_handler
| * | | | | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ↵Mark Haines2016-05-161-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | from presence handler
| * | | | | | Move the presence handler out of the Handlers objectMark Haines2016-05-1611-17/+28
| |/ / / / /
* | | | | | Remove get_joined_rooms_for_user from RoomMemberHandlerMark Haines2016-05-163-11/+4
| | | | | |
* | | | | | get_room_members is unused nowMark Haines2016-05-161-18/+0
| | | | | |
* | | | | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_roomMark Haines2016-05-163-67/+27
| |_|/ / / |/| | | |
* | | | | Spell "domain" correctlyMark Haines2016-05-166-19/+19
|/ / / / | | | | | | | | | | | | s/domian/domain/g
* | | | Clean up the blacklist/whitelist handling.Mark Haines2016-05-163-41/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Always set the config key with an empty list, even if a list isn't specified. This means that the codepaths are the same for both the empty list and for a missing key. Since the behaviour is the same for both cases this makes the code somewhat easier to reason about.
* | | | Merge branch 'develop' into matthew/preview_url_ip_whitelistMark Haines2016-05-1660-538/+2651
|\| | |
| * | | fix matrix.to URLsMatthew Hodgson2016-05-131-2/+2
| | | |
| * | | Assert that stream replicated stream positions are intsMark Haines2016-05-133-7/+7
| | | |
| * | | Manually expire broken caches like the who_forgot_in_roomMark Haines2016-05-131-0/+16
| | | |
| * | | Use the SlavedAccountDataStoreMark Haines2016-05-131-10/+3
| | | |
| * | | Merge branch 'develop' into dbkr/email_notifs_on_pusherMark Haines2016-05-1314-21/+293
| |\ \ \
| | * \ \ Merge pull request #783 from matrix-org/markjh/slave_account_dataMark Haines2016-05-131-0/+61
| | |\ \ \ | | | | | | | | | | | | Add a slaved datastore for account data
| | | * | | Add a slaved datastore for account dataMark Haines2016-05-131-0/+61
| | | | | |
| | * | | | Allow receipts for events we haven't seen in the dbMark Haines2016-05-131-4/+6
| | | | | |
| | * | | | Merge pull request #741 from negzi/create_user_with_expiryErik Johnston2016-05-136-3/+139
| | |\ \ \ \ | | | | | | | | | | | | | | Create user with expiry
| | | * | | | Create user with expiryNegi Fazeli2016-05-136-3/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
| | * | | | | Merge pull request #778 from matrix-org/erikj/add_pusherErik Johnston2016-05-132-4/+17
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fixup add_pusher
| | | * | | | | SpellingErik Johnston2016-05-131-1/+1
| | | | | | | |
| | | * | | | | Fixup add_pusherErik Johnston2016-05-132-4/+17
| | | | | | | |
| | * | | | | | Merge pull request #769 from matrix-org/erikj/push_actions_deleteErik Johnston2016-05-132-9/+29
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Delete old pushers
| | | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2016-05-0614-49/+423
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | erikj/push_actions_delete
| | | * | | | | | Delete old pushersErik Johnston2016-05-032-9/+29
| | | | | | | | |
| | * | | | | | | Merge pull request #779 from matrix-org/erikj/receiptsErik Johnston2016-05-131-3/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use tree cache for get_linearized_receipts_for_room
| | | * | | | | | | Use tree cache for get_linearized_receipts_for_roomErik Johnston2016-05-131-3/+3
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Remove topics tableErik Johnston2016-05-131-1/+0
| | | | | | | | |
| | * | | | | | | Annotate the removed indicies with why they were removed.Mark Haines2016-05-131-18/+15
| | | | | | | | |
| | * | | | | | | Remove unused indicesErik Johnston2016-05-131-0/+42
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes removing both unused indices and indices that are subsets of other indices.
| | * | | | | | Merge pull request #781 from matrix-org/markjh/replication_problemsMark Haines2016-05-132-1/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix a bug in replication that was causing the pusher to tight loop
| | | * | | | | | Log the stream IDs in an order that makes senseMark Haines2016-05-131-1/+1
| | | | | | | | |
| | | * | | | | | Make sure we advance our stream positionMark Haines2016-05-131-0/+2
| | | |/ / / / /
| * | | | | | | Shift some of the state_group methods into the SlavedEventStoreMark Haines2016-05-132-45/+19
| | | | | | | |
| * | | | | | | Make email notifs work on the pusher synapseDavid Baker2016-05-132-0/+48
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Plus general bugfix to email notif code
| * | | | | | missed a spotMark Haines2016-05-121-1/+1
| | | | | | |
| * | | | | | move filter_events_for_client out of base handlerMark Haines2016-05-1110-214/+251
| |/ / / / /
| * | | | | Shuffle when we get the signing_key attribute.Mark Haines2016-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait until we sign a message to get the signing key from the homeserver config. This means that the message handler can be created without having a signing key in the config which means that separate processes like the pusher that don't send messages and don't need to sign them can still access the handlers.
| * | | | | Merge pull request #775 from matrix-org/erikj/password_hashErik Johnston2016-05-111-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Correctly handle NULL password hashes from the database
| | * | | | | Correctly handle NULL password hashes from the databaseErik Johnston2016-05-111-1/+4
| | | |_|/ / | | |/| | |
| * | | | | Fix typoMark Haines2016-05-111-1/+1
| | | | | |
| * | | | | Move _create_new_client_event and handle_new_client_event out of base handlerMark Haines2016-05-114-204/+214
| |/ / / /
| * | | | Pass through _get_state_group_for_eventsDavid Baker2016-05-101-0/+4
| | | | |
| * | | | StateStore, not EventsStoreDavid Baker2016-05-101-2/+2
| | | | |
| * | | | Cached functions must be accessed through the dictDavid Baker2016-05-101-1/+2
| | | | |
| * | | | Pass though _get_state_group_for_eventsDavid Baker2016-05-101-0/+4
| | | | |
| * | | | Pass through get_state_groupsDavid Baker2016-05-101-0/+4
| | | | |
| * | | | Also pass through get_profile_displaynameDavid Baker2016-05-101-0/+4
| | | | |
| * | | | Uncommit accidentally commited edit to cipher listDavid Baker2016-05-101-1/+1
| | | | |
| * | | | Pass through get_events to pusher tooDavid Baker2016-05-101-0/+1
| | | | |
| * | | | Pass through _get_event_txnDavid Baker2016-05-102-1/+2
| | | | |
| * | | | unbreak schemaMatrix2016-05-102-0/+0
| | | | |
| * | | | Merge pull request #759 from matrix-org/dbkr/email_notifsMatthew Hodgson2016-05-1022-34/+1170
| |\ \ \ \ | | | | | | | | | | | | Send email notifications for missed messages
| | * \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-05-1022-88/+609
| | |\ \ \ \
| | * | | | | More consistent config namingDavid Baker2016-05-102-2/+2
| | | | | | |
| | * | | | | Add config option to not send email notifs for new usersDavid Baker2016-05-102-1/+8
| | | | | | |
| | * | | | | Make pep8 happyDavid Baker2016-05-101-1/+1
| | | | | | |
| | * | | | | Switch from CSS to Table layout for HTML mails so they work in Outlook ↵Matthew Hodgson2016-05-101-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aka Word Remove templates-vector and theme templates with variables instead Switch to matrix.to URLs by default for links
| | * | | | | better mail subject linesMatthew Hodgson2016-05-051-1/+1
| | | | | | |
| | * | | | | fix layout; handle app naming in synapse, not jinjaMatthew Hodgson2016-05-052-16/+36
| | | | | | |
| | * | | | | pep8Matthew Hodgson2016-05-051-2/+4
| | | | | | |
| | * | | | | handle fragments correctly on mxc URLs.Matthew Hodgson2016-05-051-14/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch to vector.im permalinks as matrix.to isn't ready yet. merge overlapping notifications together. give one message of context after a notification (in the unlikely event it exists, but it's possible thanks to throttling). include name of app in mail templates
| | * | | | | spell out emailpusher full pathMatthew Hodgson2016-05-051-1/+1
| | | | | | |
| | * | | | | Include no contextDavid Baker2016-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | until we can de-dup between the context and other notifs
| | * | | | | Add date header & message idDavid Baker2016-05-042-1/+4
| | | | | | |
| | * | | | | Correct SQL statement for postgresDavid Baker2016-05-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In standard sql, join binds tighter than comma, so we were joining on the wrong table. Postgres follows the standard (apparently).
| | * | | | | Add db functions used for email to the pusher appDavid Baker2016-05-041-0/+12
| | | | | | |
| | * | | | | pep8David Baker2016-05-041-0/+1
| | | | | | |
| | * | | | | copyrightMatthew Hodgson2016-05-041-0/+22
| | | | | | |
| | * | | | | fix assorted typos in default configMatthew Hodgson2016-05-041-3/+3
| | | | | | |
| | * | | | | Unused importDavid Baker2016-05-041-1/+0
| | | | | | |
| | * | | | | Catch all exceptions when creating a pusherDavid Baker2016-05-041-2/+2
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-291-0/+1
| | |\ \ \ \ \
| | * | | | | | Add constant for throttle multiplierDavid Baker2016-04-291-1/+2
| | | | | | | |
| | * | | | | | Remove unused functionDavid Baker2016-04-292-26/+0
| | | | | | | |
| | * | | | | | Remove unused argDavid Baker2016-04-291-2/+2
| | | | | | | |
| | * | | | | | DocstringDavid Baker2016-04-291-0/+14
| | | | | | | |
| | * | | | | | Use explicit joinDavid Baker2016-04-291-3/+3
| | | | | | | |
| | * | | | | | Oops, actually specify the user idDavid Baker2016-04-291-1/+3
| | | | | | | |
| | * | | | | | Remove unnecessary ifDavid Baker2016-04-291-1/+1
| | | | | | | |