Refactor server errors handler

[github/Chocobozzz/PeerTube.git] / server / helpers / actor.ts

diff --git a/server/helpers/actor.ts b/server/helpers/actor.ts
index 12a7ace9fb7dbc1bdca9ef6a15b67c61720ceb56..5f742505bacc629f97232b4c21130d8d0cedfd31 100644 (file)
--- a/server/helpers/actor.ts
+++ b/server/helpers/actor.ts
@@ -1,10 +1,13 @@
-import { ActorModel } from '../models/activitypub/actor'
 
-type ActorFetchByUrlType = 'all' | 'actor-and-association-ids'
-function fetchActorByUrl (url: string, fetchType: ActorFetchByUrlType) {
+import { ActorModel } from '../models/actor/actor'
+import { MActorAccountChannelId, MActorFull } from '../types/models'
+
+type ActorFetchByUrlType = 'all' | 'association-ids'
+
+function fetchActorByUrl (url: string, fetchType: ActorFetchByUrlType): Promise<MActorFull | MActorAccountChannelId> {
   if (fetchType === 'all') return ActorModel.loadByUrlAndPopulateAccountAndChannel(url)
 
-  if (fetchType === 'actor-and-association-ids') return ActorModel.loadByUrl(url)
+  if (fetchType === 'association-ids') return ActorModel.loadByUrl(url)
 }
 
 export {