mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-10-31 13:34:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: merge 2024.12.2 into develop (!847)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/847

Approved-by: Hazelnoot <acomputerdog@gmail.com>
This commit is contained in:
dakkar 2025-01-01 17:56:25 +00:00
commit d6cadc98c3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/queue/processors/ScheduleNotePostProcessorService.ts
View file

@ -43,7 +43,7 @@ export class ScheduleNotePostProcessorService {
@bindThis @bindThis
private async isValidNoteSchedule(note: MiScheduleNoteType, id: string): Promise<boolean> { private async isValidNoteSchedule(note: MiScheduleNoteType, id: string): Promise<boolean> {
const reply = note.reply ? await this.notesRepository.findOneBy({ id: note.reply }) : undefined; 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; const channel = note.channel ? await this.channelsRepository.findOneBy({ id: note.channel, isArchived: false }) : undefined;
if (note.reply && !reply) { if (note.reply && !reply) {
this.logger.warn('Schedule Note Failed Reason: parent note to reply does not exist'); 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 me = await this.usersRepository.findOneBy({ id: data.userId });
const note = data.note; const note = data.note;
const reply = note.reply ? await this.notesRepository.findOneBy({ id: note.reply }) : undefined; 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; const channel = note.channel ? await this.channelsRepository.findOneBy({ id: note.channel, isArchived: false }) : undefined;
let files: MiDriveFile[] = []; let files: MiDriveFile[] = [];

2
packages/misskey-js/package.json
View file

@ -1,7 +1,7 @@
{ {
"type": "module", "type": "module",
"name": "misskey-js", "name": "misskey-js",
"version": "2024.11.1-rc", "version": "2025.1.0-dev",
"description": "Misskey SDK for JavaScript", "description": "Misskey SDK for JavaScript",
"license": "MIT", "license": "MIT",
"main": "./built/index.js", "main": "./built/index.js",