From 50d6de9c286abcb34ff4234d56d9cbb803db7665 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 14 Dec 2017 17:38:41 +0100
Subject: Begin moving video channel to actor

---
 shared/models/activitypub/objects/common-objects.ts       |  5 +++++
 shared/models/activitypub/objects/index.ts                |  1 -
 shared/models/activitypub/objects/video-channel-object.ts | 13 -------------
 shared/models/activitypub/objects/video-torrent-object.ts |  4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 shared/models/activitypub/objects/video-channel-object.ts

(limited to 'shared/models/activitypub/objects')

diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts
index 3eaab21b5..ea5a503ac 100644
--- a/shared/models/activitypub/objects/common-objects.ts
+++ b/shared/models/activitypub/objects/common-objects.ts
@@ -23,3 +23,8 @@ export interface ActivityUrlObject {
   width: number
   size?: number
 }
+
+export interface ActivityPubAttributedTo {
+  type: 'Group' | 'Person'
+  id: string
+}
diff --git a/shared/models/activitypub/objects/index.ts b/shared/models/activitypub/objects/index.ts
index f1f761e44..3efd3ef13 100644
--- a/shared/models/activitypub/objects/index.ts
+++ b/shared/models/activitypub/objects/index.ts
@@ -1,6 +1,5 @@
 export * from './common-objects'
 export * from './video-abuse-object'
-export * from './video-channel-object'
 export * from './video-torrent-object'
 export * from './view-object'
 export * from './dislike-object'
diff --git a/shared/models/activitypub/objects/video-channel-object.ts b/shared/models/activitypub/objects/video-channel-object.ts
deleted file mode 100644
index dcce8696b..000000000
--- a/shared/models/activitypub/objects/video-channel-object.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ActivityPubOrderedCollection } from '../activitypub-ordered-collection'
-
-export interface VideoChannelObject {
-  type: 'VideoChannel'
-  id: string
-  name: string
-  content: string
-  uuid: string
-  published: string
-  updated: string
-  actor?: string
-  shares?: ActivityPubOrderedCollection<string>
-}
diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts
index a15ec7142..1405f7748 100644
--- a/shared/models/activitypub/objects/video-torrent-object.ts
+++ b/shared/models/activitypub/objects/video-torrent-object.ts
@@ -1,6 +1,6 @@
 import {
   ActivityIconObject,
-  ActivityIdentifierObject,
+  ActivityIdentifierObject, ActivityPubAttributedTo,
   ActivityTagObject,
   ActivityUrlObject
 } from './common-objects'
@@ -24,8 +24,8 @@ export interface VideoTorrentObject {
   content: string
   icon: ActivityIconObject
   url: ActivityUrlObject[]
-  actor?: string
   likes?: ActivityPubOrderedCollection<string>
   dislikes?: ActivityPubOrderedCollection<string>
   shares?: ActivityPubOrderedCollection<string>
+  attributedTo: ActivityPubAttributedTo[]
 }
-- 
cgit v1.2.3