OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release/4.2.0' into develop

pull/5098/head
Chocobozzz 2022-06-23 11:01:55 +02:00
parent 64324ac646 f2623febd8
commit 371d4c6063
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/models/video/tag.ts
View File

@ -45,8 +45,9 @@ export class TagModel extends Model<Partial<AttributesOnly<TagModel>>> {
static findOrCreateTags (tags: string[], transaction: Transaction): Promise<MTag[]> { static findOrCreateTags (tags: string[], transaction: Transaction): Promise<MTag[]> {
if (tags === null) return Promise.resolve([]) if (tags === null) return Promise.resolve([])
const tasks: Promise<MTag>[] = [] const uniqueTags = new Set(tags)
tags.forEach(tag => {
const tasks = Array.from(uniqueTags).map(tag => {
const query = { const query = {
where: { where: {
name: tag name: tag
@ -57,9 +58,8 @@ export class TagModel extends Model<Partial<AttributesOnly<TagModel>>> {
transaction transaction
} }
const promise = TagModel.findOrCreate<MTag>(query) return TagModel.findOrCreate<MTag>(query)
.then(([ tagInstance ]) => tagInstance) .then(([ tagInstance ]) => tagInstance)
tasks.push(promise)
}) })
return Promise.all(tasks) return Promise.all(tasks)