mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-12-15 21:43:48 -05:00
Replace returnValue with return (#5736)
This commit is contained in:
Amber Brown
GitHub
parent
18a466b84e
commit
4806651744
177 changed files with 1359 additions and 1513 deletions
|
|
@ -54,7 +54,7 @@ class ClientDirectoryServer(RestServlet):
|
|||
dir_handler = self.handlers.directory_handler
|
||||
res = yield dir_handler.get_association(room_alias)
|
||||
|
||||
defer.returnValue((200, res))
|
||||
return (200, res)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, room_alias):
|
||||
|
|
@ -87,7 +87,7 @@ class ClientDirectoryServer(RestServlet):
|
|||
requester, room_alias, room_id, servers
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, room_alias):
|
||||
|
|
@ -102,7 +102,7 @@ class ClientDirectoryServer(RestServlet):
|
|||
service.url,
|
||||
room_alias.to_string(),
|
||||
)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
except InvalidClientCredentialsError:
|
||||
# fallback to default user behaviour if they aren't an AS
|
||||
pass
|
||||
|
|
@ -118,7 +118,7 @@ class ClientDirectoryServer(RestServlet):
|
|||
"User %s deleted alias %s", user.to_string(), room_alias.to_string()
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class ClientDirectoryListServer(RestServlet):
|
||||
|
|
@ -136,9 +136,7 @@ class ClientDirectoryListServer(RestServlet):
|
|||
if room is None:
|
||||
raise NotFoundError("Unknown room")
|
||||
|
||||
defer.returnValue(
|
||||
(200, {"visibility": "public" if room["is_public"] else "private"})
|
||||
)
|
||||
return (200, {"visibility": "public" if room["is_public"] else "private"})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, room_id):
|
||||
|
|
@ -151,7 +149,7 @@ class ClientDirectoryListServer(RestServlet):
|
|||
requester, room_id, visibility
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, room_id):
|
||||
|
|
@ -161,7 +159,7 @@ class ClientDirectoryListServer(RestServlet):
|
|||
requester, room_id, "private"
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class ClientAppserviceDirectoryListServer(RestServlet):
|
||||
|
|
@ -195,4 +193,4 @@ class ClientAppserviceDirectoryListServer(RestServlet):
|
|||
requester.app_service.id, network_id, room_id, visibility
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class EventStreamRestServlet(RestServlet):
|
|||
is_guest=is_guest,
|
||||
)
|
||||
|
||||
defer.returnValue((200, chunk))
|
||||
return (200, chunk)
|
||||
|
||||
def on_OPTIONS(self, request):
|
||||
return (200, {})
|
||||
|
|
@ -91,9 +91,9 @@ class EventRestServlet(RestServlet):
|
|||
time_now = self.clock.time_msec()
|
||||
if event:
|
||||
event = yield self._event_serializer.serialize_event(event, time_now)
|
||||
defer.returnValue((200, event))
|
||||
return (200, event)
|
||||
else:
|
||||
defer.returnValue((404, "Event not found."))
|
||||
return (404, "Event not found.")
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class InitialSyncRestServlet(RestServlet):
|
|||
include_archived=include_archived,
|
||||
)
|
||||
|
||||
defer.returnValue((200, content))
|
||||
return (200, content)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ class LoginRestServlet(RestServlet):
|
|||
well_known_data = self._well_known_builder.get_well_known()
|
||||
if well_known_data:
|
||||
result["well_known"] = well_known_data
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _do_other_login(self, login_submission):
|
||||
|
|
@ -212,7 +212,7 @@ class LoginRestServlet(RestServlet):
|
|||
result = yield self._register_device_with_callback(
|
||||
canonical_user_id, login_submission, callback_3pid
|
||||
)
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
# No password providers were able to handle this 3pid
|
||||
# Check local store
|
||||
|
|
@ -241,7 +241,7 @@ class LoginRestServlet(RestServlet):
|
|||
result = yield self._register_device_with_callback(
|
||||
canonical_user_id, login_submission, callback
|
||||
)
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def _register_device_with_callback(self, user_id, login_submission, callback=None):
|
||||
|
|
@ -273,7 +273,7 @@ class LoginRestServlet(RestServlet):
|
|||
if callback is not None:
|
||||
yield callback(result)
|
||||
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def do_token_login(self, login_submission):
|
||||
|
|
@ -284,7 +284,7 @@ class LoginRestServlet(RestServlet):
|
|||
)
|
||||
|
||||
result = yield self._register_device_with_callback(user_id, login_submission)
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def do_jwt_login(self, login_submission):
|
||||
|
|
@ -321,7 +321,7 @@ class LoginRestServlet(RestServlet):
|
|||
result = yield self._register_device_with_callback(
|
||||
registered_user_id, login_submission
|
||||
)
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
|
||||
class BaseSSORedirectServlet(RestServlet):
|
||||
|
|
@ -395,7 +395,7 @@ class CasTicketServlet(RestServlet):
|
|||
# even if that's being used old-http style to signal end-of-data
|
||||
body = pde.response
|
||||
result = yield self.handle_cas_response(request, body, client_redirect_url)
|
||||
defer.returnValue(result)
|
||||
return result
|
||||
|
||||
def handle_cas_response(self, request, cas_response_body, client_redirect_url):
|
||||
user, attributes = self.parse_cas_response(cas_response_body)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class LogoutRestServlet(RestServlet):
|
|||
requester.user.to_string(), requester.device_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class LogoutAllRestServlet(RestServlet):
|
||||
|
|
@ -75,7 +75,7 @@ class LogoutAllRestServlet(RestServlet):
|
|||
# .. and then delete any access tokens which weren't associated with
|
||||
# devices.
|
||||
yield self._auth_handler.delete_access_tokens_for_user(user_id)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class PresenceStatusRestServlet(RestServlet):
|
|||
state = yield self.presence_handler.get_state(target_user=user)
|
||||
state = format_user_presence_state(state, self.clock.time_msec())
|
||||
|
||||
defer.returnValue((200, state))
|
||||
return (200, state)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, user_id):
|
||||
|
|
@ -88,7 +88,7 @@ class PresenceStatusRestServlet(RestServlet):
|
|||
if self.hs.config.use_presence:
|
||||
yield self.presence_handler.set_state(user, state)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
def on_OPTIONS(self, request):
|
||||
return (200, {})
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class ProfileDisplaynameRestServlet(RestServlet):
|
|||
if displayname is not None:
|
||||
ret["displayname"] = displayname
|
||||
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, user_id):
|
||||
|
|
@ -61,11 +61,11 @@ class ProfileDisplaynameRestServlet(RestServlet):
|
|||
try:
|
||||
new_name = content["displayname"]
|
||||
except Exception:
|
||||
defer.returnValue((400, "Unable to parse name"))
|
||||
return (400, "Unable to parse name")
|
||||
|
||||
yield self.profile_handler.set_displayname(user, requester, new_name, is_admin)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
def on_OPTIONS(self, request, user_id):
|
||||
return (200, {})
|
||||
|
|
@ -98,7 +98,7 @@ class ProfileAvatarURLRestServlet(RestServlet):
|
|||
if avatar_url is not None:
|
||||
ret["avatar_url"] = avatar_url
|
||||
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, user_id):
|
||||
|
|
@ -110,11 +110,11 @@ class ProfileAvatarURLRestServlet(RestServlet):
|
|||
try:
|
||||
new_name = content["avatar_url"]
|
||||
except Exception:
|
||||
defer.returnValue((400, "Unable to parse name"))
|
||||
return (400, "Unable to parse name")
|
||||
|
||||
yield self.profile_handler.set_avatar_url(user, requester, new_name, is_admin)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
def on_OPTIONS(self, request, user_id):
|
||||
return (200, {})
|
||||
|
|
@ -150,7 +150,7 @@ class ProfileRestServlet(RestServlet):
|
|||
if avatar_url is not None:
|
||||
ret["avatar_url"] = avatar_url
|
||||
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
def register_servlets(hs, http_server):
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class PushRuleRestServlet(RestServlet):
|
|||
if "attr" in spec:
|
||||
yield self.set_rule_attr(user_id, spec, content)
|
||||
self.notify_user(user_id)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
if spec["rule_id"].startswith("."):
|
||||
# Rule ids starting with '.' are reserved for server default rules.
|
||||
|
|
@ -106,7 +106,7 @@ class PushRuleRestServlet(RestServlet):
|
|||
except RuleNotFoundException as e:
|
||||
raise SynapseError(400, str(e))
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_DELETE(self, request, path):
|
||||
|
|
@ -123,7 +123,7 @@ class PushRuleRestServlet(RestServlet):
|
|||
try:
|
||||
yield self.store.delete_push_rule(user_id, namespaced_rule_id)
|
||||
self.notify_user(user_id)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
except StoreError as e:
|
||||
if e.code == 404:
|
||||
raise NotFoundError()
|
||||
|
|
@ -151,10 +151,10 @@ class PushRuleRestServlet(RestServlet):
|
|||
)
|
||||
|
||||
if path[0] == "":
|
||||
defer.returnValue((200, rules))
|
||||
return (200, rules)
|
||||
elif path[0] == "global":
|
||||
result = _filter_ruleset_with_path(rules["global"], path[1:])
|
||||
defer.returnValue((200, result))
|
||||
return (200, result)
|
||||
else:
|
||||
raise UnrecognizedRequestError()
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class PushersRestServlet(RestServlet):
|
|||
if k not in allowed_keys:
|
||||
del p[k]
|
||||
|
||||
defer.returnValue((200, {"pushers": pushers}))
|
||||
return (200, {"pushers": pushers})
|
||||
|
||||
def on_OPTIONS(self, _):
|
||||
return 200, {}
|
||||
|
|
@ -94,7 +94,7 @@ class PushersSetRestServlet(RestServlet):
|
|||
yield self.pusher_pool.remove_pusher(
|
||||
content["app_id"], content["pushkey"], user_id=user.to_string()
|
||||
)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
assert_params_in_dict(
|
||||
content,
|
||||
|
|
@ -143,7 +143,7 @@ class PushersSetRestServlet(RestServlet):
|
|||
|
||||
self.notifier.on_new_replication_data()
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
def on_OPTIONS(self, _):
|
||||
return 200, {}
|
||||
|
|
@ -190,7 +190,7 @@ class PushersRemoveRestServlet(RestServlet):
|
|||
)
|
||||
request.write(PushersRemoveRestServlet.SUCCESS_HTML)
|
||||
finish_request(request)
|
||||
defer.returnValue(None)
|
||||
return None
|
||||
|
||||
def on_OPTIONS(self, _):
|
||||
return 200, {}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ class RoomCreateRestServlet(TransactionRestServlet):
|
|||
requester, self.get_room_config(request)
|
||||
)
|
||||
|
||||
defer.returnValue((200, info))
|
||||
return (200, info)
|
||||
|
||||
def get_room_config(self, request):
|
||||
user_supplied_config = parse_json_object_from_request(request)
|
||||
|
|
@ -155,9 +155,9 @@ class RoomStateEventRestServlet(TransactionRestServlet):
|
|||
|
||||
if format == "event":
|
||||
event = format_event_for_client_v2(data.get_dict())
|
||||
defer.returnValue((200, event))
|
||||
return (200, event)
|
||||
elif format == "content":
|
||||
defer.returnValue((200, data.get_dict()["content"]))
|
||||
return (200, data.get_dict()["content"])
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_PUT(self, request, room_id, event_type, state_key, txn_id=None):
|
||||
|
|
@ -192,7 +192,7 @@ class RoomStateEventRestServlet(TransactionRestServlet):
|
|||
ret = {}
|
||||
if event:
|
||||
ret = {"event_id": event.event_id}
|
||||
defer.returnValue((200, ret))
|
||||
return (200, ret)
|
||||
|
||||
|
||||
# TODO: Needs unit testing for generic events + feedback
|
||||
|
|
@ -226,7 +226,7 @@ class RoomSendEventRestServlet(TransactionRestServlet):
|
|||
requester, event_dict, txn_id=txn_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, {"event_id": event.event_id}))
|
||||
return (200, {"event_id": event.event_id})
|
||||
|
||||
def on_GET(self, request, room_id, event_type, txn_id):
|
||||
return (200, "Not implemented")
|
||||
|
|
@ -289,7 +289,7 @@ class JoinRoomAliasServlet(TransactionRestServlet):
|
|||
third_party_signed=content.get("third_party_signed", None),
|
||||
)
|
||||
|
||||
defer.returnValue((200, {"room_id": room_id}))
|
||||
return (200, {"room_id": room_id})
|
||||
|
||||
def on_PUT(self, request, room_identifier, txn_id):
|
||||
return self.txns.fetch_or_execute_request(
|
||||
|
|
@ -342,7 +342,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
|
|||
limit=limit, since_token=since_token
|
||||
)
|
||||
|
||||
defer.returnValue((200, data))
|
||||
return (200, data)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
def on_POST(self, request):
|
||||
|
|
@ -387,7 +387,7 @@ class PublicRoomListRestServlet(TransactionRestServlet):
|
|||
network_tuple=network_tuple,
|
||||
)
|
||||
|
||||
defer.returnValue((200, data))
|
||||
return (200, data)
|
||||
|
||||
|
||||
# TODO: Needs unit testing
|
||||
|
|
@ -438,7 +438,7 @@ class RoomMemberListRestServlet(RestServlet):
|
|||
continue
|
||||
chunk.append(event)
|
||||
|
||||
defer.returnValue((200, {"chunk": chunk}))
|
||||
return (200, {"chunk": chunk})
|
||||
|
||||
|
||||
# deprecated in favour of /members?membership=join?
|
||||
|
|
@ -459,7 +459,7 @@ class JoinedRoomMemberListRestServlet(RestServlet):
|
|||
requester, room_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, {"joined": users_with_profile}))
|
||||
return (200, {"joined": users_with_profile})
|
||||
|
||||
|
||||
# TODO: Needs better unit testing
|
||||
|
|
@ -492,7 +492,7 @@ class RoomMessageListRestServlet(RestServlet):
|
|||
event_filter=event_filter,
|
||||
)
|
||||
|
||||
defer.returnValue((200, msgs))
|
||||
return (200, msgs)
|
||||
|
||||
|
||||
# TODO: Needs unit testing
|
||||
|
|
@ -513,7 +513,7 @@ class RoomStateRestServlet(RestServlet):
|
|||
user_id=requester.user.to_string(),
|
||||
is_guest=requester.is_guest,
|
||||
)
|
||||
defer.returnValue((200, events))
|
||||
return (200, events)
|
||||
|
||||
|
||||
# TODO: Needs unit testing
|
||||
|
|
@ -532,7 +532,7 @@ class RoomInitialSyncRestServlet(RestServlet):
|
|||
content = yield self.initial_sync_handler.room_initial_sync(
|
||||
room_id=room_id, requester=requester, pagin_config=pagination_config
|
||||
)
|
||||
defer.returnValue((200, content))
|
||||
return (200, content)
|
||||
|
||||
|
||||
class RoomEventServlet(RestServlet):
|
||||
|
|
@ -555,9 +555,9 @@ class RoomEventServlet(RestServlet):
|
|||
time_now = self.clock.time_msec()
|
||||
if event:
|
||||
event = yield self._event_serializer.serialize_event(event, time_now)
|
||||
defer.returnValue((200, event))
|
||||
return (200, event)
|
||||
else:
|
||||
defer.returnValue((404, "Event not found."))
|
||||
return (404, "Event not found.")
|
||||
|
||||
|
||||
class RoomEventContextServlet(RestServlet):
|
||||
|
|
@ -607,7 +607,7 @@ class RoomEventContextServlet(RestServlet):
|
|||
results["state"], time_now
|
||||
)
|
||||
|
||||
defer.returnValue((200, results))
|
||||
return (200, results)
|
||||
|
||||
|
||||
class RoomForgetRestServlet(TransactionRestServlet):
|
||||
|
|
@ -626,7 +626,7 @@ class RoomForgetRestServlet(TransactionRestServlet):
|
|||
|
||||
yield self.room_member_handler.forget(user=requester.user, room_id=room_id)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
def on_PUT(self, request, room_id, txn_id):
|
||||
return self.txns.fetch_or_execute_request(
|
||||
|
|
@ -676,7 +676,7 @@ class RoomMembershipRestServlet(TransactionRestServlet):
|
|||
requester,
|
||||
txn_id,
|
||||
)
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
return
|
||||
|
||||
target = requester.user
|
||||
|
|
@ -703,7 +703,7 @@ class RoomMembershipRestServlet(TransactionRestServlet):
|
|||
if membership_action == "join":
|
||||
return_value["room_id"] = room_id
|
||||
|
||||
defer.returnValue((200, return_value))
|
||||
return (200, return_value)
|
||||
|
||||
def _has_3pid_invite_keys(self, content):
|
||||
for key in {"id_server", "medium", "address"}:
|
||||
|
|
@ -745,7 +745,7 @@ class RoomRedactEventRestServlet(TransactionRestServlet):
|
|||
txn_id=txn_id,
|
||||
)
|
||||
|
||||
defer.returnValue((200, {"event_id": event.event_id}))
|
||||
return (200, {"event_id": event.event_id})
|
||||
|
||||
def on_PUT(self, request, room_id, event_id, txn_id):
|
||||
return self.txns.fetch_or_execute_request(
|
||||
|
|
@ -790,7 +790,7 @@ class RoomTypingRestServlet(RestServlet):
|
|||
target_user=target_user, auth_user=requester.user, room_id=room_id
|
||||
)
|
||||
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
|
||||
class SearchRestServlet(RestServlet):
|
||||
|
|
@ -812,7 +812,7 @@ class SearchRestServlet(RestServlet):
|
|||
requester.user, content, batch
|
||||
)
|
||||
|
||||
defer.returnValue((200, results))
|
||||
return (200, results)
|
||||
|
||||
|
||||
class JoinedRoomsRestServlet(RestServlet):
|
||||
|
|
@ -828,7 +828,7 @@ class JoinedRoomsRestServlet(RestServlet):
|
|||
requester = yield self.auth.get_user_by_req(request, allow_guest=True)
|
||||
|
||||
room_ids = yield self.store.get_rooms_for_user(requester.user.to_string())
|
||||
defer.returnValue((200, {"joined_rooms": list(room_ids)}))
|
||||
return (200, {"joined_rooms": list(room_ids)})
|
||||
|
||||
|
||||
def register_txn_path(servlet, regex_string, http_server, with_get=False):
|
||||
|
|
|
|||
|
|
@ -60,18 +60,16 @@ class VoipRestServlet(RestServlet):
|
|||
password = turnPassword
|
||||
|
||||
else:
|
||||
defer.returnValue((200, {}))
|
||||
return (200, {})
|
||||
|
||||
defer.returnValue(
|
||||
(
|
||||
200,
|
||||
{
|
||||
"username": username,
|
||||
"password": password,
|
||||
"ttl": userLifetime / 1000,
|
||||
"uris": turnUris,
|
||||
},
|
||||
)
|
||||
return (
|
||||
200,
|
||||
{
|
||||
"username": username,
|
||||
"password": password,
|
||||
"ttl": userLifetime / 1000,
|
||||
"uris": turnUris,
|
||||
},
|
||||
)
|
||||
|
||||
def on_OPTIONS(self, request):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue