[chore] Refactor account deleting/block logic, tidy up some other processing things (#1599)

* start refactoring account deletion * update to use state.DB * further messing about * some more tidying up * more tidying, cleaning, nice-making * further adventures in refactoring and the woes of technical debt * update fr accept/reject * poking + prodding * fix up deleting * create fave uri * don't log using requestingAccount.ID because it might be nil * move getBookmarks function * use exists query to check for status bookmark * use deletenotifications func * fiddle * delete follow request notif * split up some db functions * Fix possible nil pointer panic * fix more possible nil pointers * fix license headers * warn when follow missing (target) account * return wrapped err when bookmark/fave models can't be retrieved * simplify self account delete * warn log likely race condition * de-sillify status delete loop * move error check due north * warn when unfollowSideEffects has no target account * warn when no boost account is found * warn + dump follow when no account * more warnings * warn on fave account not set * move for loop inside anonymous function * fix funky logic * don't remove mutual account items on block; do make sure unfollow occurs in both directions!
2025-11-26 00:33:32 -06:00 · 2023-03-20 19:10:08 +01:00 · 2023-03-20 19:10:08 +01:00 · e8595f0c64
commit e8595f0c64
parent 276d773438
53 changed files with 2472 additions and 1321 deletions
--- a/internal/db/bundb/statusbookmark_test.go
+++ b/internal/db/bundb/statusbookmark_test.go
@ -0,0 +1,129 @@
+/*
+   GoToSocial
+   Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package bundb_test
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+)
+
+type StatusBookmarkTestSuite struct {
+	BunDBStandardTestSuite
+}
+
+func (suite *StatusBookmarkTestSuite) TestGetStatusBookmarkIDOK() {
+	testBookmark := suite.testBookmarks["local_account_1_admin_account_status_1"]
+
+	id, err := suite.db.GetStatusBookmarkID(context.Background(), testBookmark.AccountID, testBookmark.StatusID)
+	if err != nil {
+		suite.FailNow(err.Error())
+	}
+
+	suite.Equal(testBookmark.ID, id)
+}
+
+func (suite *StatusBookmarkTestSuite) TestGetStatusBookmarkIDNonexisting() {
+	id, err := suite.db.GetStatusBookmarkID(context.Background(), "01GVAVGD06YJ2FSB5GJSMF8M2K", "01GVAVGKGR1MK9ZN7JCJFYSFZV")
+	suite.Empty(id)
+	suite.ErrorIs(err, db.ErrNoEntries)
+}
+
+func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksOriginatingFromAccount() {
+	testAccount := suite.testAccounts["local_account_1"]
+
+	if err := suite.db.DeleteStatusBookmarks(context.Background(), "", testAccount.ID); err != nil {
+		suite.FailNow(err.Error())
+	}
+
+	bookmarks := []*gtsmodel.StatusBookmark{}
+	if err := suite.db.GetAll(context.Background(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) {
+		suite.FailNow(err.Error())
+	}
+
+	for _, b := range bookmarks {
+		if b.AccountID == testAccount.ID {
+			suite.FailNowf("", "no StatusBookmarks with account id %s should remain", testAccount.ID)
+		}
+	}
+}
+
+func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksTargetingAccount() {
+	testAccount := suite.testAccounts["local_account_1"]
+
+	if err := suite.db.DeleteStatusBookmarks(context.Background(), testAccount.ID, ""); err != nil {
+		suite.FailNow(err.Error())
+	}
+
+	bookmarks := []*gtsmodel.StatusBookmark{}
+	if err := suite.db.GetAll(context.Background(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) {
+		suite.FailNow(err.Error())
+	}
+
+	for _, b := range bookmarks {
+		if b.TargetAccountID == testAccount.ID {
+			suite.FailNowf("", "no StatusBookmarks with target account id %s should remain", testAccount.ID)
+		}
+	}
+}
+
+func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarksTargetingStatus() {
+	testStatus := suite.testStatuses["local_account_1_status_1"]
+
+	if err := suite.db.DeleteStatusBookmarksForStatus(context.Background(), testStatus.ID); err != nil {
+		suite.FailNow(err.Error())
+	}
+
+	bookmarks := []*gtsmodel.StatusBookmark{}
+	if err := suite.db.GetAll(context.Background(), &bookmarks); err != nil && !errors.Is(err, db.ErrNoEntries) {
+		suite.FailNow(err.Error())
+	}
+
+	for _, b := range bookmarks {
+		if b.StatusID == testStatus.ID {
+			suite.FailNowf("", "no StatusBookmarks with status id %s should remain", testStatus.ID)
+		}
+	}
+}
+
+func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmark() {
+	testBookmark := suite.testBookmarks["local_account_1_admin_account_status_1"]
+	ctx := context.Background()
+
+	if err := suite.db.DeleteStatusBookmark(ctx, testBookmark.ID); err != nil {
+		suite.FailNow(err.Error())
+	}
+
+	bookmark, err := suite.db.GetStatusBookmark(ctx, testBookmark.ID)
+	suite.ErrorIs(err, db.ErrNoEntries)
+	suite.Nil(bookmark)
+}
+
+func (suite *StatusBookmarkTestSuite) TestDeleteStatusBookmarkNonExisting() {
+	err := suite.db.DeleteStatusBookmark(context.Background(), "01GVAV715K6Y2SG9ZKS9ZA8G7G")
+	suite.NoError(err)
+}
+
+func TestStatusBookmarkTestSuite(t *testing.T) {
+	suite.Run(t, new(StatusBookmarkTestSuite))
+}