From da441b60fcd4e0d3f72d0a9aa8e6021180ed0a48 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 24 Jun 2020 13:47:03 +0100
Subject: [PATCH] Unbreak everything; thanks Go!

---
 roomserver/api/wrapper.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/roomserver/api/wrapper.go b/roomserver/api/wrapper.go
index 1e529c443..b73cd1902 100644
--- a/roomserver/api/wrapper.go
+++ b/roomserver/api/wrapper.go
@@ -108,5 +108,10 @@ func SendInvite(
 	}
 	var response PerformInviteResponse
 	rsAPI.PerformInvite(ctx, &request, &response)
-	return response.Error
+	// we need to do this because many places people will use `var err error` as the return
+	// arg and a nil interface != nil pointer to a concrete interface (in this case PerformError)
+	if response.Error != nil && response.Error.Msg != "" {
+		return response.Error
+	}
+	return nil
 }