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

Fix lint legitimate warnings :)

Browse source 
Signed-off-by: Thibaut CHARLES cromfr@gmail.com
This commit is contained in:
Crom (Thibaut CHARLES) 2018-01-18 02:14:53 +01:00
parent be96370e30
commit 38767efff0
No known key found for this signature in database
GPG key ID: 45A3D5F880B9E6D0
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/github.com/matrix-org/dendrite/syncapi/storage/current_room_state_table.go
View file

@ -217,9 +217,11 @@ func (s *currentRoomStateStatements) upsertRoomState(
ctx context.Context, txn *sql.Tx,
event gomatrixserverlib.Event, membership *string, addedAt int64,
) error {
var containsURL bool
var content map[string]interface{}
json.Unmarshal(event.Content(), content)
_, containsURL := content["url"]
if json.Unmarshal(event.Content(), &content) != nil {
_, containsURL = content["url"]
}
stmt := common.TxStmt(txn, s.upsertRoomStateStmt)
_, err := stmt.ExecContext(

6
src/github.com/matrix-org/dendrite/syncapi/storage/invites_table.go
View file

@ -85,9 +85,11 @@ func (s *inviteEventsStatements) prepare(db *sql.DB) (err error) {
func (s *inviteEventsStatements) insertInviteEvent(
ctx context.Context, inviteEvent gomatrixserverlib.Event,
) (streamPos int64, err error) {
var containsURL bool
var content map[string]interface{}
json.Unmarshal(inviteEvent.Content(), content)
_, containsURL := content["url"]
if json.Unmarshal(inviteEvent.Content(), &content) != nil {
_, containsURL = content["url"]
}
err = s.insertInviteEventStmt.QueryRowContext(
ctx,

6
src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
View file

@ -224,9 +224,11 @@ func (s *outputRoomEventsStatements) insertEvent(
txnID = &transactionID.TransactionID
}
var containsURL bool
var content map[string]interface{}
json.Unmarshal(event.Content(), content)
_, containsURL := content["url"]
if json.Unmarshal(event.Content(), &content) != nil {
_, containsURL = content["url"]
}
stmt := common.TxStmt(txn, s.insertEventStmt)
err = stmt.QueryRowContext(