6 files changed, 232 insertions, 7 deletions

diff --git a/server/tests/api/check-params/search.ts b/server/tests/api/check-params/search.ts
index d35eac7fe..eabf602ac 100644
--- a/server/tests/api/check-params/search.ts
+++ b/server/tests/api/check-params/search.ts
@@ -6,7 +6,6 @@ import { flushTests, immutableAssign, killallServers, makeGetRequest, runServer,
 import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params'
 
 describe('Test videos API validator', function () {
-  const path = '/api/v1/search/videos/'
   let server: ServerInfo
 
   // ---------------------------------------------------------------
@@ -20,6 +19,8 @@ describe('Test videos API validator', function () {
   })
 
   describe('When searching videos', function () {
+    const path = '/api/v1/search/videos/'
+
     const query = {
       search: 'coucou'
     }
@@ -111,6 +112,30 @@ describe('Test videos API validator', function () {
     })
   })
 
+  describe('When searching video channels', function () {
+    const path = '/api/v1/search/video-channels/'
+
+    const query = {
+      search: 'coucou'
+    }
+
+    it('Should fail with a bad start pagination', async function () {
+      await checkBadStartPagination(server.url, path, null, query)
+    })
+
+    it('Should fail with a bad count pagination', async function () {
+      await checkBadCountPagination(server.url, path, null, query)
+    })
+
+    it('Should fail with an incorrect sort', async function () {
+      await checkBadSortPagination(server.url, path, null, query)
+    })
+
+    it('Should success with the correct parameters', async function () {
+      await makeGetRequest({ url: server.url, path, query, statusCodeExpected: 200 })
+    })
+  })
+
   after(async function () {
     killallServers([ server ])
 
diff --git a/server/tests/api/search/index.ts b/server/tests/api/search/index.ts
index 64b3d0910..d573c8a9e 100644
--- a/server/tests/api/search/index.ts
+++ b/server/tests/api/search/index.ts
@@ -1,2 +1,3 @@
+import './search-activitypub-video-channels'
 import './search-activitypub-videos'
 import './search-videos'
diff --git a/server/tests/api/search/search-activitypub-video-channels.ts b/server/tests/api/search/search-activitypub-video-channels.ts
new file mode 100644
index 000000000..512cb32fd
--- /dev/null
+++ b/server/tests/api/search/search-activitypub-video-channels.ts
@@ -0,0 +1,176 @@
+/* tslint:disable:no-unused-expression */
+
+import * as chai from 'chai'
+import 'mocha'
+import {
+  addVideoChannel,
+  createUser,
+  deleteVideoChannel,
+  flushAndRunMultipleServers,
+  flushTests,
+  getVideoChannelsList,
+  killallServers,
+  ServerInfo,
+  setAccessTokensToServers,
+  updateMyUser,
+  updateVideoChannel,
+  uploadVideo,
+  userLogin,
+  wait
+} from '../../utils'
+import { waitJobs } from '../../utils/server/jobs'
+import { VideoChannel } from '../../../../shared/models/videos'
+import { searchVideoChannel } from '../../utils/search/video-channels'
+
+const expect = chai.expect
+
+describe('Test a ActivityPub video channels search', function () {
+  let servers: ServerInfo[]
+  let userServer2Token: string
+
+  before(async function () {
+    this.timeout(120000)
+
+    await flushTests()
+
+    servers = await flushAndRunMultipleServers(2)
+
+    await setAccessTokensToServers(servers)
+
+    {
+      await createUser(servers[0].url, servers[0].accessToken, 'user1_server1', 'password')
+      const channel = {
+        name: 'channel1_server1',
+        displayName: 'Channel 1 server 1'
+      }
+      await addVideoChannel(servers[0].url, servers[0].accessToken, channel)
+    }
+
+    {
+      const user = { username: 'user1_server2', password: 'password' }
+      await createUser(servers[1].url, servers[1].accessToken, user.username, user.password)
+      userServer2Token = await userLogin(servers[1], user)
+
+      const channel = {
+        name: 'channel1_server2',
+        displayName: 'Channel 1 server 2'
+      }
+      const resChannel = await addVideoChannel(servers[1].url, userServer2Token, channel)
+      const channelId = resChannel.body.videoChannel.id
+
+      await uploadVideo(servers[1].url, userServer2Token, { name: 'video 1 server 2', channelId })
+      await uploadVideo(servers[1].url, userServer2Token, { name: 'video 2 server 2', channelId })
+    }
+
+    await waitJobs(servers)
+  })
+
+  it('Should not find a remote video channel', async function () {
+    {
+      const search = 'http://localhost:9002/video-channels/channel1_server3'
+      const res = await searchVideoChannel(servers[ 0 ].url, search, servers[ 0 ].accessToken)
+
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(0)
+    }
+
+    {
+      // Without token
+      const search = 'http://localhost:9002/video-channels/channel1_server2'
+      const res = await searchVideoChannel(servers[0].url, search)
+
+      expect(res.body.total).to.equal(0)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(0)
+    }
+  })
+
+  it('Should search a local video channel', async function () {
+    const searches = [
+      'http://localhost:9001/video-channels/channel1_server1',
+      'channel1_server1@localhost:9001'
+    ]
+
+    for (const search of searches) {
+      const res = await searchVideoChannel(servers[ 0 ].url, search)
+
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[ 0 ].name).to.equal('channel1_server1')
+      expect(res.body.data[ 0 ].displayName).to.equal('Channel 1 server 1')
+    }
+  })
+
+  it('Should search a remote video channel with URL or handle', async function () {
+    const searches = [
+      'http://localhost:9002/video-channels/channel1_server2',
+      'channel1_server2@localhost:9002'
+    ]
+
+    for (const search of searches) {
+      const res = await searchVideoChannel(servers[ 0 ].url, search, servers[ 0 ].accessToken)
+
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[ 0 ].name).to.equal('channel1_server2')
+      expect(res.body.data[ 0 ].displayName).to.equal('Channel 1 server 2')
+    }
+  })
+
+  it('Should not list this remote video channel', async function () {
+    const res = await getVideoChannelsList(servers[0].url, 0, 5)
+    expect(res.body.total).to.equal(3)
+    expect(res.body.data).to.have.lengthOf(3)
+    expect(res.body.data[0].name).to.equal('channel1_server1')
+    expect(res.body.data[1].name).to.equal('user1_server1_channel')
+    expect(res.body.data[2].name).to.equal('root_channel')
+  })
+
+  it('Should update video channel of server 2, and refresh it on server 1', async function () {
+    this.timeout(60000)
+
+    await updateVideoChannel(servers[1].url, userServer2Token, 'channel1_server2', { displayName: 'channel updated' })
+    await updateMyUser({ url: servers[1].url, accessToken: userServer2Token, displayName: 'user updated' })
+
+    await waitJobs(servers)
+    // Expire video channel
+    await wait(10000)
+
+    const search = 'http://localhost:9002/video-channels/channel1_server2'
+    const res = await searchVideoChannel(servers[0].url, search, servers[0].accessToken)
+    expect(res.body.total).to.equal(1)
+    expect(res.body.data).to.have.lengthOf(1)
+
+    const videoChannel: VideoChannel = res.body.data[0]
+    expect(videoChannel.displayName).to.equal('channel updated')
+
+    // We don't return the owner account for now
+    // expect(videoChannel.ownerAccount.displayName).to.equal('user updated')
+  })
+
+  it('Should delete video channel of server 2, and delete it on server 1', async function () {
+    this.timeout(60000)
+
+    await deleteVideoChannel(servers[1].url, userServer2Token, 'channel1_server2')
+
+    await waitJobs(servers)
+    // Expire video
+    await wait(10000)
+
+    const res = await searchVideoChannel(servers[0].url, 'http://localhost:9002/video-channels/channel1_server2', servers[0].accessToken)
+    expect(res.body.total).to.equal(0)
+    expect(res.body.data).to.have.lengthOf(0)
+  })
+
+  after(async function () {
+    killallServers(servers)
+
+    // Keep the logs if the test failed
+    if (this['ok']) {
+      await flushTests()
+    }
+  })
+})
diff --git a/server/tests/api/search/search-activitypub-videos.ts b/server/tests/api/search/search-activitypub-videos.ts
index 6dc792696..28f4fac50 100644
--- a/server/tests/api/search/search-activitypub-videos.ts
+++ b/server/tests/api/search/search-activitypub-videos.ts
@@ -59,6 +59,7 @@ describe('Test a ActivityPub videos search', function () {
     }
 
     {
+      // Without token
       const res = await searchVideo(servers[0].url, 'http://localhost:9002/videos/watch/' + videoServer2UUID)
 
       expect(res.body.total).to.equal(0)
diff --git a/server/tests/utils/search/video-channels.ts b/server/tests/utils/search/video-channels.ts
new file mode 100644
index 000000000..0532134ae
--- /dev/null
+++ b/server/tests/utils/search/video-channels.ts
@@ -0,0 +1,22 @@
+import { makeGetRequest } from '../requests/requests'
+
+function searchVideoChannel (url: string, search: string, token?: string, statusCodeExpected = 200) {
+  const path = '/api/v1/search/video-channels'
+
+  return makeGetRequest({
+    url,
+    path,
+    query: {
+      sort: '-createdAt',
+      search
+    },
+    token,
+    statusCodeExpected
+  })
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  searchVideoChannel
+}
diff --git a/server/tests/utils/videos/video-channels.ts b/server/tests/utils/videos/video-channels.ts
index 1eea22b31..092985777 100644
--- a/server/tests/utils/videos/video-channels.ts
+++ b/server/tests/utils/videos/video-channels.ts
@@ -54,12 +54,12 @@ function addVideoChannel (
 function updateVideoChannel (
   url: string,
   token: string,
-  channelId: number | string,
+  channelName: string,
   attributes: VideoChannelUpdate,
   expectedStatus = 204
 ) {
   const body = {}
-  const path = '/api/v1/video-channels/' + channelId
+  const path = '/api/v1/video-channels/' + channelName
 
   if (attributes.displayName) body['displayName'] = attributes.displayName
   if (attributes.description) body['description'] = attributes.description
@@ -73,8 +73,8 @@ function updateVideoChannel (
     .expect(expectedStatus)
 }
 
-function deleteVideoChannel (url: string, token: string, channelId: number | string, expectedStatus = 204) {
-  const path = '/api/v1/video-channels/' + channelId
+function deleteVideoChannel (url: string, token: string, channelName: string, expectedStatus = 204) {
+  const path = '/api/v1/video-channels/' + channelName
 
   return request(url)
     .delete(path)
@@ -83,8 +83,8 @@ function deleteVideoChannel (url: string, token: string, channelId: number | str
     .expect(expectedStatus)
 }
 
-function getVideoChannel (url: string, channelId: number | string) {
-  const path = '/api/v1/video-channels/' + channelId
+function getVideoChannel (url: string, channelName: string) {
+  const path = '/api/v1/video-channels/' + channelName
 
   return request(url)
     .get(path)