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

Rename function/variables

Browse source
This commit is contained in:
Till Faelligen 2022-02-11 17:40:31 +01:00
parent 6c1b9a6c5d
commit 6373a73ce1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clientapi/routing/server_notices.go
View file

@ -84,7 +84,7 @@ func SendServerNotice(
} }
// check that all required fields are set // check that all required fields are set
if !r.validate() { if !r.valid() {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("Invalid request"), JSON: jsonerror.BadJSON("Invalid request"),
@ -139,7 +139,7 @@ func SendServerNotice(
roomVersion = gomatrixserverlib.RoomVersionV6 roomVersion = gomatrixserverlib.RoomVersionV6
) )
adminDevice, err := getSenderDevice(ctx, userAPI, cfgClient) senderDevice, err := getSenderDevice(ctx, userAPI, cfgClient)
if err != nil { if err != nil {
logrus.WithError(err).Error("unable to get device") logrus.WithError(err).Error("unable to get device")
return util.ErrorResponse(err) return util.ErrorResponse(err)
@ -169,7 +169,7 @@ func SendServerNotice(
PowerLevelContentOverride: pl, PowerLevelContentOverride: pl,
} }
roomRes := createRoom(ctx, crReq, adminDevice, cfgClient, accountsDB, rsAPI, asAPI, time.Now()) roomRes := createRoom(ctx, crReq, senderDevice, cfgClient, accountsDB, rsAPI, asAPI, time.Now())
switch data := roomRes.JSON.(type) { switch data := roomRes.JSON.(type) {
case createRoomResponse: case createRoomResponse:
@ -200,7 +200,7 @@ func SendServerNotice(
"body": r.Content.Body, "body": r.Content.Body,
"msgtype": r.Content.MsgType, "msgtype": r.Content.MsgType,
} }
e, resErr := generateSendEvent(ctx, request, adminDevice, roomID, "m.room.message", nil, cfgClient, rsAPI, time.Now()) e, resErr := generateSendEvent(ctx, request, senderDevice, roomID, "m.room.message", nil, cfgClient, rsAPI, time.Now())
if resErr != nil { if resErr != nil {
logrus.Errorf("failed to send message: %+v", resErr) logrus.Errorf("failed to send message: %+v", resErr)
return *resErr return *resErr
@ -256,7 +256,7 @@ func SendServerNotice(
return res return res
} }
func (r sendServerNoticeRequest) validate() (ok bool) { func (r sendServerNoticeRequest) valid() (ok bool) {
if r.UserID == "" { if r.UserID == "" {
return false return false
} }

4
clientapi/routing/server_notices_test.go
View file

@ -69,8 +69,8 @@ func Test_sendServerNoticeRequest_validate(t *testing.T) {
Type: tt.fields.Type, Type: tt.fields.Type,
StateKey: tt.fields.StateKey, StateKey: tt.fields.StateKey,
} }
if gotOk := r.validate(); gotOk != tt.wantOk { if gotOk := r.valid(); gotOk != tt.wantOk {
t.Errorf("validate() = %v, want %v", gotOk, tt.wantOk) t.Errorf("valid() = %v, want %v", gotOk, tt.wantOk)
} }
}) })
} }