From 0fc1029874a6e6fe1cac7468b8634fc56a108395 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 29 Sep 2020 12:25:05 +0100
Subject: [PATCH] More tweaks

---
 federationapi/routing/send.go             | 9 +++++----
 roomserver/internal/input/input_events.go | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go
index 72b6ac401..6d60730fc 100644
--- a/federationapi/routing/send.go
+++ b/federationapi/routing/send.go
@@ -17,6 +17,7 @@ package routing
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"sync"
@@ -206,10 +207,10 @@ func (t *txnReq) processTransaction(ctx context.Context) (*gomatrixserverlib.Res
 				return nil, &jsonErr
 			} else {
 				// Auth errors mean the event is 'rejected' which have to be silent to appease sytest
-				_, rejected := err.(*gomatrixserverlib.NotAllowed)
-				errMsg := err.Error()
-				if rejected {
-					errMsg = ""
+				errMsg := ""
+				rejected := errors.Is(err, &gomatrixserverlib.NotAllowed{})
+				if !rejected {
+					errMsg = err.Error()
 				}
 				util.GetLogger(ctx).WithError(err).WithField("event_id", e.EventID()).WithField("rejected", rejected).Warn(
 					"Failed to process incoming federation event, skipping",
diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index c03ef4b65..3d44f0486 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -133,7 +133,7 @@ func (r *Inputer) processRoomEvent(
 			"soft_fail": softfail,
 			"sender":    event.Sender(),
 		}).Debug("Stored rejected event")
-		return event.EventID(), nil
+		return event.EventID(), rejectionErr
 	}
 
 	if input.Kind == api.KindRewrite {