aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
Diffstat (limited to 'shared')
-rw-r--r--shared/extra-utils/users/accounts.ts4
-rw-r--r--shared/extra-utils/videos/videos.ts1
-rw-r--r--shared/models/activitypub/activitypub-actor.ts1
-rw-r--r--shared/models/actors/account.model.ts1
-rw-r--r--shared/models/actors/actor.model.ts1
-rw-r--r--shared/models/videos/channel/video-channel.model.ts1
6 files changed, 2 insertions, 7 deletions
diff --git a/shared/extra-utils/users/accounts.ts b/shared/extra-utils/users/accounts.ts
index f64a2dbad..627e17cc3 100644
--- a/shared/extra-utils/users/accounts.ts
+++ b/shared/extra-utils/users/accounts.ts
@@ -39,7 +39,7 @@ async function expectAccountFollows (url: string, nameWithDomain: string, follow
39 expect(account.followingCount).to.equal(followingCount, message) 39 expect(account.followingCount).to.equal(followingCount, message)
40} 40}
41 41
42async function checkActorFilesWereRemoved (actorUUID: string, serverNumber: number) { 42async function checkActorFilesWereRemoved (filename: string, serverNumber: number) {
43 const testDirectory = 'test' + serverNumber 43 const testDirectory = 'test' + serverNumber
44 44
45 for (const directory of [ 'avatars' ]) { 45 for (const directory of [ 'avatars' ]) {
@@ -50,7 +50,7 @@ async function checkActorFilesWereRemoved (actorUUID: string, serverNumber: numb
50 50
51 const files = await readdir(directoryPath) 51 const files = await readdir(directoryPath)
52 for (const file of files) { 52 for (const file of files) {
53 expect(file).to.not.contain(actorUUID) 53 expect(file).to.not.contain(filename)
54 } 54 }
55 } 55 }
56} 56}
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts
index b64de2470..a4ca43f26 100644
--- a/shared/extra-utils/videos/videos.ts
+++ b/shared/extra-utils/videos/videos.ts
@@ -524,7 +524,6 @@ async function completeVideoCheck (
524 expect(video.nsfw).to.equal(attributes.nsfw) 524 expect(video.nsfw).to.equal(attributes.nsfw)
525 expect(video.description).to.equal(attributes.description) 525 expect(video.description).to.equal(attributes.description)
526 expect(video.account.id).to.be.a('number') 526 expect(video.account.id).to.be.a('number')
527 expect(video.account.uuid).to.be.a('string')
528 expect(video.account.host).to.equal(attributes.account.host) 527 expect(video.account.host).to.equal(attributes.account.host)
529 expect(video.account.name).to.equal(attributes.account.name) 528 expect(video.account.name).to.equal(attributes.account.name)
530 expect(video.channel.displayName).to.equal(attributes.channel.displayName) 529 expect(video.channel.displayName).to.equal(attributes.channel.displayName)
diff --git a/shared/models/activitypub/activitypub-actor.ts b/shared/models/activitypub/activitypub-actor.ts
index 5e30bf783..53ec579bc 100644
--- a/shared/models/activitypub/activitypub-actor.ts
+++ b/shared/models/activitypub/activitypub-actor.ts
@@ -21,7 +21,6 @@ export interface ActivityPubActor {
21 attributedTo: ActivityPubAttributedTo[] 21 attributedTo: ActivityPubAttributedTo[]
22 22
23 support?: string 23 support?: string
24 uuid: string
25 publicKey: { 24 publicKey: {
26 id: string 25 id: string
27 owner: string 26 owner: string
diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts
index 043a2507e..2ff4b9f5e 100644
--- a/shared/models/actors/account.model.ts
+++ b/shared/models/actors/account.model.ts
@@ -10,7 +10,6 @@ export interface Account extends Actor {
10 10
11export interface AccountSummary { 11export interface AccountSummary {
12 id: number 12 id: number
13 uuid: string
14 name: string 13 name: string
15 displayName: string 14 displayName: string
16 url: string 15 url: string
diff --git a/shared/models/actors/actor.model.ts b/shared/models/actors/actor.model.ts
index a3953874d..1dbf5f638 100644
--- a/shared/models/actors/actor.model.ts
+++ b/shared/models/actors/actor.model.ts
@@ -2,7 +2,6 @@ import { Avatar } from '../avatars/avatar.model'
2 2
3export interface Actor { 3export interface Actor {
4 id: number 4 id: number
5 uuid: string
6 url: string 5 url: string
7 name: string 6 name: string
8 host: string 7 host: string
diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
index 14a813f8f..de4c26b3d 100644
--- a/shared/models/videos/channel/video-channel.model.ts
+++ b/shared/models/videos/channel/video-channel.model.ts
@@ -12,7 +12,6 @@ export interface VideoChannel extends Actor {
12 12
13export interface VideoChannelSummary { 13export interface VideoChannelSummary {
14 id: number 14 id: number
15 uuid: string
16 name: string 15 name: string
17 displayName: string 16 displayName: string
18 url: string 17 url: string