graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-26 15:03:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge: pleroma note import - Use hashed filename for exists check (#283)

Browse source 
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/283
This commit is contained in:
Marie 2023-12-31 18:43:38 +01:00
commit 233eff48f3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/queue/processors/ImportNotesProcessorService.ts
View file

@ -1,5 +1,6 @@
import * as fs from 'node:fs'; import * as fs from 'node:fs';
import * as vm from 'node:vm'; import * as vm from 'node:vm';
import * as crypto from 'node:crypto';
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
import { ZipReader } from 'slacc'; import { ZipReader } from 'slacc';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
@ -472,7 +473,9 @@ export class ImportNotesProcessorService {
for await (const file of post.object.attachment) { for await (const file of post.object.attachment) {
const slashdex = file.url.lastIndexOf('/'); const slashdex = file.url.lastIndexOf('/');
const name = file.url.substring(slashdex + 1); const filename = file.url.substring(slashdex + 1);
const hash = crypto.createHash('md5').update(file.url).digest('base64url');
const name = `${hash}-${filename}`;
const [filePath, cleanup] = await createTemp(); const [filePath, cleanup] = await createTemp();
const exists = await this.driveFilesRepository.findOneBy({ name: name, userId: user.id }) ?? await this.driveFilesRepository.findOneBy({ name: name, userId: user.id, folderId: pleroFolder?.id }); const exists = await this.driveFilesRepository.findOneBy({ name: name, userId: user.id }) ?? await this.driveFilesRepository.findOneBy({ name: name, userId: user.id, folderId: pleroFolder?.id });
@ -487,6 +490,7 @@ export class ImportNotesProcessorService {
user: user, user: user,
path: filePath, path: filePath,
name: name, name: name,
comment: file.name,
folderId: pleroFolder?.id, folderId: pleroFolder?.id,
}); });
files.push(driveFile); files.push(driveFile);