421fdf7460
Speed up filtering of a single event in push
2017-04-28 09:52:36 +01:00
acb58bfb6a
fix up
2017-04-25 15:39:19 +01:00
f7181615f2
Don't specify default as dict
2017-04-25 15:22:59 +01:00
d9aa645f86
Reduce size of joined_user cache
...
The _get_joined_users_from_context cache stores a mapping from user_id
to avatar_url and display_name. Instead of storing those in a dict,
store them in a namedtuple as that uses much less memory.
We also try converting the string to ascii to further reduce the size.
2017-04-25 14:38:51 +01:00
5058292537
Support authenticated SMTP
...
Closes (SYN-714) #1385
Signed-off-by: Daniel Dent <matrixcontrib@contactdaniel.net>
2017-04-05 21:01:08 -07:00
9cee0ce7db
Merge pull request #2075 from matrix-org/erikj/cache_speed
...
Speed up cached function access
2017-03-31 10:10:56 +01:00
86780a8bc3
Don't convert to deferreds when not necessary
2017-03-30 14:14:36 +01:00
a3810136fe
Cache glob to regex at a higher level for push
2017-03-29 15:53:14 +01:00
6957bfdca6
Don't recreate so many sets
2017-03-16 11:54:26 +00:00
8ffbe43ba1
Get current state by using current_state_events table
2017-03-10 17:39:35 +00:00
7455ba436a
Ensure we pass positive ints to delay function
2017-02-22 12:08:14 +00:00
51adaac953
Fix email push in pusher worker
...
This was broken when device list updates were implemented, as Mailer
could no longer instantiate an AuthHandler due to a dependency on
federation sending.
2017-02-02 10:53:36 +00:00
97d3918377
Merge pull request #1811 from aperezdc/unhardcode-riot-urls
...
Allow configuring the Riot URL used in notification emails
2017-01-18 14:38:49 +00:00
04006bb7f0
Get state at event rather than for room in push
2017-01-17 14:31:21 +00:00
a3e4a198e3
Allow configuring the Riot URL used in notification emails
...
The URLs used for notification emails were hardcoded to use either matrix.to
or vector.im; but for self-hosted setups where Riot is also self-hosted it
may be desirable to allow configuring an alternative Riot URL.
Fixes #1809 .
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
2017-01-13 17:12:04 +02:00
52d12ca782
Add /room/<room_id>/joined_members API
...
This returns the currently joined members in the room with their display
names and avatar urls. This is more efficient than /members for large
rooms where you don't need the full events.
2016-12-08 13:32:07 +00:00
8ca05b5755
Fix push notifications for a single unread message
2016-10-18 10:57:33 +01:00
f0ca088280
Reduce redundant database work in email pusher
...
Update the last stream ordering if the
`get_unread_push_actions_for_user_in_range_for_email` returns no new
push actions. This reduces the range that it needs to check next
iteration.
2016-10-18 10:52:47 +01:00
1d107d8484
Fix email push notifs being dropped
...
A lot of email push notifications were failing to be sent due to an
exception being thrown along one of the (many) paths. This was due to a
change where we moved from pulling out the full state for each room, but
rather pulled out the event ids for the state and separately loaded the
full events when needed.
2016-10-13 13:40:38 +01:00
49cf205dc7
_id field must uniquely identify different conditions
2016-09-19 10:34:01 +01:00
3f6ec271ba
proposal for notifying on e2e events
2016-09-17 22:05:06 +01:00
6a5ded5988
Ensure we don't mutate the cache of push rules
2016-09-15 09:16:13 +01:00
3847fa38c4
Make bulk_get_push_rules_for_room use get_joined_users_from_context cache
2016-09-05 10:02:38 +01:00
44982606ee
Merge pull request #1060 from matrix-org/erikj/state_ids
...
Assign state groups in state handler.
2016-09-01 14:20:42 +01:00
c10cb581c6
Correctly handle the difference between prev and current state
2016-08-31 14:26:22 +01:00
d80f64d370
Fix email notifs by adding missing param
2016-08-30 21:46:39 +01:00
55e17d3697
Fix push room names for rooms with only an alias
2016-08-30 11:19:59 +01:00
bed10f9880
Use state handler instead of get_users_in_room/get_joined_hosts
2016-08-26 14:54:30 +01:00
a234e895cf
Fix room name in email notifs
2016-08-26 14:10:21 +01:00
c7cd35d682
Typo
2016-08-26 11:23:58 +01:00
7356d52e73
Fix up push to use get_current_state_ids
2016-08-25 18:35:49 +01:00
a3dc1e9cbe
Replace context.current_state with context.current_state_ids
2016-08-25 17:32:22 +01:00
9219139351
Preserve some logcontexts
2016-08-24 11:58:40 +01:00
f164fd9220
Move _bulk_get_push_rules_for_room to storage layer
2016-08-19 14:29:20 +01:00
abcb9aee5b
Make push Measure finer grained
2016-08-17 18:00:18 +01:00
0bba2799b6
Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override
2016-08-16 16:46:37 +01:00
1594eba29e
s/underride/override/ in the rule_id too
2016-08-16 16:44:07 +01:00
1c7c317df1
Move display name rule
...
As per https://github.com/matrix-org/matrix-doc/pull/373 and comment
2016-08-15 18:34:53 +01:00
dc3a00f24f
Refactor user_delete_access_tokens. Invalidate get_user_by_access_token to slaves.
2016-08-15 17:04:39 +01:00
b260f92936
Ignore AlreadyCalled errors on timer cancel
2016-07-31 16:00:12 +01:00
0a7d3cd00f
Create separate methods for getting messages to push
...
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.
2016-07-28 20:24:24 +01:00
ecd5e6bfa4
Typo
2016-07-28 10:04:52 +01:00
0b640aa56b
even more pep8
2016-06-24 11:47:11 +01:00
870c45913e
Use similar naming we use in email notifs for push
...
Fixes https://github.com/vector-im/vector-web/issues/1654
2016-06-24 11:41:11 +01:00
ded01c3bf6
Fix ``KeyError: 'msgtype'``. Use ``.get``
...
Fixes a key error where the mailer tried to get the ``msgtype`` of an
event that was missing a ``msgtype``.
```
File "synapse/push/mailer.py", line 264, in get_notif_vars
File "synapse/push/mailer.py", line 285, in get_message_vars
File ".../frozendict/__init__.py", line 10, in __getitem__
return self.__dict[key]
KeyError: 'msgtype'
```
2016-06-17 13:49:16 +01:00
0b2158719c
Remove dead code.
...
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.
2016-06-07 15:07:11 +01:00
72c4d482e9
3rd time lucky: we'd already calculated it above
2016-06-03 16:39:50 +01:00
fbf608decb
Oops, we're using the dict form
2016-06-03 16:38:39 +01:00
06d40c8b98
Add substitutions to email notif From
2016-06-03 16:31:23 +01:00
8d740132f4
Merge branch 'develop' into matthew/brand-from-header
2016-06-03 12:14:18 +01:00
6a0afa582a
Load push rules in storage layer, so that they get cached
2016-06-03 11:10:00 +01:00
59f2d73522
Remove unnecessary sets
2016-06-03 11:05:45 +01:00
9c26b390a2
Only get local users
2016-06-03 11:04:31 +01:00
065e739d6e
Merge pull request #811 from matrix-org/erikj/state_users_in_room
...
Use state to calculate get_users_in_room
2016-06-03 10:58:27 +01:00
696d7c5937
Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room
...
Add get_users_with_read_receipts_in_room cache
2016-06-03 10:58:24 +01:00
79d1f072f4
brand the email from header
2016-06-02 21:34:40 +01:00
6bb9aacf9d
Merge pull request #821 from matrix-org/dbkr/email_unsubscribe
...
Email unsubscribe links that don't require logging in
2016-06-02 17:44:55 +01:00
745ddb4dd0
peppate
2016-06-02 17:38:41 +01:00
7a5a5f2df2
Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_error
...
Fix error in email notification string formatting
2016-06-02 17:26:06 +01:00
1f31cc37f8
Working unsubscribe links going straight to the HS
...
and authed by macaroons that let you delete pushers and nothing else
2016-06-02 17:21:31 +01:00
2675c1e40e
add some branding debugging
2016-06-02 17:21:12 +01:00
c71177f285
Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into dbkr/email_unsubscribe
2016-06-02 17:20:56 +01:00
07a5559916
Fix error in email notification string formatting
2016-06-02 17:17:16 +01:00
812b5de0fe
Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe
2016-06-02 15:33:28 +01:00
356f13c069
Disable INCLUDE_ALL_UNREAD_NOTIFS
2016-06-02 14:07:38 +01:00
3a3fb2f6f9
Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe
2016-06-02 13:35:25 +01:00
f84b89f0c6
if an email pusher specifies a brand param, use it
2016-06-02 13:29:48 +01:00
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
e793866398
Use user_id in email greeting if display name is null
2016-06-02 09:41:13 +01:00
c8285564a3
Use state to calculate get_users_in_room
2016-06-01 15:25:25 +01:00
43db0d9f6a
Add get_users_with_read_receipts_in_room cache
2016-06-01 10:54:32 +01:00
e5b0bbcd33
Add caches to bulk_get_push_rules*
2016-05-31 13:46:58 +01:00
b007ee4606
Check for presence of 'avatar_url' key
2016-05-24 15:12:05 +01:00
cb8a321bdd
fix NPE in room ordering
2016-05-23 22:54:56 +01:00
88ea5ab2c3
consistency is the better part of valour
2016-05-23 19:33:45 +01:00
989bdc9e56
Tune email notifs to make them quieter:
...
* 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
2016-05-23 19:24:11 +01:00
6fb51eaf7b
Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convo
...
increment badge count per missed convo, not per msg
2016-05-18 13:56:38 +01:00
e837df6adb
increment badge count per missed convo, not per msg
2016-05-18 11:53:25 +01:00
43e1e0489c
Merge pull request #786 from matrix-org/matthew/email_notifs_tuning
...
tune email notifs, fix CSS a bit, and add debugging details
2016-05-17 10:43:24 +01:00
cbd2adc95e
tune email notifs, fix CSS a bit, and add debugging details
2016-05-16 18:58:38 +01:00
647781ca56
Fix emailpusher import
...
Try importing at the root level rather than conditionally importing, as per comment
2016-05-16 18:41:32 +01:00
782471b7e1
fix matrix.to URLs
2016-05-13 17:50:16 +01:00
b5e646a18c
Make email notifs work on the pusher synapse
...
Plus general bugfix to email notif code
2016-05-13 11:36:50 +01:00
7e23476814
move filter_events_for_client out of base handler
2016-05-11 13:42:37 +01:00
e04b1d6b0a
Make pep8 happy
2016-05-10 14:23:16 +02:00
5599608887
Switch from CSS to Table layout for HTML mails so they work in Outlook aka Word
...
Remove templates-vector and theme templates with variables instead
Switch to matrix.to URLs by default for links
2016-05-10 00:14:48 +02:00
53ca739f1f
better mail subject lines
2016-05-05 15:55:44 +01:00
81c2176cba
fix layout; handle app naming in synapse, not jinja
2016-05-05 15:54:29 +01:00
634efb65f1
pep8
2016-05-05 02:10:57 +01:00
ce81ccb063
handle fragments correctly on mxc URLs.
...
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
2016-05-05 02:00:33 +01:00
1cf5c379cb
spell out emailpusher full path
2016-05-05 01:59:39 +01:00
39d0a99972
Include no context
...
until we can de-dup between the context and other notifs
2016-05-04 14:52:49 +01:00
9ef05a12c3
Add date header & message id
2016-05-04 14:52:10 +01:00
de22001ab5
pep8
2016-05-04 11:41:35 +01:00
f1026418ea
copyright
2016-05-04 11:38:01 +01:00
e6bffa4475
Unused import
2016-05-04 11:26:58 +01:00
92f0f3d21d
Catch all exceptions when creating a pusher
2016-05-04 11:24:07 +01:00
b084e4d963
Add constant for throttle multiplier
2016-04-29 20:14:55 +01:00
35b7b8e4bc
Remove unused function
2016-04-29 20:10:34 +01:00
6b9b6a9169
Remove unused arg
2016-04-29 20:02:52 +01:00
e7a76b5123
Use the constant
2016-04-29 19:10:45 +01:00
29c8cf8db8
Avoid `vars` builtin
2016-04-29 19:09:28 +01:00
d3da5294e8
Use named parameter format
2016-04-29 19:04:40 +01:00
311b5ce051
pep8
2016-04-29 14:37:30 +01:00
3facde2536
Remove rather pointless get function
2016-04-29 14:36:45 +01:00
4364ea1272
Stop processing notifs once we've sent a mail
2016-04-29 14:31:27 +01:00
40d40e470d
Send mail notifs with a plaintext part too
2016-04-29 13:56:21 +01:00
b2c04da8dc
Add an email pusher for new users
...
If they registered with an email address and email notifs are enabled on the HS
2016-04-29 11:43:57 +01:00
acded821c4
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-29 10:05:20 +01:00
e800ee2f63
May as well always include room link
2016-04-28 17:28:27 +01:00
cc0874cf71
Put back real delay before mailing
2016-04-28 17:00:40 +01:00
68f8fc2f14
Support file messages & fix plain text
2016-04-28 16:59:57 +01:00
4845c7359d
Support image notifs
2016-04-28 15:55:53 +01:00
60f86fc876
pep8
2016-04-28 15:16:30 +01:00
937c407eef
Only import email pusher if email notifs are on
2016-04-28 15:12:14 +01:00
ebbabc4986
Handle room invites in email notifs
2016-04-28 11:49:36 +01:00
9dba1b668c
Linkify plain text messages too
2016-04-28 10:55:08 +01:00
424a7f48f8
Run filter_events_for_client
...
so we don't accidentally mail out events people shouldn't see
2016-04-27 17:50:49 +01:00
4ed1e45869
Make html messages work
2016-04-27 17:18:51 +01:00
8781083960
Better grammar for multiple messages in a room
...
Say who the messages are from if there's no room name, otherwise it's a bit nonsensical
2016-04-27 15:30:41 +01:00
fa12209c1b
Hopefully all remaining bits for email notifs
...
Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails
2016-04-27 15:09:55 +01:00
7b4715bad7
More variable calculation for email notifs
...
Include name of the person we're sending to and add summary text at the top giving an overview of what's happened.
2016-04-25 18:27:04 +01:00
bd0f9c2065
Actually do UTF8 correctly
2016-04-22 18:42:00 +01:00
83bf65297a
Mime part is binary so encode it first.
...
Doesn't get character enocind right yet but makes it not error.
2016-04-22 18:31:47 +01:00
c553797c4f
No inlineCallbacks necessary on this
2016-04-22 17:27:54 +01:00
c10ed26c30
Flesh out email templating
...
Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients.
2016-04-21 19:19:07 +01:00
a3ac837599
Optionally split out the pushers into a separate process
2016-04-21 17:22:37 +01:00
2ed0adb075
Generate mails from a template
2016-04-20 18:35:29 +01:00
05adc6c2de
more pep8
2016-04-20 13:02:45 +01:00
f63bd4ff47
Send a rather basic email notif
...
Also pep8 fixes
2016-04-20 13:02:01 +01:00
e2a01455af
Add single instance & logging stuff
...
Copy the stuff over from http pusher that prevents multiple instances of process running at once and sets up logging and measure blocks.
2016-04-19 14:52:58 +01:00
07d765209d
First bits of emailpusher
...
Mostly logic of when to send an email
2016-04-19 14:24:36 +01:00
9ae64c9910
Measure push action generator
2016-04-14 13:42:22 +01:00
b42ad359e9
Merge pull request #725 from matrix-org/dbkr/push_only_joined
...
Don't push for everyone who ever sent an RR to the room
2016-04-14 12:05:13 +01:00
757e2c79b4
Don't push for everyone who ever sent an RR to the room
2016-04-14 12:02:50 +01:00
86e9bbc74e
Add missing yield
2016-04-14 11:56:52 +01:00
e40f25ebe1
Rename log context
2016-04-14 11:54:14 +01:00
2ae91a9e2f
Make send_badge private
2016-04-14 11:37:50 +01:00
56da835eaf
Add necessary logging contexts
2016-04-14 11:33:50 +01:00
7be1065b8f
Add extra Measure
2016-04-14 11:26:15 +01:00
65141161f6
Unused member variable
2016-04-12 16:25:26 +01:00
790f5848b2
Fix the rule_id for .m.rule.invite_for_me ( #715 )
2016-04-11 16:10:39 +01:00
9bb041791c
Run unsafe proces in a loop until we've caught up
...
and wrap unsafe process in a try block
2016-04-11 12:48:30 +01:00
d96a070a3a
Actually check if we;re processing
2016-04-08 16:49:39 +01:00
ed3979df5f
Fix invite pushes
...
* 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
2016-04-08 15:29:59 +01:00
7b6d519482
Make sure max stream ordering only increases
2016-04-08 14:08:16 +01:00
52d1008661
Unsafe process should call itself if the max has changed
2016-04-08 14:06:54 +01:00
ce3fe52498
Comment why unsafe process is unsafe
2016-04-08 14:02:38 +01:00
a4a31fa8dc
Only pass in what we need
2016-04-07 17:37:19 +01:00
15e0f1696f
Wrap process in a flag so we don't process whist already processing.
2016-04-07 17:31:08 +01:00
Erik Johnston