mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-26 13:41:33 +00:00
5c894efd0e
* Add PerformJoin template * Try roomserver perform join * Send correct server name to FS API * Pass through content, try to handle multiple server names * Fix local server checks * Don't refer to non-existent error * Add directory lookups of aliases * Remove unneeded parameters * Don't repeat join events into the roomserver * Unmarshal the content, that would help * Check if the user is already in the room in the fedeationapi too * Return incompatible room version error * Use Membership, don't try more servers than needed * Review comments, make FS API take list of servernames, dedupe them, break out of loop properly on success * Tweaks
63 lines
1.9 KiB
Go
63 lines
1.9 KiB
Go
// Copyright 2017 Vector Creations Ltd
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package routing
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
|
|
"github.com/matrix-org/dendrite/clientapi/httputil"
|
|
"github.com/matrix-org/dendrite/clientapi/jsonerror"
|
|
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
|
|
"github.com/matrix-org/util"
|
|
)
|
|
|
|
func JoinRoomByIDOrAlias(
|
|
req *http.Request,
|
|
device *authtypes.Device,
|
|
rsAPI roomserverAPI.RoomserverInternalAPI,
|
|
roomIDOrAlias string,
|
|
) util.JSONResponse {
|
|
// Prepare to ask the roomserver to perform the room join.
|
|
joinReq := roomserverAPI.PerformJoinRequest{
|
|
RoomIDOrAlias: roomIDOrAlias,
|
|
UserID: device.UserID,
|
|
}
|
|
joinRes := roomserverAPI.PerformJoinResponse{}
|
|
|
|
// If content was provided in the request then incude that
|
|
// in the request. It'll get used as a part of the membership
|
|
// event content.
|
|
if err := httputil.UnmarshalJSONRequest(req, &joinReq.Content); err != nil {
|
|
return *err
|
|
}
|
|
|
|
// Ask the roomserver to perform the join.
|
|
if err := rsAPI.PerformJoin(req.Context(), &joinReq, &joinRes); err != nil {
|
|
return util.JSONResponse{
|
|
Code: http.StatusBadRequest,
|
|
JSON: jsonerror.Unknown(err.Error()),
|
|
}
|
|
}
|
|
|
|
return util.JSONResponse{
|
|
Code: http.StatusOK,
|
|
// TODO: Put the response struct somewhere common.
|
|
JSON: struct {
|
|
RoomID string `json:"room_id"`
|
|
}{joinReq.RoomIDOrAlias},
|
|
}
|
|
}
|