1
0
Commit Graph

14676 Commits

Author SHA1 Message Date
Brendan Abolivier 32bc69d0f5 Changelog 2019-09-24 17:19:59 +01:00
Brendan Abolivier af597b1eb6 Move get_retention_policy_for_room to RoomWorkerStore 2019-09-24 17:19:59 +01:00
Brendan Abolivier 07eb311b11 Merge pull request #4 from matrix-org/babolivier/strip_invalid_mxid_characters
Fix handling of filtered strings in Python 3 when processing MXIDs
2019-09-20 10:57:07 +01:00
Brendan Abolivier 736394d46b Remove unnecessary cast to list 2019-09-20 10:07:55 +01:00
Brendan Abolivier 6f364634ee Changelog 2019-09-19 13:02:23 +01:00
Brendan Abolivier 8bc39401fe Lint 2019-09-19 13:01:05 +01:00
Brendan Abolivier 30c085fbc3 Use six.moves.filter when filtering out from MXID
Python 2's filter() function and Python 3's don't return the same type when processing a string (respectively str and filter), therefore use six's compatibility mapping (which resolves to itertools.ifilter() if using Python2), then generate a string from the filtered list, in order to ensure consistent behaviour between Python 2 and Python 3.
2019-09-19 12:03:10 +01:00
Brendan Abolivier ae036ed636 Add unit tests for strip_invalid_mxid_characters 2019-09-19 11:58:06 +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 0b993427e1 Update changelog.d/2.bugfix
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-09-10 10:18:37 +01:00
Brendan Abolivier 66be293c79 Process revocations in _on_membership_or_invite_direct 2019-09-09 17:52:41 +01:00
Brendan Abolivier 43c1a10e91 Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicode
Ensure the password reset template is correctly converted to binary
2019-09-09 17:52:05 +01:00
Brendan Abolivier c8f03a8fb0 Rename io.open import to limite side-effects 2019-09-09 17:13:37 +01:00
Brendan Abolivier b0eec085bd Lint 2019-09-09 16:41:46 +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 21a6f0b12c Read all files as UTF-8 2019-09-09 16:34:47 +01:00
Brendan Abolivier 6ceaf90e13 Revert "Ensure the password reset template is correctly converted to binary"
This reverts commit 665dd9f7f8.
2019-09-09 16:33:09 +01:00
Brendan Abolivier a8c7c26e7d Changelog 2019-09-09 11:49:42 +01:00
Brendan Abolivier 665dd9f7f8 Ensure the password reset template is correctly converted to binary
Regardless of the Python version
2019-09-09 11:35:56 +01:00
Brendan Abolivier 5076c2ebf6 Typo 2019-09-06 17:48:42 +01:00
Brendan Abolivier 6a78a0ce9b Lint 2019-09-06 15:51:52 +01:00
Brendan Abolivier 160a0c767d Changelog 2019-09-06 15:51:30 +01:00
Brendan Abolivier e1c4d2c8ba Only filter on 3PID invite tokens 2019-09-06 15:48:02 +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 e9f2925292 Merge pull request #1 from matrix-org/babolivier/direct-avatar-name
Forbid changing the name, avatar or topic of a direct room
2019-09-06 11:46:17 +01:00
Brendan Abolivier 6cf60da6e9 Fix CI 2019-09-05 16:40:55 +01:00
Brendan Abolivier d1d464388a Lint 2019-09-05 16:35:13 +01:00
Brendan Abolivier 9ef4e90be7 Changelog 2019-09-05 16:35:00 +01:00
Brendan Abolivier 2477f1f7aa Add tests 2019-09-05 16:25:37 +01:00
Brendan Abolivier eddc6d8855 Forbid changing the name, avatar or topic of a direct room 2019-09-05 16:25:22 +01:00
Brendan Abolivier 84e695f506 Merge pull request #5932 from matrix-org/babolivier/account_validity_template_encode
Fix encoding for account validity HTML files on Python 2
dinsic_2019-08-30
2019-08-29 16:50:10 +01:00
Brendan Abolivier 91694227b6 Bump requirement for six to 1.12 2019-08-29 16:20:21 +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 99eec6d2d5 Merge pull request #5815 from matrix-org/babolivier/dinsic-message-retention
Message retention policies at the room and server levels
dinsic_2019-08-29
2019-08-28 18:49:13 +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
dinsic_2019-08-12
2019-08-12 13:26:49 +01:00
Michael Kaye 63d0d21a28 Merge pull request #5781 from matrix-org/baboliver/loopingcall-args
Add ability to pass arguments to looping calls
dinsic_2019-08-08
2019-08-08 12:10:36 +01:00
Michael Kaye 8551b4f336 Merge pull request #5760 from matrix-org/babolivier/access-rules-public-restricted
Force the access rule to be "restricted" if the join rule is "public"
2019-08-08 12:10:22 +01:00
Brendan Abolivier 359aed4168 Lint 2019-08-01 16:08:39 +02:00
Brendan Abolivier cd47482257 Sample config 2019-08-01 16:08:39 +02:00
Brendan Abolivier a9567ee1a6 Changelog 2019-08-01 16:08:38 +02:00
Brendan Abolivier 9502bd8d78 Add tests 2019-08-01 16:08:38 +02:00
Brendan Abolivier 235271be4f Allow defining HTML templates to serve the user on account renewal 2019-08-01 16:08:38 +02:00
Brendan Abolivier 0c6500a08b Explain rationale 2019-08-01 10:19:04 +02:00
Brendan Abolivier c862d5baf6 Check room ID and type of redacted event (#5784)
Check room ID and type of redacted event
dinsic_2019-07-31
2019-07-31 16:44:19 +02:00
Brendan Abolivier 35ec13baab Ignore redactions of redactions in get_events_as_list 2019-07-31 15:48:57 +02:00