mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-10-31 22:40:01 +00:00
[bugfix] update common get target account / status doing refresh async (#3124)
This commit is contained in:
parent
8a2fb48ef4
commit
b415337d40
2 changed files with 26 additions and 28 deletions
|
@ -61,13 +61,22 @@ func (p *Processor) GetTargetAccountBy(
|
|||
}
|
||||
|
||||
if requester != nil && visible {
|
||||
// Ensure the account is up-to-date.
|
||||
p.federator.RefreshAccountAsync(ctx,
|
||||
// Only refresh account if visible to requester,
|
||||
// and there is *authorized* requester to prevent
|
||||
// a possible DOS vector for unauthorized clients.
|
||||
latest, _, err := p.federator.RefreshAccount(ctx,
|
||||
requester.Username,
|
||||
target,
|
||||
nil,
|
||||
nil,
|
||||
)
|
||||
if err != nil {
|
||||
log.Errorf(ctx, "error refreshing target %s: %v", target.URI, err)
|
||||
return target, visible, nil
|
||||
}
|
||||
|
||||
// Set latest.
|
||||
target = latest
|
||||
}
|
||||
|
||||
return target, visible, nil
|
||||
|
|
|
@ -69,33 +69,22 @@ func (p *Processor) GetTargetStatusBy(
|
|||
}
|
||||
|
||||
if requester != nil && visible {
|
||||
// We only bother refreshing if this status
|
||||
// is visible to requester, AND there *is*
|
||||
// a requester (i.e. request is authorized)
|
||||
// to prevent a possible DOS vector.
|
||||
|
||||
if window != nil {
|
||||
// Window is explicitly set, so likely
|
||||
// tighter than the default window.
|
||||
// Do refresh synchronously.
|
||||
_, _, err := p.federator.RefreshStatus(ctx,
|
||||
requester.Username,
|
||||
target,
|
||||
nil,
|
||||
window,
|
||||
)
|
||||
if err != nil {
|
||||
log.Errorf(ctx, "error refreshing status: %v", err)
|
||||
}
|
||||
} else {
|
||||
// Only refresh async *if* out-of-date.
|
||||
p.federator.RefreshStatusAsync(ctx,
|
||||
requester.Username,
|
||||
target,
|
||||
nil,
|
||||
nil,
|
||||
)
|
||||
// Only refresh status if visible to requester,
|
||||
// and there is *authorized* requester to prevent
|
||||
// a possible DOS vector for unauthorized clients.
|
||||
latest, _, err := p.federator.RefreshStatus(ctx,
|
||||
requester.Username,
|
||||
target,
|
||||
nil,
|
||||
window,
|
||||
)
|
||||
if err != nil {
|
||||
log.Errorf(ctx, "error refreshing target %s: %v", target.URI, err)
|
||||
return target, visible, nil
|
||||
}
|
||||
|
||||
// Set latest.
|
||||
target = latest
|
||||
}
|
||||
|
||||
return target, visible, nil
|
||||
|
|
Loading…
Reference in a new issue