9db2476991
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact
2018-08-24 17:00:37 +01:00
05077e06fa
Change admin_uri to admin_contact in config and errors
2018-08-24 16:51:27 +01:00
01a5a8b9e3
Fix checking if service notice room is already tagged
...
This manifested in synapse repeatedly setting the tag for the room
2018-08-24 16:22:37 +01:00
cdd24449ee
Ensure we wake up /sync when we add tag to notice room
2018-08-24 14:50:03 +01:00
14d49c51db
Make content of tag an empty object rather than null
2018-08-24 14:44:16 +01:00
7f147d623b
Fix bug where we broke sync when using limit_usage_by_mau
...
We assumed that we always had service notices configured, but that is
not always true
2018-08-24 11:33:50 +01:00
7e6e588e60
Fix bug where we resent "limit exceeded" server notices
...
This was due to a bug where we mutated a cached event's contents
2018-08-23 16:21:20 +01:00
9643a6f7f2
Update notice format
2018-08-22 17:00:29 +01:00
ba1fbf7d5b
special case server_notices_mxid
2018-08-18 12:31:08 +01:00
d49b77404b
clean up, no functional changes
2018-08-17 15:21:34 +01:00
51b17ec566
flake8
2018-08-16 17:32:22 +01:00
3c1080b6e4
refactor for readability, and reuse caching for setting tags
2018-08-16 17:02:04 +01:00
eff3ae3b9a
add room tagging
2018-08-16 15:48:34 +01:00
a675f9c556
check for room state before deciding on action
2018-08-16 14:53:35 +01:00
df1e4f259f
WIP impl commiting to get feedback
2018-08-16 11:10:53 +01:00
c055c91655
fix case where empty string state check is evaulated as False
2018-08-16 11:10:19 +01:00
eabc5f8271
wip cut at sending resource server notices
2018-08-15 15:04:52 +01:00
e2c9fe0a6a
backout ability to pass in event type to server notices
2018-08-14 13:32:56 +01:00
9b75c78b4d
support server notice state events for resource limits
2018-08-14 11:20:41 +01:00
63417c31e9
fix typo
2018-08-13 22:36:52 +01:00
6c6aba76e1
implementation of server notices to alert on hitting resource limits
2018-08-10 15:12:59 +01:00
01021c812f
wip at implementing MSC 7075
2018-08-09 22:16:00 +01:00
49af402019
run isort
2018-07-09 16:09:20 +10:00
ba1b163590
Avoid sending consent notice to guest users
...
we think it makes sense not to send the notices to guest users.
2018-05-25 11:36:43 +01:00
9bf4b2bda3
Allow overriding the server_notices user's avatar
...
probably should have done this in the first place, like @turt2live suggested.
2018-05-23 17:43:30 +01:00
2f7008d4eb
Merge pull request #3271 from matrix-org/rav/consent_uri_in_messages
...
Support for putting %(consent_uri)s in messages
2018-05-23 16:04:30 +01:00
dda40fb55d
fix typo
2018-05-23 15:30:26 +01:00
82191b08f6
Support for putting %(consent_uri)s in messages
...
Make it possible to put the URI in the error message and the server notice that
get sent by the server
2018-05-23 15:24:31 +01:00
321f02d263
Block attempts to send server notices to remote users
2018-05-23 14:30:47 +01:00
ad2823ee27
fix synchrotron
2018-05-22 17:47:42 +01:00
8810685df9
Stub out ServerNoticesSender on the workers
...
... and have the sync endpoints call it directly rather than obsure indirection
via PresenceHandler
2018-05-22 11:54:51 +01:00
d5dca9a04f
Move consent config parsing into ConsentConfig
...
turns out we need to reuse this, so it's better in the config class.
2018-05-22 11:54:51 +01:00
9ea219c514
Send users a server notice about consent
...
When a user first syncs, we will send them a server notice asking them to
consent to the privacy policy if they have not already done so.
2018-05-22 11:54:51 +01:00
011e1f4010
Better docstrings
2018-05-18 11:22:12 +01:00
26305788fe
Make sure we reject attempts to invite the notices user
2018-05-18 11:18:39 +01:00
fed62e21ad
Infrastructure for a server notices room
...
Server Notices use a special room which the user can't dismiss. They are
created on demand when some other bit of the code calls send_notice.
(This doesn't actually do much yet becuse we don't call send_notice anywhere)
2018-05-17 17:58:25 +01:00
Erik Johnston