mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-12-10 08:59:28 -05:00
Revert "Allow room moderators to view redacted event content"
This reverts commit 2dc2979af5.
The feature was merged to upstream, and merging upstream will be cleaner
without this commit here.
This commit is contained in:
parent
ff7bece06f
commit
90c00fb04b
4 changed files with 3 additions and 84 deletions
|
|
@ -21,7 +21,6 @@ from synapse.api.errors import AuthError, SynapseError
|
|||
from synapse.events import EventBase
|
||||
from synapse.events.utils import SerializeEventConfig
|
||||
from synapse.handlers.presence import format_user_presence_state
|
||||
from synapse.storage.databases.main.events_worker import EventRedactBehaviour
|
||||
from synapse.streams.config import PaginationConfig
|
||||
from synapse.types import JsonDict, UserID
|
||||
from synapse.visibility import filter_events_for_client
|
||||
|
|
@ -140,11 +139,7 @@ class EventHandler:
|
|||
self.storage = hs.get_storage()
|
||||
|
||||
async def get_event(
|
||||
self,
|
||||
user: UserID,
|
||||
room_id: Optional[str],
|
||||
event_id: str,
|
||||
show_redacted: bool = False,
|
||||
self, user: UserID, room_id: Optional[str], event_id: str
|
||||
) -> Optional[EventBase]:
|
||||
"""Retrieve a single specified event.
|
||||
|
||||
|
|
@ -153,7 +148,6 @@ class EventHandler:
|
|||
room_id: The expected room id. We'll return None if the
|
||||
event's room does not match.
|
||||
event_id: The event ID to obtain.
|
||||
show_redacted: Should the full content of redacted events be returned?
|
||||
Returns:
|
||||
An event, or None if there is no event matching this ID.
|
||||
Raises:
|
||||
|
|
@ -161,12 +155,7 @@ class EventHandler:
|
|||
AuthError if the user does not have the rights to inspect this
|
||||
event.
|
||||
"""
|
||||
redact_behaviour = (
|
||||
EventRedactBehaviour.AS_IS if show_redacted else EventRedactBehaviour.REDACT
|
||||
)
|
||||
event = await self.store.get_event(
|
||||
event_id, check_room_id=room_id, redact_behaviour=redact_behaviour
|
||||
)
|
||||
event = await self.store.get_event(event_id, check_room_id=room_id)
|
||||
|
||||
if not event:
|
||||
return None
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue