X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fexternal-plugins%2Fauto-mute.ts;h=271779dd4c5eb99adfca4e269ccd0c7a6ad479e4;hb=9e8789497377cac5554a622da605f5b89587aa9c;hp=2f2c9102db184533913f40d904ff822a2b561b94;hpb=91b8e675e26dd65e1ebb23706cb16b3a3f8bcf73;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/external-plugins/auto-mute.ts b/server/tests/external-plugins/auto-mute.ts
index 2f2c9102d..271779dd4 100644
--- a/server/tests/external-plugins/auto-mute.ts
+++ b/server/tests/external-plugins/auto-mute.ts
@@ -2,57 +2,49 @@
 
 import 'mocha'
 import { expect } from 'chai'
-import { removeAccountFromServerBlocklist } from '@shared/extra-utils/users/blocklist'
 import {
+  cleanupTests,
+  createMultipleServers,
   doubleFollow,
-  getVideosList,
-  installPlugin,
+  killallServers,
+  makeGetRequest,
   MockBlocklist,
+  PeerTubeServer,
   setAccessTokensToServers,
-  updatePluginSettings,
-  uploadVideoAndGetId,
   wait
-} from '../../../shared/extra-utils'
-import {
-  cleanupTests,
-  flushAndRunMultipleServers,
-  killallServers,
-  reRunServer,
-  ServerInfo
-} from '../../../shared/extra-utils/server/servers'
+} from '@shared/extra-utils'
+import { HttpStatusCode } from '@shared/models'
 
 describe('Official plugin auto-mute', function () {
-  let servers: ServerInfo[]
+  const autoMuteListPath = '/plugins/auto-mute/router/api/v1/mute-list'
+  let servers: PeerTubeServer[]
   let blocklistServer: MockBlocklist
+  let port: number
 
   before(async function () {
     this.timeout(30000)
 
-    servers = await flushAndRunMultipleServers(2)
+    servers = await createMultipleServers(2)
     await setAccessTokensToServers(servers)
 
-    await installPlugin({
-      url: servers[0].url,
-      accessToken: servers[0].accessToken,
-      npmName: 'peertube-plugin-auto-mute'
-    })
+    for (const server of servers) {
+      await server.plugins.install({ npmName: 'peertube-plugin-auto-mute' })
+    }
 
     blocklistServer = new MockBlocklist()
-    await blocklistServer.initialize()
+    port = await blocklistServer.initialize()
 
-    await uploadVideoAndGetId({ server: servers[0], videoName: 'video server 1' })
-    await uploadVideoAndGetId({ server: servers[1], videoName: 'video server 2' })
+    await servers[0].videos.quickUpload({ name: 'video server 1' })
+    await servers[1].videos.quickUpload({ name: 'video server 2' })
 
     await doubleFollow(servers[0], servers[1])
   })
 
   it('Should update plugin settings', async function () {
-    await updatePluginSettings({
-      url: servers[0].url,
-      accessToken: servers[0].accessToken,
+    await servers[0].plugins.updateSettings({
       npmName: 'peertube-plugin-auto-mute',
       settings: {
-        'blocklist-urls': 'http://localhost:42100/blocklist',
+        'blocklist-urls': `http://localhost:${port}/blocklist`,
         'check-seconds-interval': 1
       }
     })
@@ -71,8 +63,8 @@ describe('Official plugin auto-mute', function () {
 
     await wait(2000)
 
-    const res = await getVideosList(servers[0].url)
-    expect(res.body.total).to.equal(1)
+    const { total } = await servers[0].videos.list()
+    expect(total).to.equal(1)
   })
 
   it('Should remove a server blocklist', async function () {
@@ -89,8 +81,8 @@ describe('Official plugin auto-mute', function () {
 
     await wait(2000)
 
-    const res = await getVideosList(servers[0].url)
-    expect(res.body.total).to.equal(2)
+    const { total } = await servers[0].videos.list()
+    expect(total).to.equal(2)
   })
 
   it('Should add an account blocklist', async function () {
@@ -106,8 +98,8 @@ describe('Official plugin auto-mute', function () {
 
     await wait(2000)
 
-    const res = await getVideosList(servers[0].url)
-    expect(res.body.total).to.equal(1)
+    const { total } = await servers[0].videos.list()
+    expect(total).to.equal(1)
   })
 
   it('Should remove an account blocklist', async function () {
@@ -124,8 +116,8 @@ describe('Official plugin auto-mute', function () {
 
     await wait(2000)
 
-    const res = await getVideosList(servers[0].url)
-    expect(res.body.total).to.equal(2)
+    const { total } = await servers[0].videos.list()
+    expect(total).to.equal(2)
   })
 
   it('Should auto mute an account, manually unmute it and do not remute it automatically', async function () {
@@ -145,28 +137,89 @@ describe('Official plugin auto-mute', function () {
     await wait(2000)
 
     {
-      const res = await getVideosList(servers[0].url)
-      expect(res.body.total).to.equal(1)
+      const { total } = await servers[0].videos.list()
+      expect(total).to.equal(1)
     }
 
-    await removeAccountFromServerBlocklist(servers[0].url, servers[0].accessToken, account)
+    await servers[0].blocklist.removeFromServerBlocklist({ account })
 
     {
-      const res = await getVideosList(servers[0].url)
-      expect(res.body.total).to.equal(2)
+      const { total } = await servers[0].videos.list()
+      expect(total).to.equal(2)
     }
 
-    killallServers([ servers[0] ])
-    await reRunServer(servers[0])
+    await killallServers([ servers[0] ])
+    await servers[0].run()
     await wait(2000)
 
     {
-      const res = await getVideosList(servers[0].url)
-      expect(res.body.total).to.equal(2)
+      const { total } = await servers[0].videos.list()
+      expect(total).to.equal(2)
+    }
+  })
+
+  it('Should not expose the auto mute list', async function () {
+    await makeGetRequest({
+      url: servers[0].url,
+      path: '/plugins/auto-mute/router/api/v1/mute-list',
+      expectedStatus: HttpStatusCode.FORBIDDEN_403
+    })
+  })
+
+  it('Should enable auto mute list', async function () {
+    await servers[0].plugins.updateSettings({
+      npmName: 'peertube-plugin-auto-mute',
+      settings: {
+        'blocklist-urls': '',
+        'check-seconds-interval': 1,
+        'expose-mute-list': true
+      }
+    })
+
+    await makeGetRequest({
+      url: servers[0].url,
+      path: '/plugins/auto-mute/router/api/v1/mute-list',
+      expectedStatus: HttpStatusCode.OK_200
+    })
+  })
+
+  it('Should mute an account on server 1, and server 2 auto mutes it', async function () {
+    this.timeout(20000)
+
+    await servers[1].plugins.updateSettings({
+      npmName: 'peertube-plugin-auto-mute',
+      settings: {
+        'blocklist-urls': 'http://localhost:' + servers[0].port + autoMuteListPath,
+        'check-seconds-interval': 1,
+        'expose-mute-list': false
+      }
+    })
+
+    await servers[0].blocklist.addToServerBlocklist({ account: 'root@localhost:' + servers[1].port })
+    await servers[0].blocklist.addToMyBlocklist({ server: 'localhost:' + servers[1].port })
+
+    const res = await makeGetRequest({
+      url: servers[0].url,
+      path: '/plugins/auto-mute/router/api/v1/mute-list',
+      expectedStatus: HttpStatusCode.OK_200
+    })
+
+    const data = res.body.data
+    expect(data).to.have.lengthOf(1)
+    expect(data[0].updatedAt).to.exist
+    expect(data[0].value).to.equal('root@localhost:' + servers[1].port)
+
+    await wait(2000)
+
+    for (const server of servers) {
+      const { total } = await server.videos.list()
+      expect(total).to.equal(1)
     }
   })
 
   after(async function () {
+    await blocklistServer.terminate()
+
     await cleanupTests(servers)
   })
 })