Move models to typescript-sequelize

1 files changed, 13 insertions, 12 deletions

diff --git a/server/lib/activitypub/send/send-delete.ts b/server/lib/activitypub/send/send-delete.ts
index 8193790b3..0a45ea10f 100644
--- a/server/lib/activitypub/send/send-delete.ts
+++ b/server/lib/activitypub/send/send-delete.ts
@@ -1,32 +1,35 @@
 import { Transaction } from 'sequelize'
-import { ActivityDelete } from '../../../../shared/models/activitypub/activity'
-import { database as db } from '../../../initializers'
-import { AccountInstance, VideoChannelInstance, VideoInstance } from '../../../models'
+import { ActivityDelete } from '../../../../shared/models/activitypub'
+import { AccountModel } from '../../../models/account/account'
+import { VideoModel } from '../../../models/video/video'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import { VideoChannelShareModel } from '../../../models/video/video-channel-share'
+import { VideoShareModel } from '../../../models/video/video-share'
 import { broadcastToFollowers } from './misc'
 
-async function sendDeleteVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
+async function sendDeleteVideoChannel (videoChannel: VideoChannelModel, t: Transaction) {
   const byAccount = videoChannel.Account
 
   const data = deleteActivityData(videoChannel.url, byAccount)
 
-  const accountsInvolved = await db.VideoChannelShare.loadAccountsByShare(videoChannel.id, t)
+  const accountsInvolved = await VideoChannelShareModel.loadAccountsByShare(videoChannel.id, t)
   accountsInvolved.push(byAccount)
 
   return broadcastToFollowers(data, byAccount, accountsInvolved, t)
 }
 
-async function sendDeleteVideo (video: VideoInstance, t: Transaction) {
+async function sendDeleteVideo (video: VideoModel, t: Transaction) {
   const byAccount = video.VideoChannel.Account
 
   const data = deleteActivityData(video.url, byAccount)
 
-  const accountsInvolved = await db.VideoShare.loadAccountsByShare(video.id, t)
+  const accountsInvolved = await VideoShareModel.loadAccountsByShare(video.id, t)
   accountsInvolved.push(byAccount)
 
   return broadcastToFollowers(data, byAccount, accountsInvolved, t)
 }
 
-async function sendDeleteAccount (account: AccountInstance, t: Transaction) {
+async function sendDeleteAccount (account: AccountModel, t: Transaction) {
   const data = deleteActivityData(account.url, account)
 
   return broadcastToFollowers(data, account, [ account ], t)
@@ -42,12 +45,10 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function deleteActivityData (url: string, byAccount: AccountInstance) {
-  const activity: ActivityDelete = {
+function deleteActivityData (url: string, byAccount: AccountModel): ActivityDelete {
+  return {
     type: 'Delete',
     id: url,
     actor: byAccount.url
   }
-
-  return activity
 }