Merge pull request #166 from writeas/159-follow-panic

fix panic on duplicate remoteuser key
pull/205/head
Matt Baer 5 years ago committed by GitHub
commit fcf074cf40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      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()

Loading…
Cancel
Save