4 files changed, 79 insertions, 21 deletions

diff --git a/server/tests/api/users/user-subscriptions.ts b/server/tests/api/users/user-subscriptions.ts
index d1d192238..57cca6ad4 100644
--- a/server/tests/api/users/user-subscriptions.ts
+++ b/server/tests/api/users/user-subscriptions.ts
@@ -2,6 +2,7 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { VideoPrivacy } from '@shared/models'
 import {
   cleanupTests,
   createMultipleServers,
@@ -10,7 +11,7 @@ import {
   setAccessTokensToServers,
   SubscriptionsCommand,
   waitJobs
-} from '@shared/extra-utils'
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
@@ -32,20 +33,18 @@ describe('Test users subscriptions', function () {
     // Server 1 and server 2 follow each other
     await doubleFollow(servers[0], servers[1])
 
-    {
-      for (const server of servers) {
-        const user = { username: 'user' + server.serverNumber, password: 'password' }
-        await server.users.create({ username: user.username, password: user.password })
+    for (const server of servers) {
+      const user = { username: 'user' + server.serverNumber, password: 'password' }
+      await server.users.create({ username: user.username, password: user.password })
 
-        const accessToken = await server.login.getAccessToken(user)
-        users.push({ accessToken })
+      const accessToken = await server.login.getAccessToken(user)
+      users.push({ accessToken })
 
-        const videoName1 = 'video 1-' + server.serverNumber
-        await server.videos.upload({ token: accessToken, attributes: { name: videoName1 } })
+      const videoName1 = 'video 1-' + server.serverNumber
+      await server.videos.upload({ token: accessToken, attributes: { name: videoName1 } })
 
-        const videoName2 = 'video 2-' + server.serverNumber
-        await server.videos.upload({ token: accessToken, attributes: { name: videoName2 } })
-      }
+      const videoName2 = 'video 2-' + server.serverNumber
+      await server.videos.upload({ token: accessToken, attributes: { name: videoName2 } })
     }
 
     await waitJobs(servers)
@@ -540,6 +539,40 @@ describe('Test users subscriptions', function () {
     }
   })
 
+  it('Should update video as internal and not see from remote server', async function () {
+    this.timeout(30000)
+
+    await servers[2].videos.update({ id: video3UUID, attributes: { name: 'internal', privacy: VideoPrivacy.INTERNAL } })
+    await waitJobs(servers)
+
+    {
+      const { data } = await command.listVideos({ token: users[0].accessToken })
+      expect(data.find(v => v.name === 'internal')).to.not.exist
+    }
+  })
+
+  it('Should see internal from local user', async function () {
+    const { data } = await servers[2].subscriptions.listVideos({ token: servers[2].accessToken })
+    expect(data.find(v => v.name === 'internal')).to.exist
+  })
+
+  it('Should update video as private and not see from anyone server', async function () {
+    this.timeout(30000)
+
+    await servers[2].videos.update({ id: video3UUID, attributes: { name: 'private', privacy: VideoPrivacy.PRIVATE } })
+    await waitJobs(servers)
+
+    {
+      const { data } = await command.listVideos({ token: users[0].accessToken })
+      expect(data.find(v => v.name === 'private')).to.not.exist
+    }
+
+    {
+      const { data } = await servers[2].subscriptions.listVideos({ token: servers[2].accessToken })
+      expect(data.find(v => v.name === 'private')).to.not.exist
+    }
+  })
+
   after(async function () {
     await cleanupTests(servers)
   })
diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts
index d0ca82b07..5b2bbc520 100644
--- a/server/tests/api/users/users-multiple-servers.ts
+++ b/server/tests/api/users/users-multiple-servers.ts
@@ -6,16 +6,18 @@ import {
   checkActorFilesWereRemoved,
   checkTmpIsEmpty,
   checkVideoFilesWereRemoved,
+  saveVideoInServers,
+  testImage
+} from '@server/tests/shared'
+import { MyUser } from '@shared/models'
+import {
   cleanupTests,
   createMultipleServers,
   doubleFollow,
   PeerTubeServer,
-  saveVideoInServers,
   setAccessTokensToServers,
-  testImage,
   waitJobs
-} from '@shared/extra-utils'
-import { MyUser } from '@shared/models'
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/users/users-verification.ts b/server/tests/api/users/users-verification.ts
index f54463359..0f3cc401a 100644
--- a/server/tests/api/users/users-verification.ts
+++ b/server/tests/api/users/users-verification.ts
@@ -2,8 +2,9 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { cleanupTests, createSingleServer, MockSmtpServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/extra-utils'
+import { MockSmtpServer } from '@server/tests/shared'
 import { HttpStatusCode } from '@shared/models'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
 
 const expect = chai.expect
 
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 6c41e7d56..7023b3f08 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -2,6 +2,8 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { testImage } from '@server/tests/shared'
+import { AbuseState, HttpStatusCode, OAuth2ErrorCode, UserAdminFlag, UserRole, Video, VideoPlaylistType } from '@shared/models'
 import {
   cleanupTests,
   createSingleServer,
@@ -9,10 +11,8 @@ import {
   makePutBodyRequest,
   PeerTubeServer,
   setAccessTokensToServers,
-  testImage,
   waitJobs
-} from '@shared/extra-utils'
-import { AbuseState, HttpStatusCode, OAuth2ErrorCode, UserAdminFlag, UserRole, Video, VideoPlaylistType } from '@shared/models'
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
@@ -230,7 +230,7 @@ describe('Test users', function () {
     })
 
     it('Should have an expired access token', async function () {
-      this.timeout(15000)
+      this.timeout(60000)
 
       await server.sql.setTokenField(server.accessToken, 'accessTokenExpiresAt', new Date().toISOString())
       await server.sql.setTokenField(server.accessToken, 'refreshTokenExpiresAt', new Date().toISOString())
@@ -559,6 +559,28 @@ describe('Test users', function () {
       expect(user.autoPlayNextVideo).to.be.true
     })
 
+    it('Should be able to change the p2p attribute', async function () {
+      {
+        await server.users.updateMe({
+          token: userToken,
+          webTorrentEnabled: false
+        })
+
+        const user = await server.users.getMyInfo({ token: userToken })
+        expect(user.p2pEnabled).to.be.false
+      }
+
+      {
+        await server.users.updateMe({
+          token: userToken,
+          p2pEnabled: true
+        })
+
+        const user = await server.users.getMyInfo({ token: userToken })
+        expect(user.p2pEnabled).to.be.true
+      }
+    })
+
     it('Should be able to change the email attribute', async function () {
       await server.users.updateMe({
         token: userToken,