DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge: fix lints (!594) 

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/594

Approved-by: Marie <2-Marie@users.noreply.activitypub.software>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
This commit is contained in:
Marie 2024-08-18 13:11:27 +00:00
parent d92402554b 9672f0b48e
commit 38430f8ef3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/core/CustomEmojiService.ts
View File

@ -144,7 +144,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
if (data.driveFile != null) { if (data.driveFile != null) {
const file = await this.driveFilesRepository.findOneBy({ url: emoji.originalUrl, userHost: emoji.host ? emoji.host : IsNull() }); const file = await this.driveFilesRepository.findOneBy({ url: emoji.originalUrl, userHost: emoji.host ? emoji.host : IsNull() });
if (file && file.id != data.driveFile.id) { if (file && file.id !== data.driveFile.id) {
await this.driveService.deleteFile(file, false, moderator ? moderator : undefined); await this.driveService.deleteFile(file, false, moderator ? moderator : undefined);
} }
} }

2
packages/backend/src/core/MfmService.ts
View File

@ -683,7 +683,7 @@ export class MfmService {
let result = new XMLSerializer().serializeToString(body); let result = new XMLSerializer().serializeToString(body);
if (inline) { if (inline) {
result = result.replace(/^<p>/,'').replace(/<\/p>$/,''); result = result.replace(/^<p>/, '').replace(/<\/p>$/, '');
} }
return result; return result;