mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-24 05:04:01 +01:00
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/schema/delta/v12.sql
This commit is contained in:
commit
c515d37797
4 changed files with 7 additions and 10 deletions
2
setup.py
2
setup.py
|
@ -33,7 +33,7 @@ setup(
|
|||
install_requires=[
|
||||
"syutil==0.0.2",
|
||||
"matrix_angular_sdk==0.6.0",
|
||||
"Twisted>=14.0.0",
|
||||
"Twisted==14.0.2",
|
||||
"service_identity>=1.0.0",
|
||||
"pyopenssl>=0.14",
|
||||
"pyyaml",
|
||||
|
|
|
@ -6,7 +6,7 @@ logger = logging.getLogger(__name__)
|
|||
REQUIREMENTS = {
|
||||
"syutil==0.0.2": ["syutil"],
|
||||
"matrix_angular_sdk==0.6.0": ["syweb>=0.6.0"],
|
||||
"Twisted>=14.0.0": ["twisted>=14.0.0"],
|
||||
"Twisted==14.0.2": ["twisted==14.0.2"],
|
||||
"service_identity>=1.0.0": ["service_identity>=1.0.0"],
|
||||
"pyopenssl>=0.14": ["OpenSSL>=0.14"],
|
||||
"pyyaml": ["yaml"],
|
||||
|
|
|
@ -37,13 +37,15 @@ def _get_state_key_from_event(event):
|
|||
KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
|
||||
|
||||
|
||||
AuthEventTypes = (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,)
|
||||
|
||||
|
||||
class StateHandler(object):
|
||||
""" Responsible for doing state conflict resolution.
|
||||
"""
|
||||
|
||||
def __init__(self, hs):
|
||||
self.store = hs.get_datastore()
|
||||
# self.auth = hs.get_auth()
|
||||
self.hs = hs
|
||||
|
||||
@defer.inlineCallbacks
|
||||
|
@ -231,7 +233,7 @@ class StateHandler(object):
|
|||
|
||||
auth_events = {
|
||||
k: e for k, e in unconflicted_state.items()
|
||||
if k[0] in (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,)
|
||||
if k[0] in AuthEventTypes
|
||||
}
|
||||
|
||||
try:
|
||||
|
@ -317,4 +319,4 @@ class StateHandler(object):
|
|||
def key_func(e):
|
||||
return -int(e.depth), hashlib.sha1(e.event_id).hexdigest()
|
||||
|
||||
return sorted(events, key=key_func)
|
||||
return sorted(events, key=key_func)
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
/* Copyright 2015 OpenMarket Ltd
|
||||
=======
|
||||
/* Copyright 2014 OpenMarket Ltd
|
||||
>>>>>>> fc946f3b8da8c7f71a9c25bf542c04472147bc5b
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -57,4 +53,3 @@ CREATE TABLE IF NOT EXISTS push_rules (
|
|||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS push_rules_user_name on push_rules (user_name);
|
||||
|
||||
|
|
Loading…
Reference in a new issue