From bf710428ebe6004ed173da1d3c5bb78ad57cc38d Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Fri, 31 May 2024 12:55:53 +0100
Subject: [PATCH] various fixes after the merge
---
packages/backend/src/core/NoteEditService.ts | 2 +-
.../processors/ExportAccountDataProcessorService.ts | 11 +++++------
.../api/endpoints/admin/federation/update-instance.ts | 1 -
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts
index 03d2c4a35f..e28299316d 100644
--- a/packages/backend/src/core/NoteEditService.ts
+++ b/packages/backend/src/core/NoteEditService.ts
@@ -524,7 +524,7 @@ export class NoteEditService implements OnApplicationShutdown {
noteVisibility: note.visibility,
userId: user.id,
userHost: user.host,
- channelId: data.channelId,
+ channelId: data.channel ? data.channel.id : null,
});
if (!oldnote.hasPoll) {
diff --git a/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts b/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
index f6a4e8e2ec..a6892134bc 100644
--- a/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
@@ -287,7 +287,7 @@ export class ExportAccountDataProcessorService {
const mutings = await this.mutingsRepository.findBy({
muterId: user.id,
});
-
+
while (true) {
const followings = await this.followingsRepository.find({
where: {
@@ -353,7 +353,7 @@ export class ExportAccountDataProcessorService {
let followersCursor: MiFollowing['id'] | null = null;
let exportedFollowersCount = 0;
-
+
while (true) {
const followers = await this.followingsRepository.find({
where: {
@@ -680,7 +680,6 @@ export class ExportAccountDataProcessorService {
localOnly: antenna.localOnly,
withReplies: antenna.withReplies,
withFile: antenna.withFile,
- notify: antenna.notify,
}));
if (antennas.length - 1 !== index) {
@@ -749,9 +748,9 @@ export class ExportAccountDataProcessorService {
cleanup();
archiveCleanup();
if (profile.email) {
- this.emailService.sendEmail(profile.email,
- 'Your data archive is ready',
- `Click the following link to download the archive: ${driveFile.url}<br/>It is also available in your drive.`,
+ this.emailService.sendEmail(profile.email,
+ 'Your data archive is ready',
+ `Click the following link to download the archive: ${driveFile.url}<br/>It is also available in your drive.`,
`Click the following link to download the archive: ${driveFile.url}\r\n\r\nIt is also available in your drive.`,
);
}
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
index 9984441de7..8b142910a6 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -55,7 +55,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
}
await this.federatedInstanceService.update(instance.id, {
- isSuspended: ps.isSuspended,
suspensionState,
isNSFW: ps.isNSFW,
moderationNote: ps.moderationNote,