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

This commit is contained in:
Tulir Asokan 2022-02-01 14:22:34 +02:00
commit 9870604741
102 changed files with 2730 additions and 816 deletions

View file

@ -87,7 +87,7 @@ async def filter_events_for_client(
)
ignore_dict_content = await storage.main.get_global_account_data_by_type_for_user(
AccountDataTypes.IGNORED_USER_LIST, user_id
user_id, AccountDataTypes.IGNORED_USER_LIST
)
ignore_list: FrozenSet[str] = frozenset()