Matthew Hodgson
f84b89f0c6
if an email pusher specifies a brand param, use it
2016-06-02 13:29:48 +01:00
Erik Johnston
6de4d824e3
Poke notifier on next reactor tick
2016-06-02 13:03:34 +01:00
Erik Johnston
98fdc155c8
Make get_joined_hosts_for_room use get_users_in_room
2016-06-02 12:47:06 +01:00
Erik Johnston
105f17ff4a
Small optimisation to CacheListDescriptor
2016-06-02 11:52:32 +01:00
David Baker
a15ad60849
Email unsubscribing that may in theory, work
...
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.
2016-06-02 11:44:15 +01:00
Erik Johnston
266eb3bf26
Change CacheMetrics to be quicker
...
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.
2016-06-02 11:37:50 +01:00
David Baker
07233a1ec8
Merge pull request #815 from matrix-org/dbkr/email_greeting_not_none
...
Use user_id in email greeting if display name is null
2016-06-02 09:52:19 +01:00
David Baker
e793866398
Use user_id in email greeting if display name is null
2016-06-02 09:41:13 +01:00
Matthew Hodgson
aaa70e26a2
special case m.room.third_party_invite event auth to match invites, otherwise they get out of sync and you get https://github.com/vector-im/vector-web/issues/1208
2016-06-01 22:13:47 +01:00
Erik Johnston
a04a2d043c
Merge pull request #807 from matrix-org/erikj/push_rules_cache
...
Ensure we always return boolean in push rules
2016-06-01 18:07:48 +01:00
Erik Johnston
0f06b496d1
Merge pull request #806 from matrix-org/erikj/hash_cache
...
Cache get_event_reference_hashes
2016-06-01 18:07:42 +01:00
Erik Johnston
9e54d865e6
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings
2016-06-01 18:02:43 +01:00
Erik Johnston
83b70c9f63
Merge pull request #813 from matrix-org/dbkr/fix_room_list_spidering
...
Fix room list spidering
2016-06-01 18:02:27 +01:00
Erik Johnston
de580a94b5
Make cachedList go a bit faster
2016-06-01 18:01:22 +01:00
David Baker
e0deeff23e
Fix room list spidering
2016-06-01 17:58:58 +01:00
David Baker
991af8b0d6
WIP on unsubscribing email notifs without logging in
2016-06-01 17:40:52 +01:00
Erik Johnston
025458363f
Remove unneeded timing log lines
2016-06-01 17:33:55 +01:00
Erik Johnston
40c5fffba1
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings
2016-06-01 16:46:46 +01:00
Erik Johnston
52e6bdecb4
Remove unnecessary sets
2016-06-01 15:45:37 +01:00
Erik Johnston
f4407484aa
Merge branch 'erikj/state_users_in_room' of github.com:matrix-org/synapse into erikj/timings
2016-06-01 15:37:04 +01:00
David Baker
00c487a8db
Merge pull request #808 from matrix-org/dbkr/room_list_spider
...
Add secondary_directory_servers option to fetch room list from other servers
2016-06-01 15:32:52 +01:00
Erik Johnston
c8285564a3
Use state to calculate get_users_in_room
2016-06-01 15:25:25 +01:00
Erik Johnston
9cd40a2f8d
Load push rules in storage layer, so that they get cached
2016-06-01 14:27:07 +01:00
David Baker
1db79d6192
Merge pull request #810 from matrix-org/dbkr/limit_email_notifs
...
Limit number of notifications in an email notification
2016-06-01 12:49:22 +01:00
David Baker
d60eed0710
Limit number of notifications in an email notification
2016-06-01 11:45:43 +01:00
Erik Johnston
6e5fb82bc3
Only get local users
2016-06-01 11:34:06 +01:00
Erik Johnston
aa54bbe250
Up max_etnries
2016-06-01 11:23:48 +01:00
Erik Johnston
1b4fc178aa
Up max_etnries
2016-06-01 11:20:11 +01:00
David Baker
195254cae8
Inject fake room list handler in tests
...
Otherwise it tries to start the remote public room list updating looping call which breaks.
2016-06-01 11:14:16 +01:00
Erik Johnston
0417a8607b
Use state to calculate get_users_in_room
2016-06-01 11:13:08 +01:00
Erik Johnston
143ff10212
Merge branch 'erikj/cache_receipts_in_room' of github.com:matrix-org/synapse into erikj/timings
2016-06-01 11:08:45 +01:00
Erik Johnston
43db0d9f6a
Add get_users_with_read_receipts_in_room cache
2016-06-01 10:54:32 +01:00
Erik Johnston
7b4f8c527c
Add get_users_with_read_receipts_in_room cache
2016-06-01 10:33:39 +01:00
David Baker
8e539f13c0
Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spider
2016-06-01 09:54:36 +01:00
David Baker
6ecb2ca4ec
pep8
2016-06-01 09:48:55 +01:00
Matthew Hodgson
58ee43d020
handle emotes & notices correctly in email notifs
2016-05-31 20:28:42 +01:00
David Baker
2a449fec4d
Add cache to remote room lists
...
Poll for updates from remote servers, waiting for the poll if there's no cache entry.
2016-05-31 18:27:23 +01:00
David Baker
6ca4d3ae9a
Add vector.im to default secondary_directory_servers and add comment explaining it's not a permanent solution
2016-05-31 17:24:50 +01:00
Erik Johnston
219923eaad
Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings
2016-05-31 17:24:42 +01:00
Erik Johnston
dea9f20f8c
Force boolean
2016-05-31 17:24:30 +01:00
David Baker
963e3ed282
Apparently I am not permitted to have two blank lines here
2016-05-31 17:22:53 +01:00
David Baker
d240796ded
Basic, un-cached support for secondary_directory_servers
2016-05-31 17:20:07 +01:00
Mark Haines
c8c5bf950a
Fix synapse/storage/schema/delta/30/as_users.py
2016-05-31 17:10:40 +01:00
Erik Johnston
c9ca285d33
Merge pull request #805 from matrix-org/erikj/push_rules_cache
...
Fix GET /push_rules
2016-05-31 16:42:21 +01:00
Erik Johnston
fd3108fda6
Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings
2016-05-31 15:46:24 +01:00
Erik Johnston
1d4ee854e2
Fix typo
2016-05-31 15:45:53 +01:00
Erik Johnston
09970a70e1
Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings
2016-05-31 15:44:37 +01:00
Erik Johnston
cca0093fa9
Change fix
2016-05-31 15:44:08 +01:00
Erik Johnston
892a15190a
Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into erikj/timings
2016-05-31 15:38:12 +01:00
Erik Johnston
4efa389299
Fix GET /push_rules
2016-05-31 15:37:53 +01:00