From 5faeb4de2032e112ab49751eeeb906ac43826f3d Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Sun, 28 May 2023 13:08:35 +0100 Subject: [chore] tidy up media manager, add calling func to errors, build-script improvements (#1835) * media manager tidy-up: de-interface and remove unused PostDataFunc Signed-off-by: kim * remove last traces of media.Manager being an interface Signed-off-by: kim * update error to provide caller, allow tuneable via build tags Signed-off-by: kim * remove kim-specific build script changes Signed-off-by: kim * fix merge conflicts Signed-off-by: kim * update build-script to support externally setting build variables Signed-off-by: kim --------- Signed-off-by: kim --- internal/processing/fromfederator.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'internal/processing/fromfederator.go') diff --git a/internal/processing/fromfederator.go b/internal/processing/fromfederator.go index ecb7934c9..f91f5ae8b 100644 --- a/internal/processing/fromfederator.go +++ b/internal/processing/fromfederator.go @@ -379,8 +379,8 @@ func (p *Processor) processUpdateAccountFromFederator(ctx context.Context, feder return errors.New("Accountable was not parseable on update account message") } - // Call RefreshAccount to fetch up-to-date bio, avatar, header, etc. - updatedAccount, _, err := p.federator.RefreshAccount( + // Fetch up-to-date bio, avatar, header, etc. + _, _, err := p.federator.RefreshAccount( ctx, federatorMsg.ReceivingAccount.Username, incomingAccount, @@ -391,11 +391,6 @@ func (p *Processor) processUpdateAccountFromFederator(ctx context.Context, feder return fmt.Errorf("error enriching updated account from federator: %s", err) } - // RefreshAccount doesn't make DB update calls, so do that here. - if err := p.state.DB.UpdateAccount(ctx, updatedAccount); err != nil { - return fmt.Errorf("error enriching updated account from federator: %s", err) - } - return nil } -- cgit v1.2.3