diff options
| author | Eric Eastwood <erice@element.io> | 2022-01-13 22:18:55 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-01-13 22:18:55 -0600 |
| commit | cc4eb72f2e3052d4e1a84f4a968da1c99280fe28 (patch) | |
| tree | 3e388bfcb724b776b9dea07f99aa64fcd97a29fa /synapse/handlers/appservice.py | |
| parent | Fix NPE when trying to grab event from wrong roomId (fix sytest) (diff) | |
| parent | Allow tracking puppeted users for MAU (#11561) (diff) | |
| download | synapse-cc4eb72f2e3052d4e1a84f4a968da1c99280fe28.tar.xz | |
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts: scripts-dev/complement.sh
Diffstat (limited to 'synapse/handlers/appservice.py')
| -rw-r--r-- | synapse/handlers/appservice.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py index 9abdad262b..7833e77e2b 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py @@ -462,9 +462,9 @@ class ApplicationServicesHandler: Args: room_alias: The room alias to query. + Returns: - namedtuple: with keys "room_id" and "servers" or None if no - association can be found. + RoomAliasMapping or None if no association can be found. """ room_alias_str = room_alias.to_string() services = self.store.get_app_services() |