mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-02 04:22:25 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] 2643 bug search for account url doesnt always work when redirected (#2673)

Browse source 
* update activity library so dereferencer returns full response and checks *final* link to allow for redirects

* temporarily add bodged fixed library

* remove unused code

* update getAccountFeatured() to use dereferenceCollectionPage()

* make sure to release map

* perform a 2nd decode to ensure reader is empty after primary decode

* add comment explaining choice of using Decode() instead of Unmarshal()

* update embedded activity library to latest matching https://github.com/superseriousbusiness/activity/pull/21

* add checks to look for changed URI and re-check database if redirected

* update max iteration count to 512, add checks during dereferenceAncestors() for indirect URLs

* remove doubled-up code

* fix use of status instead of current

* use URIs for checking equality for security

* use the latest known URI for boost_of_uri in case original was an indirect

* add dereferenceCollection() function for dereferenceAccountFeatured()

* pull in latest github.com/superseriousbusiness/activity version (and remove the bodge!!)

* fix typo in code comments

* update decodeType() to accept a readcloser and handle body closing

* switch to checking using BoostOfID and add note why not using BoostOfURI

* ensure InReplyTo gets unset when deleting status parent in case currently stubbed

* add tests for Collection and CollectionPage iterators
This commit is contained in:
kim 2024-02-23 15:24:40 +00:00 • committed by GitHub
commit 1d51e3c8d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 814 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/federation/dereferencing/announce.go
View file

@ -83,6 +83,10 @@ func (d *Dereferencer) EnrichAnnounce(
return nil, gtserror.Newf("error generating id: %w", err)
}
// Set boost_of_uri again in case the
// original URI was an indirect link.
boost.BoostOfURI = target.URI
// Populate remaining fields on
// the boost wrapper using target.
boost.Content = target.Content
@ -101,10 +105,10 @@ func (d *Dereferencer) EnrichAnnounce(
boost.Replyable = target.Replyable
boost.Likeable = target.Likeable
// Store the boost wrapper status.
// Store the boost wrapper status in database.
switch err = d.state.DB.PutStatus(ctx, boost); {
case err == nil:
// All good baby.
// all groovy.
case errors.Is(err, db.ErrAlreadyExists):
uri := boost.URI
@ -119,8 +123,7 @@ func (d *Dereferencer) EnrichAnnounce(
)
}
default:
// Proper database error.
default: // Proper database error.
return nil, gtserror.Newf("db error inserting status: %w", err)
}