sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Fix linter issues

Browse source
This commit is contained in:
Till Faelligen 2022-03-28 12:01:15 +02:00
parent f1e8d19cea
commit c99e3aff1b
4 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/consent_tracking.go
View file

@ -96,7 +96,7 @@ func consent(writer http.ResponseWriter, req *http.Request, userAPI userapi.User
}
return &internalError
}
if err := userAPI.PerformUpdatePolicyVersion(
if err = userAPI.PerformUpdatePolicyVersion(
req.Context(),
&userapi.UpdatePolicyVersionRequest{
PolicyVersion: data.Version,

36
clientapi/routing/server_notices.go
View file

@ -107,7 +107,7 @@ func sendServerNotice(
return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("Invalid request"),
}, nil
}, fmt.Errorf("Invalid JSON")
}
qryServerNoticeRoom := &userapi.QueryServerNoticeRoomResponse{}
@ -116,11 +116,11 @@ func sendServerNotice(
return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("Invalid request"),
}, nil
}, fmt.Errorf("Invalid JSON")
}
err = userAPI.SelectServerNoticeRoomID(ctx, &userapi.QueryServerNoticeRoomRequest{Localpart: localpart}, qryServerNoticeRoom)
if err != nil {
return util.ErrorResponse(err), nil
return util.ErrorResponse(err), err
}
senderUserID := fmt.Sprintf("@%s:%s", cfgNotices.LocalPart, cfgClient.Matrix.ServerName)
@ -129,17 +129,18 @@ func sendServerNotice(
// create a new room for the user
if qryServerNoticeRoom.RoomID == "" {
var pl, cc []byte
powerLevelContent := eventutil.InitialPowerLevelsContent(senderUserID)
powerLevelContent.Users[serverNoticeRequest.UserID] = -10 // taken from Synapse
pl, err := json.Marshal(powerLevelContent)
pl, err = json.Marshal(powerLevelContent)
if err != nil {
return util.ErrorResponse(err), nil
return util.ErrorResponse(err), err
}
createContent := map[string]interface{}{}
createContent["m.federate"] = false
cc, err := json.Marshal(createContent)
cc, err = json.Marshal(createContent)
if err != nil {
return util.ErrorResponse(err), nil
return util.ErrorResponse(err), err
}
crReq := createRoomRequest{
Invite: []string{serverNoticeRequest.UserID},
@ -158,7 +159,7 @@ func sendServerNotice(
case createRoomResponse:
roomID = data.RoomID
res := &userapi.UpdateServerNoticeRoomResponse{}
err := userAPI.UpdateServerNoticeRoomID(ctx, &userapi.UpdateServerNoticeRoomRequest{RoomID: roomID, Localpart: localpart}, res)
err = userAPI.UpdateServerNoticeRoomID(ctx, &userapi.UpdateServerNoticeRoomRequest{RoomID: roomID, Localpart: localpart}, res)
if err != nil {
util.GetLogger(ctx).WithError(err).Error("UpdateServerNoticeRoomID failed")
return jsonerror.InternalServerError(), nil
@ -171,25 +172,26 @@ func sendServerNotice(
}}
if err = saveTagData(ctx, serverNoticeRequest.UserID, roomID, userAPI, serverAlertTag); err != nil {
util.GetLogger(ctx).WithError(err).Error("saveTagData failed")
return jsonerror.InternalServerError(), nil
return jsonerror.InternalServerError(), err
}
default:
// if we didn't get a createRoomResponse, we probably received an error, so return that.
return roomRes, nil
return roomRes, fmt.Errorf("Unable to create room")
}
} else {
res := &api.QueryMembershipForUserResponse{}
err := rsAPI.QueryMembershipForUser(ctx, &api.QueryMembershipForUserRequest{UserID: serverNoticeRequest.UserID, RoomID: roomID}, res)
err = rsAPI.QueryMembershipForUser(ctx, &api.QueryMembershipForUserRequest{UserID: serverNoticeRequest.UserID, RoomID: roomID}, res)
if err != nil {
return util.ErrorResponse(err), nil
return util.ErrorResponse(err), err
}
// re-invite the user
if res.Membership != gomatrixserverlib.Join {
res, err := sendInvite(ctx, userAPI, senderDevice, roomID, serverNoticeRequest.UserID, "Server notice room", cfgClient, rsAPI, asAPI, time.Now())
var inviteRes util.JSONResponse
inviteRes, err = sendInvite(ctx, userAPI, senderDevice, roomID, serverNoticeRequest.UserID, "Server notice room", cfgClient, rsAPI, asAPI, time.Now())
if err != nil {
return res, nil
return inviteRes, err
}
}
}
@ -203,7 +205,7 @@ func sendServerNotice(
e, resErr := generateSendEvent(ctx, request, senderDevice, roomID, "m.room.message", nil, cfgClient, rsAPI, time.Now())
if resErr != nil {
logrus.Errorf("failed to send message: %+v", resErr)
return *resErr, nil
return *resErr, fmt.Errorf("Unable to send event")
}
timeToGenerateEvent := time.Since(startedGeneratingEvent)
@ -218,7 +220,7 @@ func sendServerNotice(
// pass the new event to the roomserver and receive the correct event ID
// event ID in case of duplicate transaction is discarded
startedSubmittingEvent := time.Now()
if err := api.SendEvents(
if err = api.SendEvents(
ctx, rsAPI,
api.KindNew,
[]*gomatrixserverlib.HeaderedEvent{
@ -230,7 +232,7 @@ func sendServerNotice(
false,
); err != nil {
util.GetLogger(ctx).WithError(err).Error("SendEvents failed")
return jsonerror.InternalServerError(), nil
return jsonerror.InternalServerError(), err
}
util.GetLogger(ctx).WithFields(logrus.Fields{
"event_id": e.EventID(),

5
userapi/storage/postgres/accounts_table.go
View file

@ -19,6 +19,7 @@ import (
"database/sql"
"time"
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/dendrite/clientapi/userutil"
@ -232,7 +233,7 @@ func (s *accountsStatements) BatchSelectPrivacyPolicy(
stmt = sqlutil.TxStmt(txn, stmt)
}
rows, err := stmt.QueryContext(ctx, policyVersion)
defer rows.Close()
defer internal.CloseAndLogIfError(ctx, rows, "BatchSelectPrivacyPolicy: rows.close() failed")
for rows.Next() {
var userID string
if err := rows.Scan(&userID); err != nil {
@ -289,4 +290,4 @@ func (s *accountsStatements) UpdateServerNoticeRoomID(
}
_, err = stmt.ExecContext(ctx, roomID, localpart)
return
}
}

5
userapi/storage/sqlite3/accounts_table.go
View file

@ -19,6 +19,7 @@ import (
"database/sql"
"time"
"github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/dendrite/clientapi/userutil"
@ -235,7 +236,7 @@ func (s *accountsStatements) BatchSelectPrivacyPolicy(
if err != nil {
return nil, err
}
defer rows.Close()
defer internal.CloseAndLogIfError(ctx, rows, "BatchSelectPrivacyPolicy: rows.close() failed")
for rows.Next() {
var userID string
if err := rows.Scan(&userID); err != nil {
@ -292,4 +293,4 @@ func (s *accountsStatements) UpdateServerNoticeRoomID(
}
_, err = stmt.ExecContext(ctx, roomID, localpart)
return
}
}