Andrew Morgan
6c058e3206
Remove unnecessary parentheses around return statements ( #5931 )
2020-02-24 17:54:53 +00:00
Andrew Morgan
3a59bd253e
Revert "Use the v2 lookup API for 3PID invites ( #5897 )"
...
This reverts commit 978f263e7c , reversing
changes made to 4f6ee99818 .
2020-02-24 17:23:46 +00:00
Andrew Morgan
978f263e7c
Use the v2 lookup API for 3PID invites ( #5897 )
2020-02-24 17:15:16 +00:00
Andrew Morgan
d0cde0f655
Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_registration
2020-02-21 11:22:20 +00:00
Andrew Morgan
f590f77a16
Replace returnValue with return ( #5736 )
2020-02-19 15:11:59 +00:00
Andrew Morgan
005c26556b
Remove the ability to query relations when the original event was redacted. ( #5629 )
2020-02-19 11:45:42 +00:00
Andrew Morgan
b194ac056c
Ignore redactions of m.room.create events ( #5701 )
2020-02-19 11:44:59 +00:00
Andrew Morgan
a27e991693
More refactoring in get_events_as_list ( #5707 )
2020-02-19 11:44:37 +00:00
Andrew Morgan
2f450fa149
Implement access token expiry ( #5660 )
2020-02-17 17:17:02 +00:00
Andrew Morgan
d246c99947
Merge pull request #5638 from matrix-org/babolivier/invite-json
2020-02-17 16:35:24 +00:00
Andrew Morgan
748ebe2fd5
Include the original event in /relations ( #5626 )
2020-02-17 13:53:53 +00:00
Andrew Morgan
4eb0bbad04
Add origin_server_ts and sender fields to m.replace ( #5613 )
2020-02-17 13:21:58 +00:00
Andrew Morgan
41120db159
Move logging utilities out of the side drawer of util/ and into logging/ ( #5606 )
2020-02-14 11:02:55 +00:00
Andrew Morgan
3c29cee8e9
Fix media repo breaking ( #5593 )
2020-02-14 10:59:44 +00:00
Andrew Morgan
65787fe811
Make the http server handle coroutine-making REST servlets ( #5475 )
2020-02-14 10:57:48 +00:00
Andrew Morgan
28eba8747e
Run Black. ( #5482 )
2020-02-13 11:30:15 +00:00
Andrew Morgan
0295abdcf7
Dinsic Blacking with black==18.6b2
2020-02-11 16:18:29 +00:00
Andrew Morgan
d49933470d
Add limit_profile_requests_to_known_users option ( #18 )
2019-12-05 11:55:12 +00:00
Andrew Morgan
c446f59047
Hide expired users from user directory, optionally show on renewal ( #13 )
2019-11-14 18:42:55 +00:00
Andrew Morgan
d6b7606e07
Create configurable ratelimiter for 3pid invites ( #11 )
2019-11-12 11:38:35 +00:00
Brendan Abolivier
dfa60504af
Don't apply retention policy based filtering on state events
...
As per MSC1763, 'Retention is only considered for non-state events.', so don't filter out state events based on the room's retention policy.
2019-11-06 15:47:40 +00:00
Brendan Abolivier
c49ba3677c
Fixup tests
2019-10-04 12:21:33 +01:00
Brendan Abolivier
ce2448efbe
Fix git messing up
2019-09-27 17:18:10 +01:00
Brendan Abolivier
97672c03e2
ok
2019-09-27 16:57:19 +01:00
Brendan Abolivier
acf6b2388e
Lint
2019-09-27 16:57:19 +01:00
Brendan Abolivier
27b982269e
Merge pull request #2 from matrix-org/babolivier/dinsic-3pid-invite
...
Don't treat 3PID revocation as a new 3PID invite
2019-09-10 11:32:31 +01:00
Brendan Abolivier
76f70779f1
Revert "Merge pull request #5932 from matrix-org/babolivier/account_validity_template_encode"
...
This reverts commit 84e695f506 , reversing
changes made to 99eec6d2d5 .
2019-09-09 16:36:00 +01:00
Brendan Abolivier
6a78a0ce9b
Lint
2019-09-06 15:51:52 +01:00
Brendan Abolivier
e35c30ed4b
Fix bogus conflict resolution
2019-09-06 15:44:48 +01:00
Brendan Abolivier
e163df4c20
Merge branch 'dinsic' into babolivier/dinsic-3pid-invite
2019-09-06 15:41:37 +01:00
Brendan Abolivier
b2ec4467c9
Don't process revoked/redacted events as part of the room's membership info
2019-09-06 15:36:43 +01:00
Brendan Abolivier
b15557cd46
Don't treat 3PID revokation as a new 3PID invite
2019-09-06 15:32:11 +01:00
Brendan Abolivier
2477f1f7aa
Add tests
2019-09-05 16:25:37 +01:00
Andrew Morgan
4548d1f87e
Remove unnecessary parentheses around return statements ( #5931 )
...
Python will return a tuple whether there are parentheses around the returned values or not.
I'm just sick of my editor complaining about this all over the place :)
2019-08-30 16:28:26 +01:00
Brendan Abolivier
7a95d8fff9
Fix encoding for account validity HTML files on Python 2
2019-08-29 16:03:59 +01:00
Brendan Abolivier
e5df12ad16
Merge branch 'dinsic' into babolivier/dinsic-message-retention
2019-08-28 18:17:26 +01:00
Brendan Abolivier
70714595bc
Implement per-room message retention policies
2019-08-28 18:16:17 +01:00
Michael Kaye
62f5e3bc4c
Merge pull request #5812 from matrix-org/babolivier/account-validity-messages
...
Account validity: allow defining HTML templates to serve the user on account renewal attempt
2019-08-12 13:26:49 +01:00
Brendan Abolivier
9502bd8d78
Add tests
2019-08-01 16:08:38 +02:00
Brendan Abolivier
bc35503528
Add tests
2019-08-01 12:00:08 +02:00
Brendan Abolivier
ddf256c77f
Fix status code for forbidden events
2019-07-25 10:03:59 +02:00
Brendan Abolivier
0bb375c124
Turns out the default preset is public_chat
2019-07-24 17:29:17 +02:00
Brendan Abolivier
dcdfdb3f17
Add test case
2019-07-24 16:38:49 +02:00
Amber Brown
4806651744
Replace returnValue with return ( #5736 )
2019-07-23 23:00:55 +10:00
Andrew Morgan
b2a382efdb
Remove the ability to query relations when the original event was redacted. ( #5629 )
...
Fixes #5594
Forbid viewing relations on an event once it has been redacted.
2019-07-18 14:41:42 +01:00
Richard van der Hoff
9c70a02a9c
Ignore redactions of m.room.create events ( #5701 )
2019-07-17 19:08:02 +01:00
Richard van der Hoff
2091c91fde
More refactoring in get_events_as_list ( #5707 )
...
We can now use `_get_events_from_cache_or_db` rather than going right back to
the database, which means that (a) we can benefit from caching, and (b) it
opens the way forward to more extensive checks on the original event.
We now always require the original event to exist before we will serve up a
redaction.
2019-07-17 17:34:13 +01:00
Richard van der Hoff
5f158ec039
Implement access token expiry ( #5660 )
...
Record how long an access token is valid for, and raise a soft-logout once it
expires.
2019-07-12 17:26:02 +01:00
Andrew Morgan
d88421ab03
Include the original event in /relations ( #5626 )
...
When asking for the relations of an event, include the original event in the response. This will mostly be used for efficiently showing edit history, but could be useful in other circumstances.
2019-07-09 13:43:08 +01:00
Brendan Abolivier
3bc4ea841d
Merge pull request #5646 from matrix-org/babolivier/profile-allow-self
...
Port #5644 to dinsic
2019-07-09 13:19:57 +01:00