Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
982604fb
Commit
982604fb
authored
10 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Empty string is not a valid JSON object, so don't return them in HTTP responses.
parent
250ee2ea
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
synapse/rest/login.py
+1
-1
1 addition, 1 deletion
synapse/rest/login.py
synapse/rest/profile.py
+2
-2
2 additions, 2 deletions
synapse/rest/profile.py
synapse/rest/room.py
+4
-4
4 additions, 4 deletions
synapse/rest/room.py
with
7 additions
and
7 deletions
synapse/rest/login.py
+
1
−
1
View file @
982604fb
...
...
@@ -70,7 +70,7 @@ class LoginFallbackRestServlet(RestServlet):
def
on_GET
(
self
,
request
):
# TODO(kegan): This should be returning some HTML which is capable of
# hitting LoginRestServlet
return
(
200
,
""
)
return
(
200
,
{}
)
def
_parse_json
(
request
):
...
...
This diff is collapsed.
Click to expand it.
synapse/rest/profile.py
+
2
−
2
View file @
982604fb
...
...
@@ -51,7 +51,7 @@ class ProfileDisplaynameRestServlet(RestServlet):
yield
self
.
handlers
.
profile_handler
.
set_displayname
(
user
,
auth_user
,
new_name
)
defer
.
returnValue
((
200
,
""
))
defer
.
returnValue
((
200
,
{}
))
def
on_OPTIONS
(
self
,
request
,
user_id
):
return
(
200
,
{})
...
...
@@ -86,7 +86,7 @@ class ProfileAvatarURLRestServlet(RestServlet):
yield
self
.
handlers
.
profile_handler
.
set_avatar_url
(
user
,
auth_user
,
new_name
)
defer
.
returnValue
((
200
,
""
))
defer
.
returnValue
((
200
,
{}
))
def
on_OPTIONS
(
self
,
request
,
user_id
):
return
(
200
,
{})
...
...
This diff is collapsed.
Click to expand it.
synapse/rest/room.py
+
4
−
4
View file @
982604fb
...
...
@@ -154,14 +154,14 @@ class RoomStateEventRestServlet(RestServlet):
# membership events are special
handler
=
self
.
handlers
.
room_member_handler
yield
handler
.
change_membership
(
event
)
defer
.
returnValue
((
200
,
""
))
defer
.
returnValue
((
200
,
{}
))
else
:
# store random bits of state
msg_handler
=
self
.
handlers
.
message_handler
yield
msg_handler
.
store_room_data
(
event
=
event
)
defer
.
returnValue
((
200
,
""
))
defer
.
returnValue
((
200
,
{}
))
# TODO: Needs unit testing for generic events + feedback
...
...
@@ -249,7 +249,7 @@ class JoinRoomAliasServlet(RestServlet):
)
handler
=
self
.
handlers
.
room_member_handler
yield
handler
.
change_membership
(
event
)
defer
.
returnValue
((
200
,
""
))
defer
.
returnValue
((
200
,
{}
))
@defer.inlineCallbacks
def
on_PUT
(
self
,
request
,
room_identifier
,
txn_id
):
...
...
@@ -416,7 +416,7 @@ class RoomMembershipRestServlet(RestServlet):
)
handler
=
self
.
handlers
.
room_member_handler
yield
handler
.
change_membership
(
event
)
defer
.
returnValue
((
200
,
""
))
defer
.
returnValue
((
200
,
{}
))
@defer.inlineCallbacks
def
on_PUT
(
self
,
request
,
room_id
,
membership_action
,
txn_id
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment