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
6ec02e9ecf
indenting
2016-04-07 17:24:05 +01:00
25cd5bb697
defer.gatherResults rather than doing all the pokes in series
2016-04-07 17:22:14 +01:00
fa129ce5b5
Add measure blocks
2016-04-07 17:12:29 +01:00
e1e042f2a1
Add comments on min_stream_id
...
saying that the min stream id won't be completely accurate all the time
2016-04-07 17:09:36 +01:00
d549fdfa22
Remove code that's now been obsoleted or moved elsewhere
2016-04-07 16:31:38 +01:00
92e3071623
Send badge count pushes.
...
Also fix bugs with retrying.
2016-04-07 15:39:53 +01:00
7e2c89a37f
Make pushers use the event_push_actions table instead of listening on an event stream & running the rules again. Sytest passes, but remaining to do:
...
* Make badges work again
* Remove old, unused code
2016-04-06 15:42:15 +01:00
2a37467fa1
Use google style doc strings.
...
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.
2016-04-01 16:12:07 +01:00
c27c51484a
Don't ignore the obey overlay if the rule has an enabled attribute of False
...
Fixes https://github.com/vector-im/vector-web/issues/1244
2016-03-31 10:12:31 +01:00
3b554bda26
Never notify for member events. This fixes https://github.com/vector-im/vector-web/issues/828
2016-03-24 13:19:39 +00:00
b6507869cd
Make get_invites return RoomsForUser
2016-03-23 10:32:10 +00:00
David Baker