diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2022-08-04 17:45:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 17:45:01 +0100 |
| commit | 96d92156d0f820224f68092e72d6089dceef715a (patch) | |
| tree | a1d5ae6a4a43671dc763d544b5385f62f4b9fc38 | |
| parent | Faster Room Joins: prevent Synapse from answering federated join requests for... (diff) | |
| download | synapse-96d92156d0f820224f68092e72d6089dceef715a.tar.xz | |
Update type of `EventContext.rejected` (#13460)
| -rw-r--r-- | changelog.d/13460.misc | 1 | ||||
| -rw-r--r-- | synapse/events/snapshot.py | 7 | ||||
| -rw-r--r-- | synapse/storage/databases/main/events.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/changelog.d/13460.misc b/changelog.d/13460.misc new file mode 100644 index 0000000000..f9e9de219d --- /dev/null +++ b/changelog.d/13460.misc @@ -0,0 +1 @@ +Update type of `EventContext.rejected`. diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index b700cbbfa1..d3c8083e4a 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -11,11 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import TYPE_CHECKING, List, Optional, Tuple, Union +from typing import TYPE_CHECKING, List, Optional, Tuple import attr from frozendict import frozendict -from typing_extensions import Literal from synapse.appservice import ApplicationService from synapse.events import EventBase @@ -33,7 +32,7 @@ class EventContext: Holds information relevant to persisting an event Attributes: - rejected: A rejection reason if the event was rejected, else False + rejected: A rejection reason if the event was rejected, else None _state_group: The ID of the state group for this event. Note that state events are persisted with a state group which includes the new event, so this is @@ -85,7 +84,7 @@ class EventContext: """ _storage: "StorageControllers" - rejected: Union[Literal[False], str] = False + rejected: Optional[str] = None _state_group: Optional[int] = None state_group_before_event: Optional[int] = None _state_delta_due_to_event: Optional[StateMap[str]] = None diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py index 1f600f1190..5560b38a48 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py @@ -1490,7 +1490,7 @@ class PersistEventsStore: event.sender, "url" in event.content and isinstance(event.content["url"], str), event.get_state_key(), - context.rejected or None, + context.rejected, ) for event, context in events_and_contexts ), |