diff options
Diffstat (limited to 'internal/processing/timeline')
-rw-r--r-- | internal/processing/timeline/faved.go | 2 | ||||
-rw-r--r-- | internal/processing/timeline/home.go | 4 | ||||
-rw-r--r-- | internal/processing/timeline/list.go | 4 | ||||
-rw-r--r-- | internal/processing/timeline/notification.go | 4 | ||||
-rw-r--r-- | internal/processing/timeline/public.go | 2 | ||||
-rw-r--r-- | internal/processing/timeline/tag.go | 2 | ||||
-rw-r--r-- | internal/processing/timeline/timeline.go | 14 |
7 files changed, 16 insertions, 16 deletions
diff --git a/internal/processing/timeline/faved.go b/internal/processing/timeline/faved.go index 556ced4c3..205b15069 100644 --- a/internal/processing/timeline/faved.go +++ b/internal/processing/timeline/faved.go @@ -54,7 +54,7 @@ func (p *Processor) FavedTimelineGet(ctx context.Context, authed *oauth.Auth, ma continue } - apiStatus, err := p.tc.StatusToAPIStatus(ctx, s, authed.Account) + apiStatus, err := p.converter.StatusToAPIStatus(ctx, s, authed.Account) if err != nil { log.Errorf(ctx, "error convering to api status: %v", err) continue diff --git a/internal/processing/timeline/home.go b/internal/processing/timeline/home.go index 72940175f..126c9f668 100644 --- a/internal/processing/timeline/home.go +++ b/internal/processing/timeline/home.go @@ -84,7 +84,7 @@ func HomeTimelineFilter(state *state.State, filter *visibility.Filter) timeline. } // HomeTimelineStatusPrepare returns a function that satisfies PrepareFunction for home timelines. -func HomeTimelineStatusPrepare(state *state.State, tc typeutils.TypeConverter) timeline.PrepareFunction { +func HomeTimelineStatusPrepare(state *state.State, converter *typeutils.Converter) timeline.PrepareFunction { return func(ctx context.Context, accountID string, itemID string) (timeline.Preparable, error) { status, err := state.DB.GetStatusByID(ctx, itemID) if err != nil { @@ -98,7 +98,7 @@ func HomeTimelineStatusPrepare(state *state.State, tc typeutils.TypeConverter) t return nil, err } - return tc.StatusToAPIStatus(ctx, status, requestingAccount) + return converter.StatusToAPIStatus(ctx, status, requestingAccount) } } diff --git a/internal/processing/timeline/list.go b/internal/processing/timeline/list.go index 80744df15..64de288db 100644 --- a/internal/processing/timeline/list.go +++ b/internal/processing/timeline/list.go @@ -90,7 +90,7 @@ func ListTimelineFilter(state *state.State, filter *visibility.Filter) timeline. } // ListTimelineStatusPrepare returns a function that satisfies PrepareFunction for list timelines. -func ListTimelineStatusPrepare(state *state.State, tc typeutils.TypeConverter) timeline.PrepareFunction { +func ListTimelineStatusPrepare(state *state.State, converter *typeutils.Converter) timeline.PrepareFunction { return func(ctx context.Context, listID string, itemID string) (timeline.Preparable, error) { status, err := state.DB.GetStatusByID(ctx, itemID) if err != nil { @@ -110,7 +110,7 @@ func ListTimelineStatusPrepare(state *state.State, tc typeutils.TypeConverter) t return nil, err } - return tc.StatusToAPIStatus(ctx, status, requestingAccount) + return converter.StatusToAPIStatus(ctx, status, requestingAccount) } } diff --git a/internal/processing/timeline/notification.go b/internal/processing/timeline/notification.go index 4a79fb82a..09febdb46 100644 --- a/internal/processing/timeline/notification.go +++ b/internal/processing/timeline/notification.go @@ -87,7 +87,7 @@ func (p *Processor) NotificationsGet(ctx context.Context, authed *oauth.Auth, ma } } - item, err := p.tc.NotificationToAPINotification(ctx, n) + item, err := p.converter.NotificationToAPINotification(ctx, n) if err != nil { log.Debugf(ctx, "skipping notification %s because it couldn't be converted to its api representation: %s", n.ID, err) continue @@ -121,7 +121,7 @@ func (p *Processor) NotificationGet(ctx context.Context, account *gtsmodel.Accou return nil, gtserror.NewErrorNotFound(err) } - apiNotif, err := p.tc.NotificationToAPINotification(ctx, notif) + apiNotif, err := p.converter.NotificationToAPINotification(ctx, notif) if err != nil { if errors.Is(err, db.ErrNoEntries) { return nil, gtserror.NewErrorNotFound(err) diff --git a/internal/processing/timeline/public.go b/internal/processing/timeline/public.go index 78ca56734..eb8c0c381 100644 --- a/internal/processing/timeline/public.go +++ b/internal/processing/timeline/public.go @@ -62,7 +62,7 @@ func (p *Processor) PublicTimelineGet(ctx context.Context, authed *oauth.Auth, m continue } - apiStatus, err := p.tc.StatusToAPIStatus(ctx, s, authed.Account) + apiStatus, err := p.converter.StatusToAPIStatus(ctx, s, authed.Account) if err != nil { log.Errorf(ctx, "error convert to api status: %v", err) continue diff --git a/internal/processing/timeline/tag.go b/internal/processing/timeline/tag.go index 943aa1722..45632ce06 100644 --- a/internal/processing/timeline/tag.go +++ b/internal/processing/timeline/tag.go @@ -122,7 +122,7 @@ func (p *Processor) packageTagResponse( continue } - apiStatus, err := p.tc.StatusToAPIStatus(ctx, s, requestingAcct) + apiStatus, err := p.converter.StatusToAPIStatus(ctx, s, requestingAcct) if err != nil { log.Errorf(ctx, "error converting to api status: %v", err) continue diff --git a/internal/processing/timeline/timeline.go b/internal/processing/timeline/timeline.go index 7a95f9a11..bf9864398 100644 --- a/internal/processing/timeline/timeline.go +++ b/internal/processing/timeline/timeline.go @@ -24,15 +24,15 @@ import ( ) type Processor struct { - state *state.State - tc typeutils.TypeConverter - filter *visibility.Filter + state *state.State + converter *typeutils.Converter + filter *visibility.Filter } -func New(state *state.State, tc typeutils.TypeConverter, filter *visibility.Filter) Processor { +func New(state *state.State, converter *typeutils.Converter, filter *visibility.Filter) Processor { return Processor{ - state: state, - tc: tc, - filter: filter, + state: state, + converter: converter, + filter: filter, } } |