aboutsummaryrefslogtreecommitdiff
path: root/roomserver
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2020-10-20 12:29:53 +0100
committerKegan Dougal <kegan@matrix.org>2020-10-20 12:29:53 +0100
commit837c295c26aa42faf1087368d05ceca2e42d95a0 (patch)
treec8372cca618172613ac6579cedbdcb3b8abeaa6c /roomserver
parent53a745f3332c4bb35dddd80ff8f83e7eb11456ca (diff)
Linting
Diffstat (limited to 'roomserver')
-rw-r--r--roomserver/internal/input/input_events.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index 6a5d9d26..c055289c 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -49,11 +49,11 @@ func (r *Inputer) processRoomEvent(
// if we have already got this event then do not process it again, if the input kind is an outlier.
// Outliers contain no extra information which may warrant a re-processing.
if input.Kind == api.KindOutlier {
- evs, err := r.DB.EventsFromIDs(ctx, []string{event.EventID()})
- if err == nil && len(evs) == 1 {
+ evs, err2 := r.DB.EventsFromIDs(ctx, []string{event.EventID()})
+ if err2 == nil && len(evs) == 1 {
// check hash matches if we're on early room versions where the event ID was a random string
- idFormat, err := headered.RoomVersion.EventIDFormat()
- if err == nil {
+ idFormat, err2 := headered.RoomVersion.EventIDFormat()
+ if err2 == nil {
switch idFormat {
case gomatrixserverlib.EventIDFormatV1:
if bytes.Equal(event.EventReference().EventSHA256, evs[0].EventReference().EventSHA256) {