X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Ftag.ts;h=653b9694b8a6adef8a3c68cfb8b1822e6c2667c3;hb=adc94cf09c86112051f72055852efcc977e4a04a;hp=61dfb224d37c21d5223aa4495e9ec5504f03d8c2;hpb=0c691a182c7aeaf0d0e6f7f71d46d6f558e2843b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/tag.ts b/server/models/video/tag.ts index 61dfb224d..653b9694b 100644 --- a/server/models/video/tag.ts +++ b/server/models/video/tag.ts @@ -1,7 +1,7 @@ import { col, fn, QueryTypes, Transaction } from 'sequelize' import { AllowNull, BelongsToMany, Column, CreatedAt, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' import { MTag } from '@server/types/models' -import { AttributesOnly } from '@shared/core-utils' +import { AttributesOnly } from '@shared/typescript-utils' import { VideoPrivacy, VideoState } from '../../../shared/models/videos' import { isVideoTagValid } from '../../helpers/custom-validators/videos' import { throwIfNotValid } from '../utils' @@ -45,8 +45,9 @@ export class TagModel extends Model>> { static findOrCreateTags (tags: string[], transaction: Transaction): Promise { if (tags === null) return Promise.resolve([]) - const tasks: Promise[] = [] - tags.forEach(tag => { + const uniqueTags = new Set(tags) + + const tasks = Array.from(uniqueTags).map(tag => { const query = { where: { name: tag @@ -57,9 +58,8 @@ export class TagModel extends Model>> { transaction } - const promise = TagModel.findOrCreate(query) + return TagModel.findOrCreate(query) .then(([ tagInstance ]) => tagInstance) - tasks.push(promise) }) return Promise.all(tasks)