Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Check that an appservice protocol has at least one service providing it #10532

Merged
merged 8 commits into from
Aug 5, 2021
+125 −5
Merged

Check that an appservice protocol has at least one service providing it #10532

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1cc4a3d
Check that a appservice protocol has at least one service
Half-Shot Aug 4, 2021
67527f6
Remove len
Half-Shot Aug 4, 2021
91c4d3f
Remove redundant if check
Half-Shot Aug 4, 2021
aeb8046
Lint
clokep Aug 4, 2021
d5e8636
Add tests for get_3pe_protocols
Half-Shot Aug 4, 2021
5704f62
Merge branch 'hs/only-show-protocols-if-one-service-exists' of github…
Half-Shot Aug 4, 2021
cced86e
Name function s/someFunc/get_3pe_protocol
Half-Shot Aug 4, 2021
8eb7479
Update changelog.d/10532.bugfix
Half-Shot Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions synapse/handlers/appservice.py
View file
Original file line number Diff line number Diff line change
@@ -404,9 +404,7 @@ def _merge_instances(infos: List[JsonDict]) -> JsonDict:
return combined

return {
p: _merge_instances(protocols[p])
for p in protocols.keys()
if protocols[p]
p: _merge_instances(protocols[p]) for p in protocols.keys() if protocols[p]
}

async def _get_services_for_event(