From 8f67dd583d86155440e7905ae23083a9fea42f72 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:44:11 +0100 Subject: [chore] deinterface the typeutils.Converter and update to use state structure (#2217) * update typeconverter to use state structure * deinterface the typeutils.TypeConverter -> typeutils.Converter * finish copying over old type converter code comments * fix cherry-pick merge issues, fix tests pointing to old typeutils interface type still --- internal/processing/account/get.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/processing/account/get.go') diff --git a/internal/processing/account/get.go b/internal/processing/account/get.go index ddb7c14e0..500c0c2e5 100644 --- a/internal/processing/account/get.go +++ b/internal/processing/account/get.go @@ -80,7 +80,7 @@ func (p *Processor) getFor(ctx context.Context, requestingAccount *gtsmodel.Acco } if blocked { - apiAccount, err := p.tc.AccountToAPIAccountBlocked(ctx, targetAccount) + apiAccount, err := p.converter.AccountToAPIAccountBlocked(ctx, targetAccount) if err != nil { return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting account: %w", err)) } @@ -107,9 +107,9 @@ func (p *Processor) getFor(ctx context.Context, requestingAccount *gtsmodel.Acco var apiAccount *apimodel.Account if requestingAccount != nil && targetAccount.ID == requestingAccount.ID { - apiAccount, err = p.tc.AccountToAPIAccountSensitive(ctx, targetAccount) + apiAccount, err = p.converter.AccountToAPIAccountSensitive(ctx, targetAccount) } else { - apiAccount, err = p.tc.AccountToAPIAccountPublic(ctx, targetAccount) + apiAccount, err = p.converter.AccountToAPIAccountPublic(ctx, targetAccount) } if err != nil { return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting account: %w", err)) -- cgit v1.2.3