diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-10-13 23:06:36 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-10-13 23:06:36 +0100 |
| commit | d9d86c29965ceaf92927f061375a0d7a888aea67 (patch) | |
| tree | 538292119f67565517ce8be9038bf356f4404be0 /synapse/handlers/message.py | |
| parent | Move additional tasks to the background worker, part 4 (#8513) (diff) | |
| download | synapse-d9d86c29965ceaf92927f061375a0d7a888aea67.tar.xz | |
Remove redundant `token_id` parameter to create_event
this is always the same as requester.access_token_id.
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index c52e6824d3..b8f541425b 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -437,7 +437,6 @@ class EventCreationHandler: self, requester: Requester, event_dict: dict, - token_id: Optional[str] = None, txn_id: Optional[str] = None, prev_event_ids: Optional[List[str]] = None, require_consent: bool = True, @@ -453,7 +452,6 @@ class EventCreationHandler: Args: requester event_dict: An entire event - token_id txn_id prev_event_ids: the forward extremities to use as the prev_events for the @@ -511,8 +509,8 @@ class EventCreationHandler: if require_consent and not is_exempt: await self.assert_accepted_privacy_policy(requester) - if token_id is not None: - builder.internal_metadata.token_id = token_id + if requester.access_token_id is not None: + builder.internal_metadata.token_id = requester.access_token_id if txn_id is not None: builder.internal_metadata.txn_id = txn_id @@ -726,7 +724,7 @@ class EventCreationHandler: return event, event.internal_metadata.stream_ordering event, context = await self.create_event( - requester, event_dict, token_id=requester.access_token_id, txn_id=txn_id + requester, event_dict, txn_id=txn_id ) assert self.hs.is_mine_id(event.sender), "User must be our own: %s" % ( |