diff options
-rwxr-xr-x | scripts/dev/server.sh | 4 | ||||
-rw-r--r-- | server/models/video/video.ts | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh index bff26cb4b..3130f1d87 100755 --- a/scripts/dev/server.sh +++ b/scripts/dev/server.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/usr/bin/env sh | 1 | #!/usr/bin/env sh |
2 | 2 | ||
3 | if [ ! -d "./client/dist" ]; then | 3 | if [ ! -f "./client/dist/index.html" ]; then |
4 | echo "client/dist does not exist, compile client files..." | 4 | echo "client/dist/index.html does not exist, compile client files..." |
5 | npm run build:client | 5 | npm run build:client |
6 | fi | 6 | fi |
7 | 7 | ||
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 629051ae4..3d71e8d9e 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
@@ -730,28 +730,28 @@ searchAndPopulateAuthorAndPodAndTags = function (value: string, field: string, s | |||
730 | `(SELECT "VideoTags"."videoId" | 730 | `(SELECT "VideoTags"."videoId" |
731 | FROM "Tags" | 731 | FROM "Tags" |
732 | INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId" | 732 | INNER JOIN "VideoTags" ON "Tags"."id" = "VideoTags"."tagId" |
733 | WHERE name LIKE ${escapedValue} | 733 | WHERE name ILIKE ${escapedValue} |
734 | )` | 734 | )` |
735 | ) | 735 | ) |
736 | } else if (field === 'host') { | 736 | } else if (field === 'host') { |
737 | // FIXME: Include our pod? (not stored in the database) | 737 | // FIXME: Include our pod? (not stored in the database) |
738 | podInclude.where = { | 738 | podInclude.where = { |
739 | host: { | 739 | host: { |
740 | $like: '%' + value + '%' | 740 | $iLike: '%' + value + '%' |
741 | } | 741 | } |
742 | } | 742 | } |
743 | podInclude.required = true | 743 | podInclude.required = true |
744 | } else if (field === 'author') { | 744 | } else if (field === 'author') { |
745 | authorInclude.where = { | 745 | authorInclude.where = { |
746 | name: { | 746 | name: { |
747 | $like: '%' + value + '%' | 747 | $iLike: '%' + value + '%' |
748 | } | 748 | } |
749 | } | 749 | } |
750 | 750 | ||
751 | // authorInclude.or = true | 751 | // authorInclude.or = true |
752 | } else { | 752 | } else { |
753 | query.where[field] = { | 753 | query.where[field] = { |
754 | $like: '%' + value + '%' | 754 | $iLike: '%' + value + '%' |
755 | } | 755 | } |
756 | } | 756 | } |
757 | 757 | ||
@@ -759,10 +759,6 @@ searchAndPopulateAuthorAndPodAndTags = function (value: string, field: string, s | |||
759 | authorInclude, tagInclude | 759 | authorInclude, tagInclude |
760 | ] | 760 | ] |
761 | 761 | ||
762 | if (tagInclude.where) { | ||
763 | // query.include.push([ Video['sequelize'].models.Tag ]) | ||
764 | } | ||
765 | |||
766 | return Video.findAndCountAll(query).then(({ rows, count }) => { | 762 | return Video.findAndCountAll(query).then(({ rows, count }) => { |
767 | return { | 763 | return { |
768 | data: rows, | 764 | data: rows, |