1 files changed, 17 insertions, 15 deletions
diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts
index bab3ce366..e94d05429 100644
--- a/shared/models/activitypub/objects/common-objects.ts
+++ b/shared/models/activitypub/objects/common-objects.ts
@@ -7,9 +7,9 @@ export interface ActivityIdentifierObject {
 export interface ActivityIconObject {
  type: 'Image'
  url: string
-  mediaType: 'image/jpeg'
+  mediaType: 'image/jpeg' | 'image/png'
-  width: number
+  width?: number
-  height: number
+  height?: number
 }
 export type ActivityVideoUrlObject = {
@@ -72,19 +72,21 @@ export interface ActivityMentionObject {
  name: string
 }
-export type ActivityTagObject = ActivityPlaylistSegmentHashesObject |
+export type ActivityTagObject =
-  ActivityPlaylistInfohashesObject |
+  ActivityPlaylistSegmentHashesObject
-  ActivityVideoUrlObject |
+  | ActivityPlaylistInfohashesObject
-  ActivityHashTagObject |
+  | ActivityVideoUrlObject
-  ActivityMentionObject |
+  | ActivityHashTagObject
-  ActivityBitTorrentUrlObject |
+  | ActivityMentionObject
-  ActivityMagnetUrlObject
+  | ActivityBitTorrentUrlObject
+  | ActivityMagnetUrlObject
-export type ActivityUrlObject = ActivityVideoUrlObject |
+export type ActivityUrlObject =
-  ActivityPlaylistUrlObject |
+  ActivityVideoUrlObject
-  ActivityBitTorrentUrlObject |
+  | ActivityPlaylistUrlObject
-  ActivityMagnetUrlObject |
+  | ActivityBitTorrentUrlObject
-  ActivityHtmlUrlObject
+  | ActivityMagnetUrlObject
+  | ActivityHtmlUrlObject
 export interface ActivityPubAttributedTo {
  type: 'Group' | 'Person'

diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index bab3ce366..e94d05429 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts
@@ -7,9 +7,9 @@ export interface ActivityIdentifierObject {
7	export interface ActivityIconObject {	7	export interface ActivityIconObject {
8	type: 'Image'	8	type: 'Image'
9	url: string	9	url: string
10	mediaType: 'image/jpeg'	10	mediaType: 'image/jpeg' \| 'image/png'
11	width: number	11	width?: number
12	height: number	12	height?: number
13	}	13	}
14		14
15	export type ActivityVideoUrlObject = {	15	export type ActivityVideoUrlObject = {
@@ -72,19 +72,21 @@ export interface ActivityMentionObject {
72	name: string	72	name: string
73	}	73	}
74		74
75	export type ActivityTagObject = ActivityPlaylistSegmentHashesObject \|	75	export type ActivityTagObject =
76	ActivityPlaylistInfohashesObject \|	76	ActivityPlaylistSegmentHashesObject
77	ActivityVideoUrlObject \|	77	\| ActivityPlaylistInfohashesObject
78	ActivityHashTagObject \|	78	\| ActivityVideoUrlObject
79	ActivityMentionObject \|	79	\| ActivityHashTagObject
80	ActivityBitTorrentUrlObject \|	80	\| ActivityMentionObject
81	ActivityMagnetUrlObject	81	\| ActivityBitTorrentUrlObject
		82	\| ActivityMagnetUrlObject
82		83
83	export type ActivityUrlObject = ActivityVideoUrlObject \|	84	export type ActivityUrlObject =
84	ActivityPlaylistUrlObject \|	85	ActivityVideoUrlObject
85	ActivityBitTorrentUrlObject \|	86	\| ActivityPlaylistUrlObject
86	ActivityMagnetUrlObject \|	87	\| ActivityBitTorrentUrlObject
87	ActivityHtmlUrlObject	88	\| ActivityMagnetUrlObject
		89	\| ActivityHtmlUrlObject
88		90
89	export interface ActivityPubAttributedTo {	91	export interface ActivityPubAttributedTo {
90	type: 'Group' \| 'Person'	92	type: 'Group' \| 'Person'