diff options
author | Andrej Shadura <andrewsh@debian.org> | 2021-03-12 08:45:19 +0100 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2021-03-12 08:45:19 +0100 |
commit | a164b24227153a3ffe4d9adbb9bb1c1e981efe39 (patch) | |
tree | 4b9353cc412efe3dc135c7dda83e0fb7af64680b /synapse/rest/client/v2_alpha | |
parent | 7b07dc8dd1aa7eb4c55edb19822a30cfdc4adc0b (diff) |
New upstream version 1.29.0
Diffstat (limited to 'synapse/rest/client/v2_alpha')
-rw-r--r-- | synapse/rest/client/v2_alpha/groups.py | 2 | ||||
-rw-r--r-- | synapse/rest/client/v2_alpha/sendtodevice.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/rest/client/v2_alpha/groups.py b/synapse/rest/client/v2_alpha/groups.py index d3434225..7aea4ceb 100644 --- a/synapse/rest/client/v2_alpha/groups.py +++ b/synapse/rest/client/v2_alpha/groups.py @@ -18,7 +18,7 @@ import logging from functools import wraps from typing import TYPE_CHECKING, Optional, Tuple -from twisted.web.http import Request +from twisted.web.server import Request from synapse.api.constants import ( MAX_GROUP_CATEGORYID_LENGTH, diff --git a/synapse/rest/client/v2_alpha/sendtodevice.py b/synapse/rest/client/v2_alpha/sendtodevice.py index a3dee14e..79c1b526 100644 --- a/synapse/rest/client/v2_alpha/sendtodevice.py +++ b/synapse/rest/client/v2_alpha/sendtodevice.py @@ -56,10 +56,8 @@ class SendToDeviceRestServlet(servlet.RestServlet): content = parse_json_object_from_request(request) assert_params_in_dict(content, ("messages",)) - sender_user_id = requester.user.to_string() - await self.device_message_handler.send_device_message( - sender_user_id, message_type, content["messages"] + requester, message_type, content["messages"] ) response = (200, {}) # type: Tuple[int, dict] |