summaryrefslogtreecommitdiff
path: root/internal/processing
diff options
context:
space:
mode:
authorLibravatar Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com>2021-06-21 15:56:00 +0200
committerLibravatar GitHub <noreply@github.com>2021-06-21 15:56:00 +0200
commita5fd6f427bab2cac03b4da5668eed18b900ba3be (patch)
tree5456928a707656a54cddcffb1199f59a4bc9039e /internal/processing
parentTestrig fixes (#50) (diff)
downloadgotosocial-a5fd6f427bab2cac03b4da5668eed18b900ba3be.tar.xz
Deletes+unboosts (#52)
* Status deletes properly streamed now. * Unboosts now work locally and federated. * Documentation updates.
Diffstat (limited to 'internal/processing')
-rw-r--r--internal/processing/fromclientapi.go42
-rw-r--r--internal/processing/fromcommon.go6
-rw-r--r--internal/processing/processor.go2
-rw-r--r--internal/processing/status.go4
-rw-r--r--internal/processing/synchronous/status/status.go2
-rw-r--r--internal/processing/synchronous/status/unboost.go95
-rw-r--r--internal/processing/synchronous/streaming/streamdelete.go51
-rw-r--r--internal/processing/synchronous/streaming/streaming.go5
8 files changed, 206 insertions, 1 deletions
diff --git a/internal/processing/fromclientapi.go b/internal/processing/fromclientapi.go
index 8c4a1692e..180af04fe 100644
--- a/internal/processing/fromclientapi.go
+++ b/internal/processing/fromclientapi.go
@@ -138,6 +138,18 @@ func (p *processor) processFromClientAPI(clientMsg gtsmodel.FromClientAPI) error
return errors.New("undo was not parseable as *gtsmodel.StatusFave")
}
return p.federateUnfave(fave, clientMsg.OriginAccount, clientMsg.TargetAccount)
+ case gtsmodel.ActivityStreamsAnnounce:
+ // UNDO ANNOUNCE/BOOST
+ boost, ok := clientMsg.GTSModel.(*gtsmodel.Status)
+ if !ok {
+ return errors.New("undo was not parseable as *gtsmodel.Status")
+ }
+
+ if err := p.deleteStatusFromTimelines(boost); err != nil {
+ return err
+ }
+
+ return p.federateUnannounce(boost, clientMsg.OriginAccount, clientMsg.TargetAccount)
}
case gtsmodel.ActivityStreamsDelete:
// DELETE
@@ -313,6 +325,36 @@ func (p *processor) federateUnfave(fave *gtsmodel.StatusFave, originAccount *gts
return err
}
+func (p *processor) federateUnannounce(boost *gtsmodel.Status, originAccount *gtsmodel.Account, targetAccount *gtsmodel.Account) error {
+ asAnnounce, err := p.tc.BoostToAS(boost, originAccount, targetAccount)
+ if err != nil {
+ return fmt.Errorf("federateUnannounce: error converting status to announce: %s", err)
+ }
+
+ // create an Undo and set the appropriate actor on it
+ undo := streams.NewActivityStreamsUndo()
+ undo.SetActivityStreamsActor(asAnnounce.GetActivityStreamsActor())
+
+ // Set the boost as the 'object' property.
+ undoObject := streams.NewActivityStreamsObjectProperty()
+ undoObject.AppendActivityStreamsAnnounce(asAnnounce)
+ undo.SetActivityStreamsObject(undoObject)
+
+ // set the to
+ undo.SetActivityStreamsTo(asAnnounce.GetActivityStreamsTo())
+
+ // set the cc
+ undo.SetActivityStreamsCc(asAnnounce.GetActivityStreamsCc())
+
+ outboxIRI, err := url.Parse(originAccount.OutboxURI)
+ if err != nil {
+ return fmt.Errorf("federateUnannounce: error parsing outboxURI %s: %s", originAccount.OutboxURI, err)
+ }
+
+ _, err = p.federator.FederatingActor().Send(context.Background(), outboxIRI, undo)
+ return err
+}
+
func (p *processor) federateAcceptFollowRequest(follow *gtsmodel.Follow, originAccount *gtsmodel.Account, targetAccount *gtsmodel.Account) error {
// if both accounts are local there's nothing to do here
if originAccount.Domain == "" && targetAccount.Domain == "" {
diff --git a/internal/processing/fromcommon.go b/internal/processing/fromcommon.go
index e10f75441..d719b7f5f 100644
--- a/internal/processing/fromcommon.go
+++ b/internal/processing/fromcommon.go
@@ -401,5 +401,9 @@ func (p *processor) timelineStatusForAccount(status *gtsmodel.Status, accountID
}
func (p *processor) deleteStatusFromTimelines(status *gtsmodel.Status) error {
- return p.timelineManager.WipeStatusFromAllTimelines(status.ID)
+ if err := p.timelineManager.WipeStatusFromAllTimelines(status.ID); err != nil {
+ return err
+ }
+
+ return p.streamingProcessor.StreamDelete(status.ID)
}
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index d1b44314d..618fd641b 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -117,6 +117,8 @@ type Processor interface {
StatusFave(authed *oauth.Auth, targetStatusID string) (*apimodel.Status, error)
// StatusBoost processes the boost/reblog of a given status, returning the newly-created boost if all is well.
StatusBoost(authed *oauth.Auth, targetStatusID string) (*apimodel.Status, gtserror.WithCode)
+ // StatusUnboost processes the unboost/unreblog of a given status, returning the status if all is well.
+ StatusUnboost(authed *oauth.Auth, targetStatusID string) (*apimodel.Status, gtserror.WithCode)
// StatusBoostedBy returns a slice of accounts that have boosted the given status, filtered according to privacy settings.
StatusBoostedBy(authed *oauth.Auth, targetStatusID string) ([]*apimodel.Account, gtserror.WithCode)
// StatusFavedBy returns a slice of accounts that have liked the given status, filtered according to privacy settings.
diff --git a/internal/processing/status.go b/internal/processing/status.go
index 6848436d4..ab3843ded 100644
--- a/internal/processing/status.go
+++ b/internal/processing/status.go
@@ -40,6 +40,10 @@ func (p *processor) StatusBoost(authed *oauth.Auth, targetStatusID string) (*api
return p.statusProcessor.Boost(authed.Account, authed.Application, targetStatusID)
}
+func (p *processor) StatusUnboost(authed *oauth.Auth, targetStatusID string) (*apimodel.Status, gtserror.WithCode) {
+ return p.statusProcessor.Unboost(authed.Account, authed.Application, targetStatusID)
+}
+
func (p *processor) StatusBoostedBy(authed *oauth.Auth, targetStatusID string) ([]*apimodel.Account, gtserror.WithCode) {
return p.statusProcessor.BoostedBy(authed.Account, targetStatusID)
}
diff --git a/internal/processing/synchronous/status/status.go b/internal/processing/synchronous/status/status.go
index cfc48ff30..d83c325fd 100644
--- a/internal/processing/synchronous/status/status.go
+++ b/internal/processing/synchronous/status/status.go
@@ -21,6 +21,8 @@ type Processor interface {
Fave(account *gtsmodel.Account, targetStatusID string) (*apimodel.Status, gtserror.WithCode)
// Boost processes the boost/reblog of a given status, returning the newly-created boost if all is well.
Boost(account *gtsmodel.Account, application *gtsmodel.Application, targetStatusID string) (*apimodel.Status, gtserror.WithCode)
+ // Unboost processes the unboost/unreblog of a given status, returning the status if all is well.
+ Unboost(account *gtsmodel.Account, application *gtsmodel.Application, targetStatusID string) (*apimodel.Status, gtserror.WithCode)
// BoostedBy returns a slice of accounts that have boosted the given status, filtered according to privacy settings.
BoostedBy(account *gtsmodel.Account, targetStatusID string) ([]*apimodel.Account, gtserror.WithCode)
// FavedBy returns a slice of accounts that have liked the given status, filtered according to privacy settings.
diff --git a/internal/processing/synchronous/status/unboost.go b/internal/processing/synchronous/status/unboost.go
new file mode 100644
index 000000000..2a1394695
--- /dev/null
+++ b/internal/processing/synchronous/status/unboost.go
@@ -0,0 +1,95 @@
+package status
+
+import (
+ "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) Unboost(account *gtsmodel.Account, application *gtsmodel.Application, targetStatusID string) (*apimodel.Status, gtserror.WithCode) {
+ l := p.log.WithField("func", "Unboost")
+
+ l.Tracef("going to search for target status %s", targetStatusID)
+ targetStatus := &gtsmodel.Status{}
+ if err := p.db.GetByID(targetStatusID, targetStatus); err != nil {
+ return nil, gtserror.NewErrorNotFound(fmt.Errorf("error fetching status %s: %s", targetStatusID, err))
+ }
+
+ l.Tracef("going to search for target account %s", targetStatus.AccountID)
+ targetAccount := &gtsmodel.Account{}
+ if err := p.db.GetByID(targetStatus.AccountID, targetAccount); err != nil {
+ return nil, gtserror.NewErrorNotFound(fmt.Errorf("error fetching target account %s: %s", targetStatus.AccountID, err))
+ }
+
+ l.Trace("going to see if status is visible")
+ visible, err := p.filter.StatusVisible(targetStatus, account)
+ 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"))
+ }
+
+ // check if we actually have a boost for this status
+ var toUnboost bool
+
+ gtsBoost := &gtsmodel.Status{}
+ where := []db.Where{
+ {
+ Key: "boost_of_id",
+ Value: targetStatusID,
+ },
+ {
+ Key: "account_id",
+ Value: account.ID,
+ },
+ }
+ err = p.db.GetWhere(where, gtsBoost)
+ if err == nil {
+ // we have a boost
+ toUnboost = true
+ }
+
+ if err != nil {
+ // something went wrong in the db finding the boost
+ if _, ok := err.(db.ErrNoEntries); !ok {
+ return nil, gtserror.NewErrorInternalError(fmt.Errorf("error fetching existing boost from database: %s", err))
+ }
+ // we just don't have a boost
+ toUnboost = false
+ }
+
+ if toUnboost {
+ // we had a boost, so take some action to get rid of it
+ if err := p.db.DeleteWhere(where, &gtsmodel.Status{}); err != nil {
+ return nil, gtserror.NewErrorInternalError(fmt.Errorf("error unboosting status: %s", err))
+ }
+
+ // pin some stuff onto the boost while we have it out of the db
+ gtsBoost.GTSBoostedStatus = targetStatus
+ gtsBoost.GTSBoostedStatus.GTSAuthorAccount = targetAccount
+ gtsBoost.GTSBoostedAccount = targetAccount
+ gtsBoost.GTSAuthorAccount = account
+
+ // send it back to the processor for async processing
+ p.fromClientAPI <- gtsmodel.FromClientAPI{
+ APObjectType: gtsmodel.ActivityStreamsAnnounce,
+ APActivityType: gtsmodel.ActivityStreamsUndo,
+ GTSModel: gtsBoost,
+ OriginAccount: account,
+ TargetAccount: targetAccount,
+ }
+ }
+
+ mastoStatus, err := p.tc.StatusToMasto(targetStatus, account)
+ if err != nil {
+ return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting status %s to frontend representation: %s", targetStatus.ID, err))
+ }
+
+ return mastoStatus, nil
+}
diff --git a/internal/processing/synchronous/streaming/streamdelete.go b/internal/processing/synchronous/streaming/streamdelete.go
new file mode 100644
index 000000000..2282c29ae
--- /dev/null
+++ b/internal/processing/synchronous/streaming/streamdelete.go
@@ -0,0 +1,51 @@
+package streaming
+
+import (
+ "fmt"
+ "strings"
+
+ "github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+)
+
+func (p *processor) StreamDelete(statusID string) error {
+ errs := []string{}
+
+ // we want to range through ALL streams for ALL accounts here to make sure it's very clear to everyone that the status has been deleted
+ p.streamMap.Range(func(k interface{}, v interface{}) bool {
+ // the key of this map should be an accountID (string)
+ accountID, ok := k.(string)
+ if !ok {
+ errs = append(errs, "key in streamMap was not a string!")
+ return false
+ }
+
+ // the value of the map should be a buncha streams
+ streamsForAccount, ok := v.(*gtsmodel.StreamsForAccount)
+ if !ok {
+ errs = append(errs, fmt.Sprintf("stream map error for account stream %s", accountID))
+ }
+
+ // lock the streams while we work on them
+ streamsForAccount.Lock()
+ defer streamsForAccount.Unlock()
+ for _, stream := range streamsForAccount.Streams {
+ // lock each individual stream as we work on it
+ stream.Lock()
+ defer stream.Unlock()
+ if stream.Connected {
+ stream.Messages <- &gtsmodel.Message{
+ Stream: []string{stream.Type},
+ Event: "delete",
+ Payload: statusID,
+ }
+ }
+ }
+ return true
+ })
+
+ if len(errs) != 0 {
+ return fmt.Errorf("one or more errors streaming status delete: %s", strings.Join(errs, ";"))
+ }
+
+ return nil
+}
diff --git a/internal/processing/synchronous/streaming/streaming.go b/internal/processing/synchronous/streaming/streaming.go
index 9fd628547..de75b8f27 100644
--- a/internal/processing/synchronous/streaming/streaming.go
+++ b/internal/processing/synchronous/streaming/streaming.go
@@ -18,9 +18,14 @@ import (
type Processor interface {
// AuthorizeStreamingRequest returns an oauth2 token info in response to an access token query from the streaming API
AuthorizeStreamingRequest(accessToken string) (*gtsmodel.Account, error)
+ // OpenStreamForAccount returns a new Stream for the given account, which will contain a channel for passing messages back to the caller.
OpenStreamForAccount(account *gtsmodel.Account, streamType string) (*gtsmodel.Stream, gtserror.WithCode)
+ // StreamStatusToAccount streams the given status to any open, appropriate streams belonging to the given account.
StreamStatusToAccount(s *apimodel.Status, account *gtsmodel.Account) error
+ // StreamNotificationToAccount streams the given notification to any open, appropriate streams belonging to the given account.
StreamNotificationToAccount(n *apimodel.Notification, account *gtsmodel.Account) error
+ // StreamDelete streams the delete of the given statusID to *ALL* open streams.
+ StreamDelete(statusID string) error
}
type processor struct {