Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FinClip
ligase
提交
f11af1e7
ligase
项目概览
FinClip
/
ligase
通知
33
Star
8
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ligase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f11af1e7
编写于
9月 27, 2017
作者:
E
Erik Johnston
提交者:
GitHub
9月 27, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement setting alias during room create (#268)
* Implement setting alias during room create
上级
00adbb38
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
9 deletion
+39
-9
src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
...thub.com/matrix-org/dendrite/clientapi/routing/routing.go
+1
-1
src/github.com/matrix-org/dendrite/clientapi/writers/createroom.go
...b.com/matrix-org/dendrite/clientapi/writers/createroom.go
+38
-8
未找到文件。
src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
浏览文件 @
f11af1e7
...
...
@@ -73,7 +73,7 @@ func Setup(
r0mux
.
Handle
(
"/createRoom"
,
common
.
MakeAuthAPI
(
"createRoom"
,
deviceDB
,
func
(
req
*
http
.
Request
,
device
*
authtypes
.
Device
)
util
.
JSONResponse
{
return
writers
.
CreateRoom
(
req
,
device
,
cfg
,
producer
,
accountDB
)
return
writers
.
CreateRoom
(
req
,
device
,
cfg
,
producer
,
accountDB
,
aliasAPI
)
}),
)
.
Methods
(
"POST"
,
"OPTIONS"
)
r0mux
.
Handle
(
"/join/{roomIDOrAlias}"
,
...
...
src/github.com/matrix-org/dendrite/clientapi/writers/createroom.go
浏览文件 @
f11af1e7
...
...
@@ -21,6 +21,8 @@ import (
"strings"
"time"
"github.com/matrix-org/dendrite/roomserver/api"
log
"github.com/Sirupsen/logrus"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
...
...
@@ -87,18 +89,19 @@ type fledglingEvent struct {
// CreateRoom implements /createRoom
func
CreateRoom
(
req
*
http
.
Request
,
device
*
authtypes
.
Device
,
cfg
config
.
Dendrite
,
producer
*
producers
.
RoomserverProducer
,
accountDB
*
accounts
.
Database
,
accountDB
*
accounts
.
Database
,
aliasAPI
api
.
RoomserverAliasAPI
,
)
util
.
JSONResponse
{
// TODO: Check room ID doesn't clash with an existing one, and we
// probably shouldn't be using pseudo-random strings, maybe GUIDs?
// TODO
(#267)
: Check room ID doesn't clash with an existing one, and we
//
probably shouldn't be using pseudo-random strings, maybe GUIDs?
roomID
:=
fmt
.
Sprintf
(
"!%s:%s"
,
util
.
RandomString
(
16
),
cfg
.
Matrix
.
ServerName
)
return
createRoom
(
req
,
device
,
cfg
,
roomID
,
producer
,
accountDB
)
return
createRoom
(
req
,
device
,
cfg
,
roomID
,
producer
,
accountDB
,
aliasAPI
)
}
// createRoom implements /createRoom
// nolint: gocyclo
func
createRoom
(
req
*
http
.
Request
,
device
*
authtypes
.
Device
,
cfg
config
.
Dendrite
,
roomID
string
,
producer
*
producers
.
RoomserverProducer
,
accountDB
*
accounts
.
Database
,
accountDB
*
accounts
.
Database
,
aliasAPI
api
.
RoomserverAliasAPI
,
)
util
.
JSONResponse
{
logger
:=
util
.
GetLogger
(
req
.
Context
())
userID
:=
device
.
UserID
...
...
@@ -192,7 +195,8 @@ func createRoom(req *http.Request, device *authtypes.Device,
if
i
>
0
{
builder
.
PrevEvents
=
[]
gomatrixserverlib
.
EventReference
{
builtEvents
[
i
-
1
]
.
EventReference
()}
}
ev
,
err
:=
buildEvent
(
&
builder
,
&
authEvents
,
cfg
)
var
ev
*
gomatrixserverlib
.
Event
ev
,
err
=
buildEvent
(
&
builder
,
&
authEvents
,
cfg
)
if
err
!=
nil
{
return
httputil
.
LogThenError
(
req
,
err
)
}
...
...
@@ -210,12 +214,38 @@ func createRoom(req *http.Request, device *authtypes.Device,
}
// send events to the room server
if
err
:=
producer
.
SendEvents
(
req
.
Context
(),
builtEvents
,
cfg
.
Matrix
.
ServerName
);
err
!=
nil
{
err
=
producer
.
SendEvents
(
req
.
Context
(),
builtEvents
,
cfg
.
Matrix
.
ServerName
)
if
err
!=
nil
{
return
httputil
.
LogThenError
(
req
,
err
)
}
// TODO(#269): Reserve room alias while we create the room. This stops us
// from creating the room but still failing due to the alias having already
// been taken.
var
roomAlias
string
if
r
.
RoomAliasName
!=
""
{
roomAlias
=
fmt
.
Sprintf
(
"#%s:%s"
,
r
.
RoomAliasName
,
cfg
.
Matrix
.
ServerName
)
aliasReq
:=
api
.
SetRoomAliasRequest
{
Alias
:
roomAlias
,
RoomID
:
roomID
,
UserID
:
userID
,
}
var
aliasResp
api
.
SetRoomAliasResponse
err
=
aliasAPI
.
SetRoomAlias
(
req
.
Context
(),
&
aliasReq
,
&
aliasResp
)
if
err
!=
nil
{
return
httputil
.
LogThenError
(
req
,
err
)
}
if
aliasResp
.
AliasExists
{
return
util
.
MessageResponse
(
400
,
"Alias already exists"
)
}
}
response
:=
createRoomResponse
{
RoomID
:
roomID
,
RoomID
:
roomID
,
RoomAlias
:
roomAlias
,
}
return
util
.
JSONResponse
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录