b86d05a279
Clean up event accesses and tests
...
This is in preparation to refactor FrozenEvent to support different
event formats for different room versions
2018-11-02 13:44:14 +00:00
0dce9e1379
Write some tests for the email pusher ( #4095 )
2018-10-30 23:55:43 +11:00
c573794b22
Fix start_pushers vs _start_pushers confusion
2018-10-24 09:24:55 +01:00
e564306e31
sanity-check the is_processing flag
...
... and rename it, for even more sanity
2018-10-24 09:23:33 +01:00
026cd91ac8
Run PusherPool.start as a background process
...
We don't do anything with the result, so this is needed to give this code a
logcontext.
2018-10-22 16:12:11 +01:00
f749607c91
Make on_started synchronous too
...
This brings it into line with on_new_notifications and on_new_receipts. It
requires a little bit of hoop-jumping in EmailPusher to load the throttle
params before the first loop.
2018-10-22 16:12:11 +01:00
e7a16c6210
Remove redundant run_as_background_process() from pusherpool
...
`on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher`
now always return synchronously, so we can remove the `defer.gatherResults` on
their results, and the `run_as_background_process` wrappers can be removed too
because the PusherPool methods will now complete quickly enough.
2018-10-22 16:12:11 +01:00
c7273c11bc
Give pushers their own background logcontext
...
Each pusher has its own loop which runs for as long as it has work to do. This
should run in its own background thread with its own logcontext, as other
similar loops elsewhere in the system do - which means that CPU usage is
consistently attributed to that loop, rather than to whatever request happened
to start the loop.
2018-10-22 16:12:11 +01:00
5110f4e425
move get_all_pushers call down
...
simplifies the interface to _start_pushers
2018-10-22 16:12:11 +01:00
04277d0ed8
Factor PusherPool._start_pusher out of _start_pushers
...
... and use it from start_pusher_by_id. This mostly simplifies
start_pusher_by_id.
2018-10-22 16:12:11 +01:00
3e8b02c939
Rename _refresh_pusher
...
This is public (or at least, called from outside the class), so ought to have a
better name.
2018-10-22 16:12:11 +01:00
cc325c7069
Calculate absolute path for email templates
2018-10-19 14:01:59 +01:00
1519572961
Ship the email templates as package_data
...
move the example email templates into the synapse package so that they can be
used as package data, which should mean that all of the packaging mechanisms
(pip, docker, debian, arch, etc) should now come with the example templates.
In order to grandfather in people who relied on the templates being in the old
place, check for that situation and fall back to using the defaults if the
templates directory does not exist.
2018-10-17 16:46:02 +01:00
7de1989ea2
fix link for case that config.email_riot_base_url is set
2018-09-13 22:43:50 +01:00
7c27c4d51c
merge ( #3576 )
2018-09-14 03:11:11 +10:00
66f7dc8c87
Fix logcontexts for running pushers
...
First of all, avoid resetting the logcontext before running the pushers, to fix
the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning.
Instead, give them their own "background process" logcontexts.
2018-08-17 00:32:39 +01:00
b37c472419
Rename async to async_helpers because `async` is a keyword on Python 3.7 ( #3678 )
2018-08-10 23:50:21 +10:00
e42510ba63
Use new getters
2018-07-23 13:17:22 +01:00
49af402019
run isort
2018-07-09 16:09:20 +10:00
07cad26d65
Remove all global reactor imports & pass it around explicitly ( #3424 )
2018-06-25 14:08:28 +01:00
a61738b316
Remove run_on_reactor ( #3395 )
2018-06-14 18:27:37 +10:00
c936a52a9e
Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy ( #3307 )
2018-05-31 19:03:47 +10:00
754826a830
Merge remote-tracking branch 'origin/develop' into 3218-official-prom
2018-05-28 18:57:23 +10:00
1f69693347
Merge pull request #3244 from NotAFile/py3-six-4
...
replace some iteritems with six
2018-05-24 13:04:07 -05:00
e987079037
fixes
2018-05-23 13:03:51 -05:00
53cc2cde1f
cleanup
2018-05-22 17:32:57 -05:00
85ba83eb51
fixes
2018-05-22 16:28:23 -05:00
fcc525b0b7
rest of the changes
2018-05-21 19:48:57 -05:00
df9f72d9e5
replacing portions
2018-05-21 19:47:37 -05:00
933bf2dd35
replace some iteritems with six
...
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-05-19 17:59:26 +02:00
d9fe2b2d9d
Replace some more comparisons with six
...
plus a bonus b"" string I missed last time
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-05-19 17:56:31 +02:00
950a32eb47
Merge pull request #3152 from NotAFile/py3-local-imports
...
make imports local
2018-04-30 01:28:13 +01:00
57b58e2174
make imports local
...
Signed-off-by: Adrian Tschira <nota@notafile.com>
2018-04-28 13:41:41 +02:00
fc149b4eeb
Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background
2018-04-27 14:31:23 +01:00
2a13af23bc
Use run_in_background in preference to preserve_fn
...
While I was going through uses of preserve_fn for other PRs, I converted places
which only use the wrapped function once to use run_in_background, to avoid
creating the function object.
2018-04-27 12:55:51 +01:00
9c3da24561
Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptions
...
Improve exception handling for background processes
2018-04-27 11:47:49 +01:00
605defb9e4
Add missing consumeErrors
...
In general we want defer.gatherResults to consumeErrors, rather than having
exceptions hanging around and getting logged as CRITICAL unhandled errors.
2018-04-27 11:16:28 +01:00
9255a6cb17
Improve exception handling for background processes
...
There were a bunch of places where we fire off a process to happen in the
background, but don't have any exception handling on it - instead relying on
the unhandled error being logged when the relevent deferred gets
garbage-collected.
This is unsatisfactory for a number of reasons:
- logging on garbage collection is best-effort and may happen some time after
the error, if at all
- it can be hard to figure out where the error actually happened.
- it is logged as a scary CRITICAL error which (a) I always forget to grep for
and (b) it's not really CRITICAL if a background process we don't care about
fails.
So this is an attempt to add exception handling to everything we fire off into
the background.
2018-04-27 11:07:40 +01:00
573712da6b
Update comments
2018-02-21 11:29:49 +00:00
6ff8c87484
Batch inserts into event_push_actions_staging
2018-02-20 11:33:07 +00:00
012e8e142a
Comments
2018-02-16 11:35:01 +00:00
4810f7effd
Remove context.push_actions
2018-02-15 15:47:06 +00:00
acac21248c
Store push actions in staging area
2018-02-15 15:47:04 +00:00
03dd745fe2
Better logging when pushes fail
2018-01-29 15:49:06 +00:00
e051abd20b
add appid/device_display_name to to pusher logging
2018-01-29 15:04:16 +00:00
4528dd2443
Fix logging and add user_id
2018-01-22 20:15:42 +00:00
93efd7eb04
logging and debug for http pusher
2018-01-22 18:14:10 +00:00
2c6d63922a
Remove pushers when deleting access tokens
...
Whenever an access token is invalidated, we should remove the associated
pushers.
2017-11-29 16:44:35 +00:00
1b83c09c03
Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs
...
Remove preserve_context_over_{fn, deferred}
2017-11-15 11:13:53 +00:00
7e6fa29cb5
Remove preserve_context_over_{fn, deferred}
...
Both of these functions ae known to leak logcontexts. Replace the remaining
calls to them and kill them off.
2017-11-14 11:22:42 +00:00
2a98ba0ed3
Rename redact_content option to include_content
...
The redact_content option never worked because it read the wrong config
section. The PR introducing it
(https://github.com/matrix-org/synapse/pull/2301 ) had feedback suggesting the
name be changed to not re-use the term 'redact' but this wasn't
incorporated.
This reanmes the option to give it a less confusing name, and also
means that people who've set the redact_content option won't suddenly
see a behaviour change when upgrading synapse, but instead can set
include_content if they want to.
This PR also updates the wording of the config comment to clarify
that this has no effect on event_id_only push.
Includes https://github.com/matrix-org/synapse/pull/2422
2017-11-08 10:35:30 +00:00
eaaabc6c4f
replace 'except:' with 'except Exception:'
...
what could possibly go wrong
2017-10-23 15:52:32 +01:00
9342bcfce0
Omit the *s for @room notifications
...
They're just redundant
2017-10-16 13:38:10 +01:00
81a5e0073c
pep8
2017-10-10 15:53:34 +01:00
ab1bc9bf5f
Don't KeyError if no power_levels event
2017-10-10 15:34:05 +01:00
0f1eb3e914
Use notification levels in power_levels
...
Rather than making the condition directly require a specific power
level. This way the level require to notify a room can be configured
per room.
2017-10-10 15:23:00 +01:00
c9f034b4ac
There was already a constant for this
...
also update copyright
2017-10-10 11:47:10 +01:00
a9f9d68631
More optimisation
2017-10-10 11:38:31 +01:00
707374d5dc
What year is it!? Who's the president!?
2017-10-10 11:21:41 +01:00
269af961e9
Make be faster
2017-10-05 13:27:12 +01:00
ed80c6b6cc
Add fastpath optimisation
2017-10-05 13:20:22 +01:00
e433393c4f
pep8
2017-10-05 13:08:02 +01:00
985ce80375
They're called rooms
2017-10-05 13:03:44 +01:00
b9b9714fd5
Get rule type right
2017-10-05 13:02:19 +01:00
fa969cfdde
Support for channel notifications
...
Add condition type to check the sender's power level and add a base
rule using it for @channel notifications.
2017-10-05 12:39:18 +01:00
0c8da8b519
Use better method for word boundary searching
...
From ebc95667b8
2017-10-05 11:57:43 +01:00
cbe3c3fdd4
pep8
2017-10-05 11:43:10 +01:00
6748f0a579
Fix notif kws that start/end with non-word chars
...
Only prepend / append word bounary characters if the search
expression starts or ends with a word character, otherwise they
don't work because there's no word bounary between whitespace and
a non-word char.
2017-10-05 11:33:30 +01:00
436ee0a2ea
Also include the room_id
...
as really it's part of the event ID
2017-09-18 15:58:38 +01:00
b393f5db51
Use .get - it's much shorter
2017-09-18 15:50:26 +01:00
a2562f9d74
Add support for event_id_only push format
...
Param in the data dict of a pusher that tells an HTTP pusher to
send just the event_id of the event it's notifying about and the
notification counts. For clients that want to go & fetch the body
of the event themselves anyway.
2017-09-18 15:39:39 +01:00
bfde076022
Increase cache hit ratio for push
...
We don't update the cache in all code paths, which causes subsequent
calls to miss the cache
2017-07-14 16:11:26 +01:00
8d26385d76
Add more metrics to push rule evaluation
2017-07-13 14:37:30 +01:00
f60218ec41
Push: Don't acquire lock unless necessary
2017-07-13 11:23:53 +01:00
f502b0dea1
Perf: Don't filter events for push
...
We know the users are joined and we can explicitly check for if they are
ignoring the user, so lets do that.
2017-07-07 14:04:40 +01:00
3d31b39297
Merge pull request #2332 from matrix-org/rav/fix_pushes
...
Fix caching error in the push evaluator
2017-07-05 11:10:53 +01:00
73cfe48031
Fix caching error in the push evaluator
...
Initialising `result` to `{}` in the parameters meant that every call to
_flatten_dict used the *same* target dictionary.
I'm hopeful this will fix https://github.com/matrix-org/synapse/issues/2270 ,
but I suspect it won't. (This code seems to have been here since forever,
unlike the bug, and I don't really think it explains the observed
behaviour). Still, it makes it hard to investigate the problem.
2017-07-05 00:28:43 +01:00
75eba3b07d
Fix TravisCI tests for PR #2301
2017-06-23 15:15:18 +02:00
1591eddaea
Add configuration parameter to allow redaction of content from push messages for google/apple devices
2017-06-23 13:01:04 +02:00
cca94272fa
Fix typo when getting app name
2017-06-06 11:50:07 +01:00
66b121b2fc
Fix wrong number of arguments
2017-06-06 11:46:38 +01:00
11c2a3655f
Only load jinja2 templates once
...
Instead of every time a new email pusher is created, as loading jinja2
templates is slow.
2017-05-22 17:48:58 +01:00
6489455bed
Comment
2017-05-22 16:22:04 +01:00
d668caa79c
Remove spurious log level guards
2017-05-22 16:21:06 +01:00
7fb80b5eae
Check if current event is a membership event
2017-05-22 15:02:12 +01:00
2d17b09a6d
Add debug logging
2017-05-22 15:01:36 +01:00
24c8f38784
Comment
2017-05-22 14:59:27 +01:00
25f03cf8e9
Use tuple unpacking
2017-05-22 14:58:22 +01:00
270e1c904a
Speed up calculating push rules
2017-05-19 16:51:05 +01:00
1c1c0257f4
Move invalidation cb to its own structure
2017-05-19 11:44:11 +01:00
cafe659f72
Store ActionGenerator in HomeServer
2017-05-19 10:09:56 +01:00
72ed8196b3
Don't push users who have left
2017-05-18 17:48:36 +01:00
760625acba
Make get_if_app_services_interested_in_user faster
2017-05-18 16:34:44 +01:00
c57789d138
Remove size of push get_rules cache
2017-05-18 16:17:23 +01:00
056ba9b795
Add comment
2017-05-18 11:45:56 +01:00
66d8ffabbd
Faster push rule calculation via push specific cache
...
We add a push rule specific cache that ensures that we can reuse
calculated push rules appropriately when a user join/leaves.
2017-05-17 16:55:40 +01:00
78f306a6f7
Revert "Speed up filtering of a single event in push"
...
This reverts commit 421fdf7460
2017-05-08 13:07:41 +01:00
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
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
5defb25ac6
Use get_users_in_room to count the number of room members rather than using read_receipts
2016-03-22 13:52:45 +00:00
af59826a2f
Make select more sensible when dseleting access tokens, rename pusher deletion to match access token deletion and make exception arg optional.
2016-03-11 14:34:09 +00:00
aa11db5f11
Fix cache invalidation so deleting access tokens (which we did when changing password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f0549
2016-03-11 13:14:18 +00:00
7076082ae6
Fix relative imports so they work in both py3 and py27
2016-03-08 11:45:50 +00:00
3406eba4ef
Move the code for formatting push rules into a separate function
2016-03-03 16:11:59 +00:00
de27f7fc79
Add support for changing the actions for default rules
...
See matrix-org/matrix-doc#283
Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules``
2016-02-26 14:28:19 +00:00
05aee12652
Merge branch 'develop' into rav/guest_access_after_room_join
2016-02-19 12:00:16 +00:00
b71ca2b014
Allow guest users access to messages in rooms they have joined
...
There should be no difference between guest users and non-guest users in terms
of access to messages. Define the semantics of the is_peeking argument to
filter_events_for_clients (slightly) better; interpret it appropriately, and
set it correctly from /sync.
2016-02-19 11:41:02 +00:00
b9977ea667
Remove dead code for setting device specific rules.
...
It wasn't possible to hit the code from the API because of a typo
in parsing the request path. Since no-one was using the feature
we might as well remove the dead code.
2016-02-18 16:05:13 +00:00
7b0d846407
Atomically persit push actions when we persist the event
2016-02-09 16:19:15 +00:00
f28cc45183
Pass in current state to push action handler
2016-02-09 16:01:40 +00:00
31a2b892d8
Revert to putting it around the entire block
2016-02-09 11:25:09 +00:00
549698b1e0
Don't measure across event stream call, as it lasts for a long time.
2016-02-09 09:37:09 +00:00
2c1fbea531
Fix up logcontexts
2016-02-08 14:26:45 +00:00
13e6262659
Add metrics to pushers
2016-02-08 14:26:45 +00:00
771528ab13
Change event_push_actions_rm_tokens schema
2016-02-03 10:50:49 +00:00
d83d004ccd
Fix flake8 warnings for new flake8
2016-02-02 17:18:50 +00:00
766c24b2e6
Only notify for messages in one to one rooms, not every event
...
Fixes the fact that candidate events and hangups generated notifications.
2016-01-26 10:21:41 +00:00
53cb173663
Push: Use storage apis that are cached
2016-01-25 13:55:18 +00:00
f92fe15897
Merge pull request #523 from matrix-org/dbkr/no_push_unless_notify
...
Better fix for actions with both dont_notify and tweaks
2016-01-22 17:27:25 +00:00
3fe8c56736
Better fix for actions with both dont_notify and tweaks
2016-01-22 17:21:58 +00:00
60965bd7e5
Revert b4a41aa542 as it's just broken.
2016-01-22 17:21:15 +00:00
0e0e441b33
Merge pull request #522 from matrix-org/dbkr/no_push_unless_notify
...
Don't add notifications to the table unless there's actually a 'notify' action
2016-01-22 17:06:52 +00:00
b4a41aa542
Don't add notifications to the table unless there's actually a 'notify' action
2016-01-22 16:56:48 +00:00
db6e26bb8c
Don't mutate cached values
2016-01-22 16:03:55 +00:00
7065b75bfd
Don't crash if a user has no push rule enabled entries
2016-01-22 15:13:44 +00:00
52bdd1b834
Overlay the push_rules_enabled map for users, otherwise they won't be able to disable server default rules.
2016-01-22 14:58:19 +00:00
0e07f2e15d
Only fetch events for rooms and receipts
2016-01-21 16:10:37 +00:00
3a00f13436
Only compute badge count when necessary.
...
This reverts commit d726597737
2016-01-21 14:56:11 +00:00
930ba003f8
Remove member event rule as per SYN-607
2016-01-21 11:50:27 +00:00
3fa344c037
Add storage function to get all receipts for a user. Also add some cache invalidation to the receipts storage because there wasn't any, and remove a method that was unused.
2016-01-20 15:30:31 +00:00
7cc047455e
Inline membership specifier
2016-01-20 13:50:28 +00:00
d726597737
Simplify badge updating code by just updating it every time we get woken up and it's not an event
2016-01-20 13:49:00 +00:00
2309450a76
Merge branch 'develop' into push_badge_counts
2016-01-20 13:45:13 +00:00
746f6e0eb3
'filtered' is a list of zero or 1
2016-01-20 13:44:04 +00:00
7441d8cc0c
Merge remote-tracking branch 'origin/develop' into push_badge_counts
2016-01-20 13:40:22 +00:00
259d1ecd1d
Don't generate push actions for our own events
2016-01-20 13:24:59 +00:00
afb7b377f2
Merge branch 'develop' into push_badge_counts
2016-01-19 18:17:23 +00:00
fb5d8e58ff
Change regex cache size to 5000
2016-01-19 16:07:07 +00:00
5a7d1ecffc
Add regex cache. Only caculate push actions for users that have sent read receipts, and are on that server
2016-01-19 16:01:05 +00:00
d056a0a3d8
Handle glob -> regex errors
2016-01-19 14:43:24 +00:00
9654ee0848
Return don't break
2016-01-19 14:24:59 +00:00
Erik Johnston