Remove uneccessary details to link titles

[github/Chocobozzz/PeerTube.git] / server / models / utils.ts

diff --git a/server/models/utils.ts b/server/models/utils.ts
index 3e3825b3267fd7ecc63947bd2a6fcb666f10ef15..88c9b4adb94b43182d729af2c6c604947b1c7d09 100644 (file)
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -136,10 +136,7 @@ function createSimilarityAttribute (col: string, value: string) {
   )
 }
 
-function buildBlockedAccountSQL (serverAccountId: number, userAccountId?: number) {
-  const blockerIds = [ serverAccountId ]
-  if (userAccountId) blockerIds.push(userAccountId)
-
+function buildBlockedAccountSQL (blockerIds: number[]) {
   const blockerIdsString = blockerIds.join(', ')
 
   return 'SELECT "targetAccountId" AS "id" FROM "accountBlocklist" WHERE "accountId" IN (' + blockerIdsString + ')' +
@@ -207,63 +204,13 @@ function buildDirectionAndField (value: string) {
   return { direction, field }
 }
 
-function searchAttribute (sourceField, targetField) {
-  if (sourceField) {
-    return {
-      [targetField]: {
-        [Op.iLike]: `%${sourceField}%`
-      }
-    }
-  } else {
-    return {}
-  }
-}
-
-interface QueryStringFilterPrefixes {
-  [key: string]: string | { prefix: string, handler: Function, multiple?: boolean }
-}
-
-function parseQueryStringFilter (q: string, prefixes: QueryStringFilterPrefixes) {
-  const tokens = q // tokenize only if we have a querystring
-    ? [].concat.apply([], q.split('"').map((v, i) => i % 2 ? v : v.split(' '))).filter(Boolean)
-    : []
-
-  // TODO: when Typescript supports Object.fromEntries, replace with the Object method
-  function fromEntries<T> (entries: [keyof T, T[keyof T]][]): T {
-    return entries.reduce(
-      (acc, [ key, value ]) => ({ ...acc, [key]: value }),
-      {} as T
-    )
-  }
-
-  const objectMap = (obj, fn) => fromEntries(
-    Object.entries(obj).map(
-      ([ k, v ], i) => [ k, fn(v, k, i) ]
-    )
-  )
+function searchAttribute (sourceField?: string, targetField?: string) {
+  if (!sourceField) return {}
 
   return {
-    // search is the querystring minus defined filters
-    search: tokens.filter(e => !Object.values(prefixes).some(p => {
-      if (typeof p === "string") {
-        return e.startsWith(p)
-      } else {
-        return e.startsWith(p.prefix)
-      }
-    })).join(' '),
-    // filters defined in prefixes are added under their own name
-    ...objectMap(prefixes, v => {
-      if (typeof v === "string") {
-        return tokens.filter(e => e.startsWith(v)).map(e => e.slice(v.length))
-      } else {
-        const _tokens = tokens.filter(e => e.startsWith(v.prefix)).map(e => e.slice(v.prefix.length)).map(v.handler)
-        return !v.multiple
-          ? _tokens.length > 0
-            ? _tokens[0]
-            : ''
-          : _tokens
-      }
-    })
+    [targetField]: {
+      [Op.iLike]: `%${sourceField}%`
+    }
   }
 }
 
@@ -289,8 +236,7 @@ export {
   getFollowsSort,
   buildDirectionAndField,
   createSafeIn,
-  searchAttribute,
-  parseQueryStringFilter
+  searchAttribute
 }
 
 // ---------------------------------------------------------------------------