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

[chore] deinterface the typeutils.Converter and update to use state structure (#2217)

Browse source 
* 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
This commit is contained in:
kim 2023-09-23 17:44:11 +01:00 • committed by GitHub
commit 8f67dd583d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
119 changed files with 611 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/processing/report/create.go
View file

@ -99,7 +99,7 @@ func (p *Processor) Create(ctx context.Context, account *gtsmodel.Account, form
TargetAccount: targetAccount,
})
apiReport, err := p.tc.ReportToAPIReport(ctx, report)
apiReport, err := p.converter.ReportToAPIReport(ctx, report)
if err != nil {
err = fmt.Errorf("error converting report to frontend representation: %w", err)
return nil, gtserror.NewErrorInternalError(err)

4
internal/processing/report/get.go
View file

@ -45,7 +45,7 @@ func (p *Processor) Get(ctx context.Context, account *gtsmodel.Account, id strin
return nil, gtserror.NewErrorNotFound(err)
}
apiReport, err := p.tc.ReportToAPIReport(ctx, report)
apiReport, err := p.converter.ReportToAPIReport(ctx, report)
if err != nil {
return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting report to api: %s", err))
}
@ -79,7 +79,7 @@ func (p *Processor) GetMultiple(
prevMinIDValue := reports[0].ID
for _, r := range reports {
item, err := p.tc.ReportToAPIReport(ctx, r)
item, err := p.converter.ReportToAPIReport(ctx, r)
if err != nil {
return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting report to api: %s", err))
}

10
internal/processing/report/report.go
View file

@ -23,13 +23,13 @@ import (
)
type Processor struct {
state *state.State
tc typeutils.TypeConverter
state *state.State
converter *typeutils.Converter
}
func New(state *state.State, tc typeutils.TypeConverter) Processor {
func New(state *state.State, converter *typeutils.Converter) Processor {
return Processor{
state: state,
tc: tc,
state: state,
converter: converter,
}
}