|
|
@@ -22,7 +22,6 @@ from twisted.internet.error import AlreadyCalled, AlreadyCancelled |
|
|
|
from synapse.metrics.background_process_metrics import run_as_background_process |
|
|
|
from synapse.push import Pusher |
|
|
|
from synapse.push.mailer import Mailer |
|
|
|
from synapse.types import RoomStreamToken |
|
|
|
|
|
|
|
if TYPE_CHECKING: |
|
|
|
from synapse.app.homeserver import HomeServer |
|
|
@@ -93,20 +92,6 @@ class EmailPusher(Pusher): |
|
|
|
pass |
|
|
|
self.timed_call = None |
|
|
|
|
|
|
|
def on_new_notifications(self, max_token: RoomStreamToken) -> None: |
|
|
|
# We just use the minimum stream ordering and ignore the vector clock |
|
|
|
# component. This is safe to do as long as we *always* ignore the vector |
|
|
|
# clock components. |
|
|
|
max_stream_ordering = max_token.stream |
|
|
|
|
|
|
|
if self.max_stream_ordering: |
|
|
|
self.max_stream_ordering = max( |
|
|
|
max_stream_ordering, self.max_stream_ordering |
|
|
|
) |
|
|
|
else: |
|
|
|
self.max_stream_ordering = max_stream_ordering |
|
|
|
self._start_processing() |
|
|
|
|
|
|
|
def on_new_receipts(self, min_stream_id: int, max_stream_id: int) -> None: |
|
|
|
# We could wake up and cancel the timer but there tend to be quite a |
|
|
|
# lot of read receipts so it's probably less work to just let the |
|
|
@@ -172,7 +157,6 @@ class EmailPusher(Pusher): |
|
|
|
being run. |
|
|
|
""" |
|
|
|
start = 0 if INCLUDE_ALL_UNREAD_NOTIFS else self.last_stream_ordering |
|
|
|
assert self.max_stream_ordering is not None |
|
|
|
unprocessed = await self.store.get_unread_push_actions_for_user_in_range_for_email( |
|
|
|
self.user_id, start, self.max_stream_ordering |
|
|
|
) |
|
|
|