mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-07 07:28:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore] Move DoOnce func wrapper to util (#2613)

Browse source
This commit is contained in:
tobi 2024-02-09 12:38:51 +01:00 • committed by GitHub
commit 7a7746701d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/federation/dereferencing/account.go
View file

@ -37,6 +37,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/transport"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
// accountUpToDate returns whether the given account model is both updateable (i.e.
@ -384,7 +385,7 @@ func (d *Dereferencer) enrichAccountSafely(
// to safely defer in case of panic, while still
// performing more granular unlocks when needed.
unlock := d.state.FedLocks.Lock(uriStr)
unlock = doOnce(unlock)
unlock = util.DoOnce(unlock)
defer unlock()
// Perform status enrichment with passed vars.
@ -735,7 +736,7 @@ func (d *Dereferencer) fetchRemoteAccountAvatar(ctx context.Context, tsport tran
// Acquire lock for derefs map.
unlock := d.state.FedLocks.Lock(latestAcc.AvatarRemoteURL)
unlock = doOnce(unlock)
unlock = util.DoOnce(unlock)
defer unlock()
// Look for an existing dereference in progress.
@ -821,7 +822,7 @@ func (d *Dereferencer) fetchRemoteAccountHeader(ctx context.Context, tsport tran
// Acquire lock for derefs map.
unlock := d.state.FedLocks.Lock(latestAcc.HeaderRemoteURL)
unlock = doOnce(unlock)
unlock = util.DoOnce(unlock)
defer unlock()
// Look for an existing dereference in progress.

3
internal/federation/dereferencing/emoji.go
View file

@ -28,6 +28,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/id"
"github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/media"
"github.com/superseriousbusiness/gotosocial/internal/util"
)
func (d *Dereferencer) GetRemoteEmoji(ctx context.Context, requestingUsername string, remoteURL string, shortcode string, domain string, id string, emojiURI string, ai *media.AdditionalEmojiInfo, refresh bool) (*media.ProcessingEmoji, error) {
@ -44,7 +45,7 @@ func (d *Dereferencer) GetRemoteEmoji(ctx context.Context, requestingUsername st
// Acquire lock for derefs map.
unlock := d.state.FedLocks.Lock(remoteURL)
unlock = doOnce(unlock)
unlock = util.DoOnce(unlock)
defer unlock()
// first check if we're already processing this emoji

2
internal/federation/dereferencing/status.go
View file

@ -295,7 +295,7 @@ func (d *Dereferencer) enrichStatusSafely(
// to safely defer in case of panic, while still
// performing more granular unlocks when needed.
unlock := d.state.FedLocks.Lock(uriStr)
unlock = doOnce(unlock)
unlock = util.DoOnce(unlock)
defer unlock()
// Perform status enrichment with passed vars.

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

@ -23,17 +23,6 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
)
// doOnce wraps a function to only perform it once.
func doOnce(fn func()) func() {
var once int32
return func() {
if once == 0 {
fn()
once = 1
}
}
}
// pollChanged returns whether a poll has changed in way that
// indicates that this should be an entirely new poll. i.e. if
// the available options have changed, or the expiry has increased.