OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Update type of `EventContext.rejected` (#13460)

pull/13463/head
Richard van der Hoff 2022-08-04 17:45:01 +01:00 committed by GitHub
parent e9e6aacfbe
commit 96d92156d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13460.misc Normal file
View File

@ -0,0 +1 @@
Update type of `EventContext.rejected`.

7
synapse/events/snapshot.py
View File

@ -11,11 +11,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from typing import TYPE_CHECKING, List, Optional, Tuple, Union from typing import TYPE_CHECKING, List, Optional, Tuple
import attr import attr
from frozendict import frozendict from frozendict import frozendict
from typing_extensions import Literal
from synapse.appservice import ApplicationService from synapse.appservice import ApplicationService
from synapse.events import EventBase from synapse.events import EventBase
@ -33,7 +32,7 @@ class EventContext:
Holds information relevant to persisting an event Holds information relevant to persisting an event
Attributes: 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 _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 are persisted with a state group which includes the new event, so this is
@ -85,7 +84,7 @@ class EventContext:
""" """
_storage: "StorageControllers" _storage: "StorageControllers"
rejected: Union[Literal[False], str] = False rejected: Optional[str] = None
_state_group: Optional[int] = None _state_group: Optional[int] = None
state_group_before_event: Optional[int] = None state_group_before_event: Optional[int] = None
_state_delta_due_to_event: Optional[StateMap[str]] = None _state_delta_due_to_event: Optional[StateMap[str]] = None

2
synapse/storage/databases/main/events.py
View File

@ -1490,7 +1490,7 @@ class PersistEventsStore:
event.sender, event.sender,
"url" in event.content and isinstance(event.content["url"], str), "url" in event.content and isinstance(event.content["url"], str),
event.get_state_key(), event.get_state_key(),
context.rejected or None, context.rejected,
) )
for event, context in events_and_contexts for event, context in events_and_contexts
), ),