OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'rav/matrix_hacks' into matrix-org-hotfixes

pull/8675/head
Richard van der Hoff 2020-05-20 22:18:21 +01:00
parent a902468354 b3a9ad124c
commit 0d8fb99cdf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/app/generic_worker.py
View File

@ -27,7 +27,7 @@ from twisted.web.resource import NoResource
import synapse import synapse
import synapse.events import synapse.events
from synapse.api.constants import EventTypes from synapse.api.constants import EventTypes
from synapse.api.errors import HttpResponseException, SynapseError from synapse.api.errors import SynapseError
from synapse.api.urls import ( from synapse.api.urls import (
CLIENT_API_PREFIX, CLIENT_API_PREFIX,
FEDERATION_PREFIX, FEDERATION_PREFIX,
@ -151,7 +151,7 @@ class PresenceStatusStubServlet(RestServlet):
async def on_GET(self, request, user_id): async def on_GET(self, request, user_id):
await self.auth.get_user_by_req(request) await self.auth.get_user_by_req(request)
return 200, {"state": "offline"} return 200, {"presence": "offline"}
async def on_PUT(self, request, user_id): async def on_PUT(self, request, user_id):
await self.auth.get_user_by_req(request) await self.auth.get_user_by_req(request)