mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-06-12 02:09:29 +00:00
move back accidentally shuffled account deletion order
This commit is contained in:
parent
951d591f4f
commit
7430444b18
|
@ -706,15 +706,14 @@ func (p *clientAPI) DeleteAccount(ctx context.Context, cMsg *messages.FromClient
|
||||||
p.state.Workers.Federator.Queue.Delete("Receiving.ID", account.ID)
|
p.state.Workers.Federator.Queue.Delete("Receiving.ID", account.ID)
|
||||||
p.state.Workers.Federator.Queue.Delete("TargetURI", account.URI)
|
p.state.Workers.Federator.Queue.Delete("TargetURI", account.URI)
|
||||||
|
|
||||||
// First perform the actual account deletion.
|
|
||||||
if err := p.account.Delete(ctx, cMsg.Target, originID); err != nil {
|
|
||||||
log.Errorf(ctx, "error deleting account: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := p.federate.DeleteAccount(ctx, cMsg.Target); err != nil {
|
if err := p.federate.DeleteAccount(ctx, cMsg.Target); err != nil {
|
||||||
log.Errorf(ctx, "error federating account delete: %v", err)
|
log.Errorf(ctx, "error federating account delete: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := p.account.Delete(ctx, cMsg.Target, originID); err != nil {
|
||||||
|
log.Errorf(ctx, "error deleting account: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue