summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-10-13 17:10:45 +0100
committerRichard van der Hoff <richard@matrix.org>2020-10-13 17:10:45 +0100
commitbdbe2b12c216287708d7dce11c65c58cdb1d706b (patch)
treeeaa61683e0d8711ef7c3d2b7ff7caebd0fdb0998
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
downloadsynapse-bdbe2b12c216287708d7dce11c65c58cdb1d706b.tar.xz
Revert "block membership events from spammy freenode bridge"
This reverts commit cd2f831b9da91829efab01f31921fbd7fb738300.
-rw-r--r--synapse/rest/client/v1/room.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index d2349ecfdd..00b4397082 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -290,8 +290,6 @@ class JoinRoomAliasServlet(TransactionRestServlet): async def on_POST(self, request, room_identifier, txn_id=None): requester = await self.auth.get_user_by_req(request, allow_guest=True) - if requester.app_service and requester.app_service.id == "irc-freenode": - raise SynapseError(400, "too much spam") try: content = parse_json_object_from_request(request) @@ -721,8 +719,6 @@ class RoomMembershipRestServlet(TransactionRestServlet): async def on_POST(self, request, room_id, membership_action, txn_id=None): requester = await self.auth.get_user_by_req(request, allow_guest=True) - if requester.app_service and requester.app_service.id == "irc-freenode": - raise SynapseError(400, "too much spam") if requester.is_guest and membership_action not in { Membership.JOIN,