Merge remote-tracking branch 'upstream/release-v1.49'

This commit is contained in:
Tulir Asokan 2021-12-07 16:54:59 +02:00
commit 08a269e2af
165 changed files with 7713 additions and 2703 deletions

View file

@ -26,6 +26,7 @@ from synapse.events import EventBase
from synapse.logging import opentracing
from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.push import Pusher, PusherConfig, PusherConfigException
from synapse.storage.databases.main.event_push_actions import HttpPushAction
from . import push_rule_evaluator, push_tools
@ -266,7 +267,7 @@ class HttpPusher(Pusher):
)
break
async def _process_one(self, push_action: dict) -> bool:
async def _process_one(self, push_action: HttpPushAction) -> bool:
if "notify" not in push_action["actions"]:
return True