mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-10 16:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Apply requested changes

Browse source
This commit is contained in:
Brendan Abolivier 2017-07-28 11:22:38 +01:00
parent 44ab32c298
commit 4731ae9c6d
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/github.com/matrix-org/dendrite/clientapi/readers/directory.go
View file

@ -27,10 +27,6 @@ import (
"github.com/matrix-org/util"
)
type roomID struct {
RoomID string `json:"room_id"`
}
// DirectoryRoom looks up a room alias
func DirectoryRoom(
req *http.Request,
@ -118,7 +114,9 @@ func SetLocalAlias(
}
}
var r roomID
var r struct {
RoomID string `json:"room_id"`
}
if resErr := httputil.UnmarshalJSONRequest(req, &r); resErr != nil {
return *resErr
}

2
src/github.com/matrix-org/dendrite/roomserver/storage/room_aliases_table.go
View file

@ -26,6 +26,8 @@ CREATE TABLE IF NOT EXISTS room_aliases (
-- Room ID the alias refers to
room_id TEXT NOT NULL
);
CREATE UNIQUE INDEX IF NOT EXISTS room_id_idx ON room_aliases(room_id);
`
const insertRoomAliasSQL = "" +