Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 31d072a

Browse files
committed
FIXUP: linter
1 parent 93f84e0 commit 31d072a

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

synapse/handlers/room.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
create_requester,
5454
)
5555
from synapse.util import stringutils
56-
from synapse.util.async_helpers import Linearizer, maybe_awaitable
56+
from synapse.util.async_helpers import Linearizer
5757
from synapse.util.caches.response_cache import ResponseCache
5858
from synapse.util.stringutils import parse_and_validate_server_name
5959
from synapse.visibility import filter_events_for_client

synapse/rest/admin/rooms.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
import logging
1616
from http import HTTPStatus
1717
from typing import TYPE_CHECKING, List, Optional, Tuple
18+
from urllib import parse as urlparse
1819

1920
from synapse.api.constants import EventTypes, JoinRules, Membership
2021
from synapse.api.errors import AuthError, Codes, NotFoundError, SynapseError
22+
from synapse.api.filtering import Filter
2123
from synapse.http.servlet import (
2224
RestServlet,
2325
assert_params_in_dict,
@@ -33,6 +35,7 @@
3335
)
3436
from synapse.storage.databases.main.room import RoomSortOrder
3537
from synapse.types import JsonDict, RoomAlias, RoomID, UserID, create_requester
38+
from synapse.util import json_decoder
3639

3740
if TYPE_CHECKING:
3841
from synapse.server import HomeServer
@@ -567,13 +570,15 @@ async def on_GET(self, request, room_identifier):
567570
extremities = await self.store.get_forward_extremities_for_room(room_id)
568571
return 200, {"count": len(extremities), "results": extremities}
569572

573+
570574
class RoomEventContextServlet(RestServlet):
571575
"""
572576
Provide the context for an event.
573577
This API is designed to be used when system administrators wish to look at
574578
an abuse report and understand what happened during and immediately prior
575579
to this event.
576580
"""
581+
577582
PATTERNS = admin_patterns("/rooms/(?P<room_id>[^/]*)/context/(?P<event_id>[^/]*)$")
578583

579584
def __init__(self, hs):

tests/rest/admin/test_room.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,9 @@ def test_context_as_non_admin(self):
14611461
% (room_id, events[midway]["event_id"]),
14621462
access_token=tok,
14631463
)
1464-
self.assertEquals(403, int(channel.result["code"]), msg=channel.result["body"])
1464+
self.assertEquals(
1465+
403, int(channel.result["code"]), msg=channel.result["body"]
1466+
)
14651467
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
14661468

14671469
def test_context_as_admin(self):

0 commit comments

Comments
 (0)