From 5e060d0bcb9af77e7b6d11acba99db6219d4f68e Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 10 Dec 2022 22:43:11 +0100 Subject: [feature] Start implementing refetch of lost media files via `/api/v1/admin/media_refetch` (#1221) * [chore] Move ShortcodeDomain to its own little util func * [feature] Add RefetchEmojis function to media manager * [feature] Expose admin media refresh via admin API * update following review feedback - change/fix log levels - make sure not to try to refetch local emojis - small style refactoring + comments * log on emoji refetch start Signed-off-by: kim Co-authored-by: kim --- internal/processing/admin/admin.go | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'internal/processing/admin/admin.go') diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go index f04d322ad..b0d4ce460 100644 --- a/internal/processing/admin/admin.go +++ b/internal/processing/admin/admin.go @@ -30,6 +30,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/storage" + "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" ) @@ -48,23 +49,26 @@ type Processor interface { EmojiUpdate(ctx context.Context, id string, form *apimodel.EmojiUpdateRequest) (*apimodel.AdminEmoji, gtserror.WithCode) EmojiCategoriesGet(ctx context.Context) ([]*apimodel.EmojiCategory, gtserror.WithCode) MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode + MediaRefetch(ctx context.Context, requestingAccount *gtsmodel.Account, domain string) gtserror.WithCode } type processor struct { - tc typeutils.TypeConverter - mediaManager media.Manager - storage *storage.Driver - clientWorker *concurrency.WorkerPool[messages.FromClientAPI] - db db.DB + tc typeutils.TypeConverter + mediaManager media.Manager + transportController transport.Controller + storage *storage.Driver + clientWorker *concurrency.WorkerPool[messages.FromClientAPI] + db db.DB } // New returns a new admin processor. -func New(db db.DB, tc typeutils.TypeConverter, mediaManager media.Manager, storage *storage.Driver, clientWorker *concurrency.WorkerPool[messages.FromClientAPI]) Processor { +func New(db db.DB, tc typeutils.TypeConverter, mediaManager media.Manager, transportController transport.Controller, storage *storage.Driver, clientWorker *concurrency.WorkerPool[messages.FromClientAPI]) Processor { return &processor{ - tc: tc, - mediaManager: mediaManager, - storage: storage, - clientWorker: clientWorker, - db: db, + tc: tc, + mediaManager: mediaManager, + transportController: transportController, + storage: storage, + clientWorker: clientWorker, + db: db, } } -- cgit v1.2.3