2014-08-12 08:10:52 -06:00
|
|
|
# -*- coding: utf-8 -*-
|
2016-01-06 21:26:29 -07:00
|
|
|
# Copyright 2014-2016 OpenMarket Ltd
|
2014-08-12 08:10:52 -06:00
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# 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.
|
|
|
|
|
2014-08-12 20:14:34 -06:00
|
|
|
|
2014-08-12 08:10:52 -06:00
|
|
|
from twisted.internet import defer
|
|
|
|
|
|
|
|
from synapse.util.logutils import log_function
|
2015-08-11 10:59:32 -06:00
|
|
|
from synapse.util.caches.expiringcache import ExpiringCache
|
2016-03-22 08:44:48 -06:00
|
|
|
from synapse.util.metrics import Measure
|
2014-12-16 04:29:05 -07:00
|
|
|
from synapse.api.constants import EventTypes
|
2015-01-21 09:27:04 -07:00
|
|
|
from synapse.api.errors import AuthError
|
2015-03-15 18:18:08 -06:00
|
|
|
from synapse.api.auth import AuthEventTypes
|
2014-12-16 08:59:17 -07:00
|
|
|
from synapse.events.snapshot import EventContext
|
2014-10-30 11:00:11 -06:00
|
|
|
|
2014-08-12 08:10:52 -06:00
|
|
|
from collections import namedtuple
|
|
|
|
|
|
|
|
import logging
|
|
|
|
import hashlib
|
2016-03-22 09:31:13 -06:00
|
|
|
import os
|
2014-08-12 08:10:52 -06:00
|
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
|
|
|
|
KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
|
|
|
|
|
|
|
|
|
2016-03-22 09:31:13 -06:00
|
|
|
CACHE_SIZE_FACTOR = float(os.environ.get("SYNAPSE_CACHE_FACTOR", 0.1))
|
|
|
|
|
|
|
|
|
2016-03-23 03:28:07 -06:00
|
|
|
SIZE_OF_CACHE = int(1000 * CACHE_SIZE_FACTOR)
|
2016-03-22 09:31:13 -06:00
|
|
|
EVICTION_TIMEOUT_SECONDS = 60 * 60
|
2015-02-06 09:52:22 -07:00
|
|
|
|
|
|
|
|
2015-02-06 09:08:13 -07:00
|
|
|
class _StateCacheEntry(object):
|
|
|
|
def __init__(self, state, state_group, ts):
|
|
|
|
self.state = state
|
|
|
|
self.state_group = state_group
|
|
|
|
|
|
|
|
|
2014-08-12 08:10:52 -06:00
|
|
|
class StateHandler(object):
|
2014-10-14 09:59:51 -06:00
|
|
|
""" Responsible for doing state conflict resolution.
|
2014-08-12 08:10:52 -06:00
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, hs):
|
2015-02-06 09:08:13 -07:00
|
|
|
self.clock = hs.get_clock()
|
2014-08-12 08:10:52 -06:00
|
|
|
self.store = hs.get_datastore()
|
2015-01-21 09:27:04 -07:00
|
|
|
self.hs = hs
|
2014-08-12 08:10:52 -06:00
|
|
|
|
2015-02-06 09:52:22 -07:00
|
|
|
# dict of set of event_ids -> _StateCacheEntry.
|
|
|
|
self._state_cache = None
|
|
|
|
|
|
|
|
def start_caching(self):
|
|
|
|
logger.debug("start_caching")
|
|
|
|
|
2015-02-16 09:16:47 -07:00
|
|
|
self._state_cache = ExpiringCache(
|
|
|
|
cache_name="state_cache",
|
|
|
|
clock=self.clock,
|
|
|
|
max_len=SIZE_OF_CACHE,
|
2016-02-02 10:18:50 -07:00
|
|
|
expiry_ms=EVICTION_TIMEOUT_SECONDS * 1000,
|
2015-02-16 09:16:47 -07:00
|
|
|
reset_expiry_on_get=True,
|
|
|
|
)
|
2015-02-06 09:08:13 -07:00
|
|
|
|
2015-02-16 09:16:47 -07:00
|
|
|
self._state_cache.start()
|
2015-02-06 09:08:13 -07:00
|
|
|
|
2014-10-17 11:56:42 -06:00
|
|
|
@defer.inlineCallbacks
|
2016-04-01 09:17:32 -06:00
|
|
|
def get_current_state(self, room_id, event_type=None, state_key="",
|
|
|
|
latest_event_ids=None):
|
2015-11-13 03:31:15 -07:00
|
|
|
""" Retrieves the current state for the room. This is done by
|
2014-11-11 10:45:46 -07:00
|
|
|
calling `get_latest_events_in_room` to get the leading edges of the
|
|
|
|
event graph and then resolving any of the state conflicts.
|
|
|
|
|
|
|
|
This is equivalent to getting the state of an event that were to send
|
|
|
|
next before receiving any new events.
|
|
|
|
|
|
|
|
If `event_type` is specified, then the method returns only the one
|
|
|
|
event (or None) with that `event_type` and `state_key`.
|
2015-11-13 03:31:15 -07:00
|
|
|
|
2016-04-01 09:08:59 -06:00
|
|
|
Returns:
|
|
|
|
map from (type, state_key) to event
|
2014-11-11 10:45:46 -07:00
|
|
|
"""
|
2016-04-01 09:17:32 -06:00
|
|
|
if not latest_event_ids:
|
|
|
|
latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
|
2014-10-17 11:56:42 -06:00
|
|
|
|
2016-04-01 09:17:32 -06:00
|
|
|
res = yield self.resolve_state_groups(room_id, latest_event_ids)
|
2016-03-22 12:02:36 -06:00
|
|
|
state = res[1]
|
2014-10-17 11:56:42 -06:00
|
|
|
|
|
|
|
if event_type:
|
2015-02-06 09:17:05 -07:00
|
|
|
defer.returnValue(state.get((event_type, state_key)))
|
2014-10-17 11:56:42 -06:00
|
|
|
return
|
|
|
|
|
2015-02-10 04:04:37 -07:00
|
|
|
defer.returnValue(state)
|
2014-10-17 11:56:42 -06:00
|
|
|
|
2014-12-05 09:20:48 -07:00
|
|
|
@defer.inlineCallbacks
|
2016-03-31 08:32:24 -06:00
|
|
|
def compute_event_context(self, event, old_state=None):
|
2014-12-16 06:07:48 -07:00
|
|
|
""" Fills out the context with the `current state` of the graph. The
|
2014-12-16 06:32:06 -07:00
|
|
|
`current state` here is defined to be the state of the event graph
|
|
|
|
just before the event - i.e. it never includes `event`
|
2014-12-16 06:07:48 -07:00
|
|
|
|
|
|
|
If `event` has `auth_events` then this will also fill out the
|
|
|
|
`auth_events` field on `context` from the `current_state`.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
event (EventBase)
|
2014-12-16 08:59:17 -07:00
|
|
|
Returns:
|
|
|
|
an EventContext
|
2014-12-16 06:07:48 -07:00
|
|
|
"""
|
2014-12-16 08:59:17 -07:00
|
|
|
context = EventContext()
|
|
|
|
|
2016-03-31 08:32:24 -06:00
|
|
|
if event.internal_metadata.is_outlier():
|
2015-06-03 09:43:40 -06:00
|
|
|
# If this is an outlier, then we know it shouldn't have any current
|
|
|
|
# state. Certainly store.get_current_state won't return any, and
|
|
|
|
# persisting the event won't store the state group.
|
2015-06-03 09:30:01 -06:00
|
|
|
if old_state:
|
|
|
|
context.current_state = {
|
|
|
|
(s.type, s.state_key): s for s in old_state
|
|
|
|
}
|
|
|
|
else:
|
|
|
|
context.current_state = {}
|
|
|
|
context.prev_state_events = []
|
|
|
|
context.state_group = None
|
|
|
|
defer.returnValue(context)
|
2014-12-08 02:08:26 -07:00
|
|
|
|
|
|
|
if old_state:
|
|
|
|
context.current_state = {
|
|
|
|
(s.type, s.state_key): s for s in old_state
|
|
|
|
}
|
|
|
|
context.state_group = None
|
2014-12-10 03:06:12 -07:00
|
|
|
|
2014-12-11 06:25:19 -07:00
|
|
|
if event.is_state():
|
|
|
|
key = (event.type, event.state_key)
|
|
|
|
if key in context.current_state:
|
|
|
|
replaces = context.current_state[key]
|
2014-12-11 08:56:01 -07:00
|
|
|
if replaces.event_id != event.event_id: # Paranoia check
|
|
|
|
event.unsigned["replaces_state"] = replaces.event_id
|
2014-12-11 06:25:19 -07:00
|
|
|
|
2014-12-16 08:59:17 -07:00
|
|
|
context.prev_state_events = []
|
|
|
|
defer.returnValue(context)
|
2014-12-08 02:08:26 -07:00
|
|
|
|
2014-12-05 09:20:48 -07:00
|
|
|
if event.is_state():
|
|
|
|
ret = yield self.resolve_state_groups(
|
2015-08-05 08:06:51 -06:00
|
|
|
event.room_id, [e for e, _ in event.prev_events],
|
2014-12-08 07:50:48 -07:00
|
|
|
event_type=event.type,
|
2014-12-05 09:20:48 -07:00
|
|
|
state_key=event.state_key,
|
|
|
|
)
|
|
|
|
else:
|
|
|
|
ret = yield self.resolve_state_groups(
|
2015-08-05 08:06:51 -06:00
|
|
|
event.room_id, [e for e, _ in event.prev_events],
|
2014-12-05 09:20:48 -07:00
|
|
|
)
|
|
|
|
|
|
|
|
group, curr_state, prev_state = ret
|
|
|
|
|
|
|
|
context.current_state = curr_state
|
2014-12-08 10:50:56 -07:00
|
|
|
context.state_group = group if not event.is_state() else None
|
2014-12-05 09:20:48 -07:00
|
|
|
|
2014-12-11 06:25:19 -07:00
|
|
|
if event.is_state():
|
|
|
|
key = (event.type, event.state_key)
|
|
|
|
if key in context.current_state:
|
|
|
|
replaces = context.current_state[key]
|
|
|
|
event.unsigned["replaces_state"] = replaces.event_id
|
|
|
|
|
2014-12-16 08:59:17 -07:00
|
|
|
context.prev_state_events = prev_state
|
|
|
|
defer.returnValue(context)
|
2014-12-05 09:20:48 -07:00
|
|
|
|
2014-10-17 11:56:42 -06:00
|
|
|
@defer.inlineCallbacks
|
|
|
|
@log_function
|
2015-08-05 08:06:51 -06:00
|
|
|
def resolve_state_groups(self, room_id, event_ids, event_type=None, state_key=""):
|
2014-11-11 10:45:46 -07:00
|
|
|
""" Given a list of event_ids this method fetches the state at each
|
|
|
|
event, resolves conflicts between them and returns them.
|
|
|
|
|
2016-04-01 09:08:59 -06:00
|
|
|
Returns:
|
|
|
|
a Deferred tuple of (`state_group`, `state`, `prev_state`).
|
|
|
|
`state_group` is the name of a state group if one and only one is
|
|
|
|
involved. `state` is a map from (type, state_key) to event, and
|
|
|
|
`prev_state` is a list of event ids.
|
2014-11-11 10:45:46 -07:00
|
|
|
"""
|
2015-01-30 06:34:01 -07:00
|
|
|
logger.debug("resolve_state_groups event_ids %s", event_ids)
|
|
|
|
|
2014-10-14 09:59:51 -06:00
|
|
|
state_groups = yield self.store.get_state_groups(
|
2015-08-05 08:06:51 -06:00
|
|
|
room_id, event_ids
|
2014-10-14 09:59:51 -06:00
|
|
|
)
|
|
|
|
|
2015-01-30 06:34:01 -07:00
|
|
|
logger.debug(
|
|
|
|
"resolve_state_groups state_groups %s",
|
|
|
|
state_groups.keys()
|
|
|
|
)
|
|
|
|
|
2016-03-22 12:02:36 -06:00
|
|
|
group_names = frozenset(state_groups.keys())
|
2014-11-11 07:16:41 -07:00
|
|
|
if len(group_names) == 1:
|
|
|
|
name, state_list = state_groups.items().pop()
|
|
|
|
state = {
|
|
|
|
(e.type, e.state_key): e
|
|
|
|
for e in state_list
|
|
|
|
}
|
2014-12-04 04:27:59 -07:00
|
|
|
prev_state = state.get((event_type, state_key), None)
|
|
|
|
if prev_state:
|
|
|
|
prev_state = prev_state.event_id
|
2014-12-08 07:50:48 -07:00
|
|
|
prev_states = [prev_state]
|
|
|
|
else:
|
|
|
|
prev_states = []
|
|
|
|
|
2016-03-22 12:02:36 -06:00
|
|
|
defer.returnValue((name, state, prev_states))
|
|
|
|
|
|
|
|
if self._state_cache is not None:
|
|
|
|
cache = self._state_cache.get(group_names, None)
|
2016-04-20 04:39:54 -06:00
|
|
|
if cache:
|
2016-03-22 12:02:36 -06:00
|
|
|
cache.ts = self.clock.time_msec()
|
2015-02-06 09:08:13 -07:00
|
|
|
|
2016-03-22 12:02:36 -06:00
|
|
|
event_dict = yield self.store.get_events(cache.state.values())
|
|
|
|
state = {(e.type, e.state_key): e for e in event_dict.values()}
|
2015-02-06 09:08:13 -07:00
|
|
|
|
2016-03-22 12:02:36 -06:00
|
|
|
prev_state = state.get((event_type, state_key), None)
|
|
|
|
if prev_state:
|
|
|
|
prev_state = prev_state.event_id
|
|
|
|
prev_states = [prev_state]
|
|
|
|
else:
|
|
|
|
prev_states = []
|
|
|
|
defer.returnValue(
|
|
|
|
(cache.state_group, state, prev_states)
|
|
|
|
)
|
2014-11-11 07:16:41 -07:00
|
|
|
|
2016-04-20 04:06:02 -06:00
|
|
|
logger.info("Resolving state for %s with %d groups", room_id, len(state_groups))
|
|
|
|
|
2015-02-13 07:20:05 -07:00
|
|
|
new_state, prev_states = self._resolve_events(
|
|
|
|
state_groups.values(), event_type, state_key
|
|
|
|
)
|
|
|
|
|
2016-04-20 04:39:54 -06:00
|
|
|
state_group = None
|
|
|
|
new_state_event_ids = frozenset(e.event_id for e in new_state.values())
|
|
|
|
for sg, events in state_groups.items():
|
|
|
|
if new_state_event_ids == frozenset(e.event_id for e in events):
|
|
|
|
state_group = sg
|
|
|
|
break
|
|
|
|
|
2015-02-13 07:20:05 -07:00
|
|
|
if self._state_cache is not None:
|
|
|
|
cache = _StateCacheEntry(
|
2016-03-22 09:31:13 -06:00
|
|
|
state={key: event.event_id for key, event in new_state.items()},
|
2016-04-20 04:39:54 -06:00
|
|
|
state_group=state_group,
|
2015-02-13 07:20:05 -07:00
|
|
|
ts=self.clock.time_msec()
|
|
|
|
)
|
|
|
|
|
2016-03-22 12:02:36 -06:00
|
|
|
self._state_cache[group_names] = cache
|
2015-02-13 07:20:05 -07:00
|
|
|
|
2016-04-20 04:39:54 -06:00
|
|
|
defer.returnValue((state_group, new_state, prev_states))
|
2015-02-13 07:20:05 -07:00
|
|
|
|
|
|
|
def resolve_events(self, state_sets, event):
|
2016-04-20 04:06:02 -06:00
|
|
|
logger.info(
|
|
|
|
"Resolving state for %s with %d groups", event.room_id, len(state_sets)
|
|
|
|
)
|
2015-02-13 07:20:05 -07:00
|
|
|
if event.is_state():
|
|
|
|
return self._resolve_events(
|
|
|
|
state_sets, event.type, event.state_key
|
|
|
|
)
|
|
|
|
else:
|
|
|
|
return self._resolve_events(state_sets)
|
|
|
|
|
|
|
|
def _resolve_events(self, state_sets, event_type=None, state_key=""):
|
2015-11-13 03:31:15 -07:00
|
|
|
"""
|
2016-04-01 09:08:59 -06:00
|
|
|
Returns
|
|
|
|
(dict[(str, str), synapse.events.FrozenEvent], list[str]): a tuple
|
|
|
|
(new_state, prev_states). new_state is a map from (type, state_key)
|
|
|
|
to event. prev_states is a list of event_ids.
|
2015-11-13 03:31:15 -07:00
|
|
|
"""
|
2016-03-22 08:44:48 -06:00
|
|
|
with Measure(self.clock, "state._resolve_events"):
|
|
|
|
state = {}
|
|
|
|
for st in state_sets:
|
|
|
|
for e in st:
|
|
|
|
state.setdefault(
|
|
|
|
(e.type, e.state_key),
|
|
|
|
{}
|
|
|
|
)[e.event_id] = e
|
|
|
|
|
|
|
|
unconflicted_state = {
|
|
|
|
k: v.values()[0] for k, v in state.items()
|
|
|
|
if len(v.values()) == 1
|
|
|
|
}
|
2014-10-14 09:59:51 -06:00
|
|
|
|
2016-03-22 08:44:48 -06:00
|
|
|
conflicted_state = {
|
|
|
|
k: v.values()
|
|
|
|
for k, v in state.items()
|
|
|
|
if len(v.values()) > 1
|
|
|
|
}
|
|
|
|
|
|
|
|
if event_type:
|
|
|
|
prev_states_events = conflicted_state.get(
|
|
|
|
(event_type, state_key), []
|
|
|
|
)
|
|
|
|
prev_states = [s.event_id for s in prev_states_events]
|
|
|
|
else:
|
|
|
|
prev_states = []
|
2014-12-04 04:27:59 -07:00
|
|
|
|
2016-03-22 08:44:48 -06:00
|
|
|
auth_events = {
|
|
|
|
k: e for k, e in unconflicted_state.items()
|
|
|
|
if k[0] in AuthEventTypes
|
|
|
|
}
|
2015-01-21 09:27:04 -07:00
|
|
|
|
2016-03-22 08:44:48 -06:00
|
|
|
try:
|
|
|
|
resolved_state = self._resolve_state_events(
|
|
|
|
conflicted_state, auth_events
|
|
|
|
)
|
|
|
|
except:
|
|
|
|
logger.exception("Failed to resolve state")
|
|
|
|
raise
|
2014-10-14 09:59:51 -06:00
|
|
|
|
2016-03-22 08:44:48 -06:00
|
|
|
new_state = unconflicted_state
|
|
|
|
new_state.update(resolved_state)
|
2015-01-21 09:27:04 -07:00
|
|
|
|
2015-02-13 07:20:05 -07:00
|
|
|
return new_state, prev_states
|
2014-10-14 09:59:51 -06:00
|
|
|
|
2014-10-17 11:56:42 -06:00
|
|
|
@log_function
|
2015-01-21 09:27:04 -07:00
|
|
|
def _resolve_state_events(self, conflicted_state, auth_events):
|
2015-01-21 09:44:04 -07:00
|
|
|
""" This is where we actually decide which of the conflicted state to
|
|
|
|
use.
|
|
|
|
|
|
|
|
We resolve conflicts in the following order:
|
|
|
|
1. power levels
|
2015-11-12 06:10:25 -07:00
|
|
|
2. join rules
|
|
|
|
3. memberships
|
|
|
|
4. other events.
|
2015-01-21 09:44:04 -07:00
|
|
|
"""
|
2015-01-21 09:27:04 -07:00
|
|
|
resolved_state = {}
|
|
|
|
power_key = (EventTypes.PowerLevels, "")
|
2015-11-12 06:10:25 -07:00
|
|
|
if power_key in conflicted_state:
|
|
|
|
events = conflicted_state[power_key]
|
|
|
|
logger.debug("Resolving conflicted power levels %r", events)
|
|
|
|
resolved_state[power_key] = self._resolve_auth_events(
|
|
|
|
events, auth_events)
|
2015-01-21 09:27:04 -07:00
|
|
|
|
|
|
|
auth_events.update(resolved_state)
|
|
|
|
|
2015-02-04 03:36:28 -07:00
|
|
|
for key, events in conflicted_state.items():
|
|
|
|
if key[0] == EventTypes.JoinRules:
|
2015-11-12 06:10:25 -07:00
|
|
|
logger.debug("Resolving conflicted join rules %r", events)
|
2015-02-04 03:36:28 -07:00
|
|
|
resolved_state[key] = self._resolve_auth_events(
|
|
|
|
events,
|
|
|
|
auth_events
|
|
|
|
)
|
|
|
|
|
|
|
|
auth_events.update(resolved_state)
|
|
|
|
|
2015-01-21 09:27:04 -07:00
|
|
|
for key, events in conflicted_state.items():
|
|
|
|
if key[0] == EventTypes.Member:
|
2015-11-12 06:10:25 -07:00
|
|
|
logger.debug("Resolving conflicted member lists %r", events)
|
2015-01-21 09:27:04 -07:00
|
|
|
resolved_state[key] = self._resolve_auth_events(
|
|
|
|
events,
|
|
|
|
auth_events
|
|
|
|
)
|
2014-10-14 09:59:51 -06:00
|
|
|
|
2015-01-21 09:27:04 -07:00
|
|
|
auth_events.update(resolved_state)
|
2014-10-14 09:59:51 -06:00
|
|
|
|
2015-01-21 09:27:04 -07:00
|
|
|
for key, events in conflicted_state.items():
|
|
|
|
if key not in resolved_state:
|
2015-11-12 06:10:25 -07:00
|
|
|
logger.debug("Resolving conflicted state %r:%r", key, events)
|
2015-01-21 09:27:04 -07:00
|
|
|
resolved_state[key] = self._resolve_normal_events(
|
|
|
|
events, auth_events
|
|
|
|
)
|
2014-11-05 04:07:54 -07:00
|
|
|
|
2015-01-21 09:27:04 -07:00
|
|
|
return resolved_state
|
2014-10-14 09:59:51 -06:00
|
|
|
|
2015-01-21 09:27:04 -07:00
|
|
|
def _resolve_auth_events(self, events, auth_events):
|
|
|
|
reverse = [i for i in reversed(self._ordered_events(events))]
|
2014-10-14 09:59:51 -06:00
|
|
|
|
2015-01-21 09:27:04 -07:00
|
|
|
auth_events = dict(auth_events)
|
|
|
|
|
|
|
|
prev_event = reverse[0]
|
|
|
|
for event in reverse[1:]:
|
|
|
|
auth_events[(prev_event.type, prev_event.state_key)] = prev_event
|
|
|
|
try:
|
|
|
|
# FIXME: hs.get_auth() is bad style, but we need to do it to
|
|
|
|
# get around circular deps.
|
|
|
|
self.hs.get_auth().check(event, auth_events)
|
|
|
|
prev_event = event
|
|
|
|
except AuthError:
|
|
|
|
return prev_event
|
|
|
|
|
|
|
|
return event
|
|
|
|
|
|
|
|
def _resolve_normal_events(self, events, auth_events):
|
|
|
|
for event in self._ordered_events(events):
|
|
|
|
try:
|
|
|
|
# FIXME: hs.get_auth() is bad style, but we need to do it to
|
|
|
|
# get around circular deps.
|
|
|
|
self.hs.get_auth().check(event, auth_events)
|
|
|
|
return event
|
2015-01-22 08:57:08 -07:00
|
|
|
except AuthError:
|
2015-01-21 09:27:04 -07:00
|
|
|
pass
|
|
|
|
|
2015-01-30 07:37:19 -07:00
|
|
|
# Use the last event (the one with the least depth) if they all fail
|
|
|
|
# the auth check.
|
2015-01-21 09:27:04 -07:00
|
|
|
return event
|
|
|
|
|
|
|
|
def _ordered_events(self, events):
|
|
|
|
def key_func(e):
|
|
|
|
return -int(e.depth), hashlib.sha1(e.event_id).hexdigest()
|
|
|
|
|
2015-01-30 06:52:02 -07:00
|
|
|
return sorted(events, key=key_func)
|