Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
040d9859
Commit
040d9859
authored
10 years ago
by
Erik Johnston
Browse files
Options
Downloads
Patches
Plain Diff
Add support for setting room name and topic when creating rooms
parent
15a73122
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
synapse/handlers/room.py
+29
-4
29 additions, 4 deletions
synapse/handlers/room.py
with
29 additions
and
4 deletions
synapse/handlers/room.py
+
29
−
4
View file @
040d9859
...
...
@@ -21,8 +21,8 @@ from synapse.api.constants import Membership, JoinRules
from
synapse.api.errors
import
StoreError
,
SynapseError
from
synapse.api.events.room
import
(
RoomMemberEvent
,
RoomCreateEvent
,
RoomPowerLevelsEvent
,
RoomJoinRulesEvent
,
RoomAddStateLevelEvent
,
RoomSendEventLevelEvent
,
RoomOpsPowerLevelsEvent
,
RoomJoinRulesEvent
,
RoomAddStateLevelEvent
,
RoomTopicEvent
,
RoomSendEventLevelEvent
,
RoomOpsPowerLevelsEvent
,
RoomNameEvent
,
)
from
synapse.util
import
stringutils
from
._base
import
BaseRoomHandler
...
...
@@ -98,7 +98,6 @@ class RoomCreationHandler(BaseRoomHandler):
if
not
room_id
:
raise
StoreError
(
500
,
"
Couldn
'
t generate a room ID.
"
)
user
=
self
.
hs
.
parse_userid
(
user_id
)
creation_events
=
self
.
_create_events_for_new_room
(
user
,
room_id
,
is_public
=
is_public
...
...
@@ -113,7 +112,8 @@ class RoomCreationHandler(BaseRoomHandler):
federation_handler
=
self
.
hs
.
get_handlers
().
federation_handler
for
event
in
creation_events
:
@defer.inlineCallbacks
def
handle_event
(
event
):
snapshot
=
yield
self
.
store
.
snapshot_room
(
room_id
=
room_id
,
user_id
=
user_id
,
...
...
@@ -124,6 +124,31 @@ class RoomCreationHandler(BaseRoomHandler):
yield
self
.
state_handler
.
handle_new_event
(
event
,
snapshot
)
yield
self
.
_on_new_room_event
(
event
,
snapshot
,
extra_users
=
[
user
])
for
event
in
creation_events
:
yield
handle_event
(
event
)
if
"
name
"
in
config
:
name
=
config
[
"
name
"
]
name_event
=
self
.
event_factory
.
create_event
(
etype
=
RoomNameEvent
.
TYPE
,
room_id
=
room_id
,
user_id
=
user_id
,
content
=
{
"
name
"
:
name
},
)
yield
handle_event
(
name_event
)
if
"
topic
"
in
config
:
topic
=
config
[
"
topic
"
]
topic_event
=
self
.
event_factory
.
create_event
(
etype
=
RoomTopicEvent
.
TYPE
,
room_id
=
room_id
,
user_id
=
user_id
,
content
=
{
"
topic
"
:
topic
},
)
yield
handle_event
(
topic_event
)
content
=
{
"
membership
"
:
Membership
.
JOIN
}
join_event
=
self
.
event_factory
.
create_event
(
etype
=
RoomMemberEvent
.
TYPE
,
...
...
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