summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2025-01-01 17:26:31 +0000
committerdakkar <dakkar@thenautilus.net>2025-01-01 17:26:31 +0000
commit0a4e1614eaec1bd2fa3eb1735123c19dcc122f87 (patch)
tree81705951f9fdaeca98a97630412438d380ac4a37
parentmerge: Bump stable version (!842) (diff)
parentbump version (diff)
downloadsharkey-0a4e1614eaec1bd2fa3eb1735123c19dcc122f87.tar.gz
sharkey-0a4e1614eaec1bd2fa3eb1735123c19dcc122f87.tar.bz2
sharkey-0a4e1614eaec1bd2fa3eb1735123c19dcc122f87.zip
merge: 2024.11.2, for real (!846)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/846
-rw-r--r--package.json2
-rw-r--r--packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts4
-rw-r--r--packages/misskey-js/package.json2
3 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json
index 1d2544deeb..2119284b20 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sharkey",
- "version": "2024.11.1",
+ "version": "2024.11.2",
"codename": "shonk",
"repository": {
"type": "git",
diff --git a/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts b/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts
index 62e3d1072f..d823d98ef1 100644
--- a/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts
+++ b/packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts
@@ -43,7 +43,7 @@ export class ScheduleNotePostProcessorService {
@bindThis
private async isValidNoteSchedule(note: MiScheduleNoteType, id: string): Promise<boolean> {
const reply = note.reply ? await this.notesRepository.findOneBy({ id: note.reply }) : undefined;
- const renote = note.reply ? await this.notesRepository.findOneBy({ id: note.renote }) : undefined;
+ const renote = note.renote ? await this.notesRepository.findOneBy({ id: note.renote }) : undefined;
const channel = note.channel ? await this.channelsRepository.findOneBy({ id: note.channel, isArchived: false }) : undefined;
if (note.reply && !reply) {
this.logger.warn('Schedule Note Failed Reason: parent note to reply does not exist');
@@ -78,7 +78,7 @@ export class ScheduleNotePostProcessorService {
const me = await this.usersRepository.findOneBy({ id: data.userId });
const note = data.note;
const reply = note.reply ? await this.notesRepository.findOneBy({ id: note.reply }) : undefined;
- const renote = note.reply ? await this.notesRepository.findOneBy({ id: note.renote }) : undefined;
+ const renote = note.renote ? await this.notesRepository.findOneBy({ id: note.renote }) : undefined;
const channel = note.channel ? await this.channelsRepository.findOneBy({ id: note.channel, isArchived: false }) : undefined;
let files: MiDriveFile[] = [];
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 392f296bb0..f65d270a3d 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2024.11.1-rc",
+ "version": "2024.11.2",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",