aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-04-06 11:35:56 +0200
committerChocobozzz <chocobozzz@cpy.re>2021-04-08 10:07:53 +0200
commitf479685678406a5df864d89615b33d29085ebfc6 (patch)
tree8de15e90cd8d97d8810715df8585c61f48d5282a /shared
parent968aaed2066873fc1c39f95168284122d9d15e21 (diff)
downloadPeerTube-f479685678406a5df864d89615b33d29085ebfc6.tar.gz
PeerTube-f479685678406a5df864d89615b33d29085ebfc6.tar.zst
PeerTube-f479685678406a5df864d89615b33d29085ebfc6.zip
Agnostic actor image storage
Diffstat (limited to 'shared')
-rw-r--r--shared/models/actors/account.model.ts4
-rw-r--r--shared/models/actors/actor-image.model.ts (renamed from shared/models/avatars/avatar.model.ts)2
-rw-r--r--shared/models/actors/actor-image.type.ts4
-rw-r--r--shared/models/actors/actor.model.ts4
-rw-r--r--shared/models/actors/index.ts2
-rw-r--r--shared/models/avatars/index.ts1
-rw-r--r--shared/models/index.ts1
-rw-r--r--shared/models/videos/channel/video-channel.model.ts5
8 files changed, 13 insertions, 10 deletions
diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts
index 2ff4b9f5e..120dec271 100644
--- a/shared/models/actors/account.model.ts
+++ b/shared/models/actors/account.model.ts
@@ -1,5 +1,5 @@
1import { ActorImage } from './actor-image.model'
1import { Actor } from './actor.model' 2import { Actor } from './actor.model'
2import { Avatar } from '../avatars'
3 3
4export interface Account extends Actor { 4export interface Account extends Actor {
5 displayName: string 5 displayName: string
@@ -14,5 +14,5 @@ export interface AccountSummary {
14 displayName: string 14 displayName: string
15 url: string 15 url: string
16 host: string 16 host: string
17 avatar?: Avatar 17 avatar?: ActorImage
18} 18}
diff --git a/shared/models/avatars/avatar.model.ts b/shared/models/actors/actor-image.model.ts
index f7fa16f49..ad5eab627 100644
--- a/shared/models/avatars/avatar.model.ts
+++ b/shared/models/actors/actor-image.model.ts
@@ -1,4 +1,4 @@
1export interface Avatar { 1export interface ActorImage {
2 path: string 2 path: string
3 3
4 url?: string 4 url?: string
diff --git a/shared/models/actors/actor-image.type.ts b/shared/models/actors/actor-image.type.ts
new file mode 100644
index 000000000..ac8eb6bf2
--- /dev/null
+++ b/shared/models/actors/actor-image.type.ts
@@ -0,0 +1,4 @@
1export const enum ActorImageType {
2 AVATAR = 1,
3 BANNER = 2
4}
diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts
index 1dbf5f638..7d9f35b10 100644
--- a/shared/models/actors/actor.model.ts
+++ b/shared/models/actors/actor.model.ts
@@ -1,4 +1,4 @@
1import { Avatar } from '../avatars/avatar.model' 1import { ActorImage } from './actor-image.model'
2 2
3export interface Actor { 3export interface Actor {
4 id: number 4 id: number
@@ -9,5 +9,5 @@ export interface Actor {
9 followersCount: number 9 followersCount: number
10 createdAt: Date | string 10 createdAt: Date | string
11 updatedAt: Date | string 11 updatedAt: Date | string
12 avatar?: Avatar 12 avatar?: ActorImage
13} 13}
diff --git a/shared/models/actors/index.ts b/shared/models/actors/index.ts
index c7a92399d..156f83248 100644
--- a/shared/models/actors/index.ts
+++ b/shared/models/actors/index.ts
@@ -1,3 +1,5 @@
1export * from './account.model' 1export * from './account.model'
2export * from './actor-image.model'
3export * from './actor-image.type'
2export * from './actor.model' 4export * from './actor.model'
3export * from './follow.model' 5export * from './follow.model'
diff --git a/shared/models/avatars/index.ts b/shared/models/avatars/index.ts
deleted file mode 100644
index 65e8e0882..000000000
--- a/shared/models/avatars/index.ts
+++ /dev/null
@@ -1 +0,0 @@
1export * from './avatar.model'
diff --git a/shared/models/index.ts b/shared/models/index.ts
index f105303f4..dff5fdf0e 100644
--- a/shared/models/index.ts
+++ b/shared/models/index.ts
@@ -1,6 +1,5 @@
1export * from './activitypub' 1export * from './activitypub'
2export * from './actors' 2export * from './actors'
3export * from './avatars'
4export * from './moderation' 3export * from './moderation'
5export * from './bulk' 4export * from './bulk'
6export * from './redundancy' 5export * from './redundancy'
diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
index 32829e92a..ae6dea42d 100644
--- a/shared/models/videos/channel/video-channel.model.ts
+++ b/shared/models/videos/channel/video-channel.model.ts
@@ -1,6 +1,5 @@
1import { Actor } from '../../actors/actor.model' 1import { Actor } from '../../actors/actor.model'
2import { Account } from '../../actors/index' 2import { Account, ActorImage } from '../../actors'
3import { Avatar } from '../../avatars'
4 3
5export type ViewsPerDate = { 4export type ViewsPerDate = {
6 date: Date 5 date: Date
@@ -24,5 +23,5 @@ export interface VideoChannelSummary {
24 displayName: string 23 displayName: string
25 url: string 24 url: string
26 host: string 25 host: string
27 avatar?: Avatar 26 avatar?: ActorImage
28} 27}