From d846501818c2d29e66e6fd141789cb04fd55a437 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 Nov 2017 17:56:21 +0100 Subject: Handle announces in inbox --- shared/models/activitypub/activity.ts | 9 +++++++-- shared/models/activitypub/objects/video-channel-object.ts | 1 + shared/models/activitypub/objects/video-torrent-object.ts | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'shared/models') diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts index 506e64eff..b858bf759 100644 --- a/shared/models/activitypub/activity.ts +++ b/shared/models/activitypub/activity.ts @@ -3,10 +3,10 @@ import { ActivityPubSignature } from './activitypub-signature' import { VideoAbuseObject } from './objects/video-abuse-object' export type Activity = ActivityCreate | ActivityAdd | ActivityUpdate | ActivityFlag | - ActivityDelete | ActivityFollow | ActivityAccept + ActivityDelete | ActivityFollow | ActivityAccept | ActivityAnnounce // Flag -> report abuse -export type ActivityType = 'Create' | 'Add' | 'Update' | 'Flag' | 'Delete' | 'Follow' | 'Accept' +export type ActivityType = 'Create' | 'Add' | 'Update' | 'Flag' | 'Delete' | 'Follow' | 'Accept' | 'Announce' export interface BaseActivity { '@context'?: any[] @@ -49,3 +49,8 @@ export interface ActivityFollow extends BaseActivity { export interface ActivityAccept extends BaseActivity { type: 'Accept' } + +export interface ActivityAnnounce extends BaseActivity { + type: 'Announce' + object: VideoChannelObject | VideoTorrentObject +} diff --git a/shared/models/activitypub/objects/video-channel-object.ts b/shared/models/activitypub/objects/video-channel-object.ts index de504d84c..468e1535e 100644 --- a/shared/models/activitypub/objects/video-channel-object.ts +++ b/shared/models/activitypub/objects/video-channel-object.ts @@ -6,4 +6,5 @@ export interface VideoChannelObject { uuid: string published: Date updated: Date + actor?: string } diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts index 5685a43e0..99e7157b8 100644 --- a/shared/models/activitypub/objects/video-torrent-object.ts +++ b/shared/models/activitypub/objects/video-torrent-object.ts @@ -23,4 +23,5 @@ export interface VideoTorrentObject { content: string icon: ActivityIconObject url: ActivityUrlObject[] + actor?: string } -- cgit v1.2.3