diff options
author | 2022-12-09 05:37:12 -0500 | |
---|---|---|
committer | 2022-12-09 11:37:12 +0100 | |
commit | 477ae50933ab7447757752ec35bf898db287acff (patch) | |
tree | 28750a1aea3cda180ca1461cfad7ea130c22bba1 /internal/processing/status | |
parent | [chore] move caches to a separate State{} structure (#1078) (diff) | |
download | gotosocial-477ae50933ab7447757752ec35bf898db287acff.tar.xz |
[feature] Allow users to create + delete bookbarks, and view bookmarked statuses (#1168)
* Implement Bookmarks
* Update based on review comments
* Update swagger doc
* Fix argument passing to status.Bookmark
* Update changed test
* Updates based on latest PR review
Diffstat (limited to 'internal/processing/status')
-rw-r--r-- | internal/processing/status/bookmark.go | 86 | ||||
-rw-r--r-- | internal/processing/status/bookmark_test.go | 48 | ||||
-rw-r--r-- | internal/processing/status/status.go | 4 | ||||
-rw-r--r-- | internal/processing/status/unbookmark.go | 69 | ||||
-rw-r--r-- | internal/processing/status/unbookmark_test.go | 54 |
5 files changed, 261 insertions, 0 deletions
diff --git a/internal/processing/status/bookmark.go b/internal/processing/status/bookmark.go new file mode 100644 index 000000000..0f13fbacf --- /dev/null +++ b/internal/processing/status/bookmark.go @@ -0,0 +1,86 @@ +/* + GoToSocial + Copyright (C) 2021-2022 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 status + +import ( + "context" + "errors" + "fmt" + + apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/id" +) + +func (p *processor) Bookmark(ctx context.Context, requestingAccount *gtsmodel.Account, targetStatusID string) (*apimodel.Status, gtserror.WithCode) { + targetStatus, err := p.db.GetStatusByID(ctx, targetStatusID) + if err != nil { + return nil, gtserror.NewErrorNotFound(fmt.Errorf("error fetching status %s: %s", targetStatusID, err)) + } + if targetStatus.Account == nil { + return nil, gtserror.NewErrorNotFound(fmt.Errorf("no status owner for status %s", targetStatusID)) + } + visible, err := p.filter.StatusVisible(ctx, targetStatus, requestingAccount) + if err != nil { + return nil, gtserror.NewErrorNotFound(fmt.Errorf("error seeing if status %s is visible: %s", targetStatus.ID, err)) + } + if !visible { + return nil, gtserror.NewErrorNotFound(errors.New("status is not visible")) + } + + // first check if the status is already bookmarked, if so we don't need to do anything + newBookmark := true + gtsBookmark := >smodel.StatusBookmark{} + if err := p.db.GetWhere(ctx, []db.Where{{Key: "status_id", Value: targetStatus.ID}, {Key: "account_id", Value: requestingAccount.ID}}, gtsBookmark); err == nil { + // we already have a bookmark for this status + newBookmark = false + } + + if newBookmark { + thisBookmarkID, err := id.NewULID() + if err != nil { + return nil, gtserror.NewErrorInternalError(err) + } + + // we need to create a new bookmark in the database + gtsBookmark := >smodel.StatusBookmark{ + ID: thisBookmarkID, + AccountID: requestingAccount.ID, + Account: requestingAccount, + TargetAccountID: targetStatus.AccountID, + TargetAccount: targetStatus.Account, + StatusID: targetStatus.ID, + Status: targetStatus, + } + + if err := p.db.Put(ctx, gtsBookmark); err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error putting bookmark in database: %s", err)) + } + } + + // return the apidon representation of the target status + apiStatus, err := p.tc.StatusToAPIStatus(ctx, targetStatus, requestingAccount) + if err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting status %s to frontend representation: %s", targetStatus.ID, err)) + } + + return apiStatus, nil +} diff --git a/internal/processing/status/bookmark_test.go b/internal/processing/status/bookmark_test.go new file mode 100644 index 000000000..ed1f9c774 --- /dev/null +++ b/internal/processing/status/bookmark_test.go @@ -0,0 +1,48 @@ +/* + GoToSocial + Copyright (C) 2021-2022 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 status_test + +import ( + "context" + "testing" + + "github.com/stretchr/testify/suite" +) + +type StatusBookmarkTestSuite struct { + StatusStandardTestSuite +} + +func (suite *StatusBookmarkTestSuite) TestBookmark() { + ctx := context.Background() + + // bookmark a status + bookmarkingAccount1 := suite.testAccounts["local_account_1"] + targetStatus1 := suite.testStatuses["admin_account_status_1"] + + bookmark1, err := suite.status.Bookmark(ctx, bookmarkingAccount1, targetStatus1.ID) + suite.NoError(err) + suite.NotNil(bookmark1) + suite.True(bookmark1.Bookmarked) + suite.Equal(targetStatus1.ID, bookmark1.ID) +} + +func TestStatusBookmarkTestSuite(t *testing.T) { + suite.Run(t, new(StatusBookmarkTestSuite)) +} diff --git a/internal/processing/status/status.go b/internal/processing/status/status.go index c63769c76..d31b69b38 100644 --- a/internal/processing/status/status.go +++ b/internal/processing/status/status.go @@ -54,6 +54,10 @@ type Processor interface { Unfave(ctx context.Context, account *gtsmodel.Account, targetStatusID string) (*apimodel.Status, gtserror.WithCode) // Context returns the context (previous and following posts) from the given status ID Context(ctx context.Context, account *gtsmodel.Account, targetStatusID string) (*apimodel.Context, gtserror.WithCode) + // Bookmarks a status + Bookmark(ctx context.Context, account *gtsmodel.Account, targetStatusID string) (*apimodel.Status, gtserror.WithCode) + // Removes a bookmark for a status + Unbookmark(ctx context.Context, account *gtsmodel.Account, targetStatusID string) (*apimodel.Status, gtserror.WithCode) /* PROCESSING UTILS diff --git a/internal/processing/status/unbookmark.go b/internal/processing/status/unbookmark.go new file mode 100644 index 000000000..ef5962495 --- /dev/null +++ b/internal/processing/status/unbookmark.go @@ -0,0 +1,69 @@ +/* + GoToSocial + Copyright (C) 2021-2022 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 status + +import ( + "context" + "errors" + "fmt" + + apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +) + +func (p *processor) Unbookmark(ctx context.Context, requestingAccount *gtsmodel.Account, targetStatusID string) (*apimodel.Status, gtserror.WithCode) { + targetStatus, err := p.db.GetStatusByID(ctx, targetStatusID) + if err != nil { + return nil, gtserror.NewErrorNotFound(fmt.Errorf("error fetching status %s: %s", targetStatusID, err)) + } + if targetStatus.Account == nil { + return nil, gtserror.NewErrorNotFound(fmt.Errorf("no status owner for status %s", targetStatusID)) + } + visible, err := p.filter.StatusVisible(ctx, targetStatus, requestingAccount) + if err != nil { + return nil, gtserror.NewErrorNotFound(fmt.Errorf("error seeing if status %s is visible: %s", targetStatus.ID, err)) + } + if !visible { + return nil, gtserror.NewErrorNotFound(errors.New("status is not visible")) + } + + // first check if the status is already bookmarked + toUnbookmark := false + gtsBookmark := >smodel.StatusBookmark{} + if err := p.db.GetWhere(ctx, []db.Where{{Key: "status_id", Value: targetStatus.ID}, {Key: "account_id", Value: requestingAccount.ID}}, gtsBookmark); err == nil { + // we already have a bookmark for this status + toUnbookmark = true + } + + if toUnbookmark { + if err := p.db.DeleteWhere(ctx, []db.Where{{Key: "status_id", Value: targetStatus.ID}, {Key: "account_id", Value: requestingAccount.ID}}, gtsBookmark); err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error unfaveing status: %s", err)) + } + } + + // return the apidon representation of the target status + apiStatus, err := p.tc.StatusToAPIStatus(ctx, targetStatus, requestingAccount) + if err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting status %s to frontend representation: %s", targetStatus.ID, err)) + } + + return apiStatus, nil +} diff --git a/internal/processing/status/unbookmark_test.go b/internal/processing/status/unbookmark_test.go new file mode 100644 index 000000000..38a60d776 --- /dev/null +++ b/internal/processing/status/unbookmark_test.go @@ -0,0 +1,54 @@ +/* + GoToSocial + Copyright (C) 2021-2022 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 status_test + +import ( + "context" + "testing" + + "github.com/stretchr/testify/suite" +) + +type StatusUnbookmarkTestSuite struct { + StatusStandardTestSuite +} + +func (suite *StatusUnbookmarkTestSuite) TestUnbookmark() { + ctx := context.Background() + + // bookmark a status + bookmarkingAccount1 := suite.testAccounts["local_account_1"] + targetStatus1 := suite.testStatuses["admin_account_status_1"] + + bookmark1, err := suite.status.Bookmark(ctx, bookmarkingAccount1, targetStatus1.ID) + suite.NoError(err) + suite.NotNil(bookmark1) + suite.True(bookmark1.Bookmarked) + suite.Equal(targetStatus1.ID, bookmark1.ID) + + bookmark2, err := suite.status.Unbookmark(ctx, bookmarkingAccount1, targetStatus1.ID) + suite.NoError(err) + suite.NotNil(bookmark2) + suite.False(bookmark2.Bookmarked) + suite.Equal(targetStatus1.ID, bookmark1.ID) +} + +func TestStatusUnbookmarkTestSuite(t *testing.T) { + suite.Run(t, new(StatusUnbookmarkTestSuite)) +} |