summaryrefslogtreecommitdiff
path: root/internal/processing
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-05-23 17:40:03 +0200
committerLibravatar GitHub <noreply@github.com>2022-05-23 16:40:03 +0100
commitf0c9f4169be6c5c7dd913f348cdd294a19038d63 (patch)
tree7d06da6edc0ed92c78b79938a20c7e82f784fac4 /internal/processing
parent[docs] document a checklist for how to go about a release (#592) (diff)
downloadgotosocial-f0c9f4169be6c5c7dd913f348cdd294a19038d63.tar.xz
[bugfix] Fix multiple dereferences of boosted status causing media duplication (#589)
* add some announces to test models * start on announce test logic * test federatingDB.Announce * change signature of GetRemoteStatus * remove 'refresh' logic and replace it with refetch * go fmt * remove timeline manager from processor test * make zork created at determinate * test get account statuses * test get + serialize zork * make account keys determinate * make admin accountCreate time determinate * test account to as * init test config before test log * test status to frontend * remove daft Within check * hack around a bit * use index of slice
Diffstat (limited to 'internal/processing')
-rw-r--r--internal/processing/fromfederator.go2
-rw-r--r--internal/processing/processor_test.go2
-rw-r--r--internal/processing/search.go2
3 files changed, 2 insertions, 4 deletions
diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go
index 06df17d91..a2eaa9bd1 100644
--- a/internal/processing/fromfederator.go
+++ b/internal/processing/fromfederator.go
@@ -108,7 +108,7 @@ func (p *processor) processCreateStatusFromFederator(ctx context.Context, federa
return errors.New("ProcessFromFederator: status was not pinned to federatorMsg, and neither was an IRI for us to dereference")
}
var err error
- status, _, _, err = p.federator.GetRemoteStatus(ctx, federatorMsg.ReceivingAccount.Username, federatorMsg.APIri, false, false)
+ status, _, err = p.federator.GetRemoteStatus(ctx, federatorMsg.ReceivingAccount.Username, federatorMsg.APIri, false, false)
if err != nil {
return err
}
diff --git a/internal/processing/processor_test.go b/internal/processing/processor_test.go
index 5946e6718..7032f8e28 100644
--- a/internal/processing/processor_test.go
+++ b/internal/processing/processor_test.go
@@ -38,7 +38,6 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
"github.com/superseriousbusiness/gotosocial/internal/processing"
- "github.com/superseriousbusiness/gotosocial/internal/timeline"
"github.com/superseriousbusiness/gotosocial/internal/transport"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
"github.com/superseriousbusiness/gotosocial/testrig"
@@ -54,7 +53,6 @@ type ProcessingStandardTestSuite struct {
transportController transport.Controller
federator federation.Federator
oauthServer oauth.Server
- timelineManager timeline.Manager
emailSender email.Sender
// standard suite models
diff --git a/internal/processing/search.go b/internal/processing/search.go
index 6c3d7da39..03f158187 100644
--- a/internal/processing/search.go
+++ b/internal/processing/search.go
@@ -127,7 +127,7 @@ func (p *processor) searchStatusByURI(ctx context.Context, authed *oauth.Auth, u
// we don't have it locally so dereference it if we're allowed to
if resolve {
- status, _, _, err := p.federator.GetRemoteStatus(ctx, authed.Account.Username, uri, true, true)
+ status, _, err := p.federator.GetRemoteStatus(ctx, authed.Account.Username, uri, false, true)
if err == nil {
if err := p.federator.DereferenceRemoteThread(ctx, authed.Account.Username, uri); err != nil {
// try to deref the thread while we're here