From 95a98234eb9dc3fe893515673543b7b759fb558f Mon Sep 17 00:00:00 2001
From: Rob Loranger <dev@loranger.xyz>
Date: Fri, 9 Aug 2019 14:04:15 -0700
Subject: [PATCH] fix panic on duplicate remoteuser key

this changes handleFetchCollectionInbox to log _all_ errors after
attempting to insert an actor in the remoteusers table. previously
checking for all errors _except_ duplicate keys would cause a panic if
an actor made a request to follow while already having followed.
---
 activitypub.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/activitypub.go b/activitypub.go
index 997609d..d47a7ea 100644
--- a/activitypub.go
+++ b/activitypub.go
@@ -375,11 +375,11 @@ func handleFetchCollectionInbox(app *App, w http.ResponseWriter, r *http.Request
 				// Add follower locally, since it wasn't found before
 				res, err := t.Exec("INSERT INTO remoteusers (actor_id, inbox, shared_inbox) VALUES (?, ?, ?)", fullActor.ID, fullActor.Inbox, fullActor.Endpoints.SharedInbox)
 				if err != nil {
-					if !app.db.isDuplicateKeyErr(err) {
-						t.Rollback()
-						log.Error("Couldn't add new remoteuser in DB: %v\n", err)
-						return
-					}
+					// if duplicate key, res will be nil and panic on
+					// res.LastInsertId below
+					t.Rollback()
+					log.Error("Couldn't add new remoteuser in DB: %v\n", err)
+					return
 				}
 
 				followerID, err = res.LastInsertId()