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
290f125a13
Typo
2016-04-25 14:42:59 +01:00
05e49ffbdf
No we don't: it's just the display name
2016-04-22 18:44:17 +01:00
bd0f9c2065
Actually do UTF8 correctly
2016-04-22 18:42:00 +01:00
c5b3c6e101
Sort member events
...
So names of people in a room are given in order
2016-04-22 18:33:36 +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
e8701e64b9
Implement group-of-people names
2016-04-22 17:28:42 +01:00
c553797c4f
No inlineCallbacks necessary on this
2016-04-22 17:27:54 +01:00
19d6b6cd7a
Add WIP email template files
2016-04-21 19:22:53 +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
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
48af68ba8e
Merge pull request #735 from matrix-org/erikj/media_resource_cleanup
...
Split out BaseMediaResource into MediaRepository
2016-04-19 13:56:59 +01:00
0c93df89b6
Move MediaRepository to media_repository module
2016-04-19 11:31:43 +01:00
43f0941e8f
Split out BaseMediaResource into MediaRepository
...
This is so that a single MediaRepository can be shared across all
resources, rather than having a "copy" per resource.
In particular this allows us to guard against both the thumbnail and
download resource triggering a download of remote content at the same
time.
2016-04-19 11:24:59 +01:00
481119f7d6
Merge pull request #734 from matrix-org/erikj/measure
...
Create log context in Measure if one doesn't exist
2016-04-18 19:03:57 +01:00
eb8619e256
Create log context in Measure if one doesn't exist
2016-04-18 16:08:32 +01:00
4ef7a25c10
Merge pull request #733 from matrix-org/erikj/make_member_timeout
...
Lower timeout for make_membership_event
2016-04-18 15:08:05 +01:00
3727a15764
Merge pull request #732 from matrix-org/erikj/login
...
Simplify _check_password
2016-04-18 15:07:57 +01:00
aaabbd3e9e
explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes better
2016-04-15 14:32:25 +01:00
84f9cac4d0
fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, rather than relying on lxml's heuristics which seem to get it wrong
2016-04-15 13:20:08 +01:00
914f1eafac
Lower timeout for make_membership_event
...
Calls to make_membership_event are done in response to client requests,
and so should not be retried over long timeframes.
2016-04-15 11:22:23 +01:00
6fd2f685fe
Simplify _check_password
2016-04-15 11:17:18 +01:00
737aee9295
Merge pull request #731 from matrix-org/erikj/timed_otu
...
Use SynapseError 504 for Timeout errors
2016-04-15 10:31:17 +01:00
cb9c465707
Use SynapseError 504 for Timeout errors
2016-04-15 10:21:32 +01:00
3c79bdd7a0
Fix check_password rather than inverting the meaning of _check_local_password ( #730 )
2016-04-14 19:00:21 +01:00
a4c56bf67b
Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_user
...
Fix login to error for nonexistent users
2016-04-14 18:46:45 +01:00
4c1b32d7e2
Fix login to error for nonexistent users
...
Fixes SYN-680
2016-04-14 18:28:42 +01:00
f78b479118
fix urlparse import thinko breaking tiny URLs
2016-04-14 15:23:55 +01:00
4802f9cdb6
Merge pull request #727 from matrix-org/kegan/fix-asapi-reg
...
Make v2_alpha reg follow the AS API specification
2016-04-14 15:08:54 +01:00
83776d6219
Make v2_alpha reg follow the AS API specification
...
The spec is clear the key should be 'user' not 'username' and this is indeed
the case for v1. This is not true for v2_alpha though, which is what this
commit is fixing.
2016-04-14 14:52:26 +01:00
bd77216d06
comment out 2c838f6459 due to risk of https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve
2016-04-14 14:39:24 +01:00
5a578ea4c7
Merge pull request #726 from matrix-org/erikj/push_metric
...
Measure push action generator
2016-04-14 13:49:09 +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
ff1d333a02
Merge pull request #724 from matrix-org/erikj/push_measure
...
Add push index. Add extra Measure
2016-04-14 11:46:46 +01:00
2ae91a9e2f
Make send_badge private
2016-04-14 11:37:50 +01:00
d213d69fe3
Add desc arg
2016-04-14 11:36:23 +01:00
56da835eaf
Add necessary logging contexts
2016-04-14 11:33:50 +01:00
96bcfb29c7
Add index
2016-04-14 11:26:33 +01:00
7be1065b8f
Add extra Measure
2016-04-14 11:26:15 +01:00
a2546b9082
Fix query for get_unread_push_actions_for_user_in_range
2016-04-14 11:08:31 +01:00
ceeb5b909f
Merge pull request #721 from matrix-org/erikj/spider
...
Sanitize the optional dependencies for spider API
2016-04-14 09:59:29 +01:00
43a89cca8e
Merge pull request #722 from matrix-org/dbkr/only_unread_event_actions
...
Only return unread notifications
2016-04-13 14:54:26 +01:00
David Baker