2 files changed, 19 insertions, 29 deletions

diff --git a/server/models/video/video-interface.ts b/server/models/video/video-interface.ts
index be140de86..2a63350af 100644
--- a/server/models/video/video-interface.ts
+++ b/server/models/video/video-interface.ts
@@ -50,7 +50,6 @@ export namespace VideoMethods {
   export type ListUserVideosForApi = (userId: number, start: number, count: number, sort: string) => Bluebird< ResultList<VideoInstance> >
   export type SearchAndPopulateAccountAndServerAndTags = (
     value: string,
-    field: string,
     start: number,
     count: number,
     sort: string
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index f3469c1de..4dce8e2fc 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -1070,7 +1070,7 @@ loadByUUIDAndPopulateAccountAndServerAndTags = function (uuid: string) {
   return Video.findOne(options)
 }
 
-searchAndPopulateAccountAndServerAndTags = function (value: string, field: string, start: number, count: number, sort: string) {
+searchAndPopulateAccountAndServerAndTags = function (value: string, start: number, count: number, sort: string) {
   const serverInclude: Sequelize.IncludeOptions = {
     model: Video['sequelize'].models.Server,
     required: false
@@ -1099,33 +1099,24 @@ searchAndPopulateAccountAndServerAndTags = function (value: string, field: strin
     order: [ getSort(sort), [ Video['sequelize'].models.Tag, 'name', 'ASC' ] ]
   }
 
-  if (field === 'tags') {
-    const escapedValue = Video['sequelize'].escape('%' + value + '%')
-    query.where['id'][Sequelize.Op.in] = Video['sequelize'].literal(
-      `(SELECT "VideoTags"."videoId"
-        FROM "Tags"
-        INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId"
-        WHERE name ILIKE ${escapedValue}
-       )`
-    )
-  } else if (field === 'host') {
-    // FIXME: Include our server? (not stored in the database)
-    serverInclude.where = {
-      host: {
-        [Sequelize.Op.iLike]: '%' + value + '%'
-      }
-    }
-    serverInclude.required = true
-  } else if (field === 'account') {
-    accountInclude.where = {
-      name: {
-        [Sequelize.Op.iLike]: '%' + value + '%'
-      }
-    }
-  } else {
-    query.where[field] = {
-      [Sequelize.Op.iLike]: '%' + value + '%'
-    }
+  // TODO: search on tags too
+  // const escapedValue = Video['sequelize'].escape('%' + value + '%')
+  // query.where['id'][Sequelize.Op.in] = Video['sequelize'].literal(
+  //   `(SELECT "VideoTags"."videoId"
+  //     FROM "Tags"
+  //     INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId"
+  //     WHERE name ILIKE ${escapedValue}
+  //    )`
+  // )
+
+  // TODO: search on account too
+  // accountInclude.where = {
+  //   name: {
+  //     [Sequelize.Op.iLike]: '%' + value + '%'
+  //   }
+  // }
+  query.where['name'] = {
+    [Sequelize.Op.iLike]: '%' + value + '%'
   }
 
   query.include = [