From 748685e53e2800da283bdaefee5b142a267c56d6 Mon Sep 17 00:00:00 2001 From: eternal-flame-AD Date: Thu, 21 Nov 2024 10:11:42 -0600 Subject: [PATCH] fix handling of private renotes Signed-off-by: eternal-flame-AD --- packages/backend/src/core/NoteCreateService.ts | 5 +++-- packages/backend/src/core/activitypub/type.ts | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index 3647fa7231..6f5773058b 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -7,6 +7,7 @@ import { setImmediate } from 'node:timers/promises'; import * as mfm from 'mfm-js'; import { In, DataSource, IsNull, LessThan } from 'typeorm'; import * as Redis from 'ioredis'; +import * as Bull from 'bullmq'; import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import { extractMentions } from '@/misc/extract-mentions.js'; import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js'; @@ -291,7 +292,7 @@ export class NoteCreateService implements OnApplicationShutdown { case 'followers': // 他人のfollowers noteはreject if (data.renote.userId !== user.id) { - throw new Error('Renote target is not public or home'); + throw new Bull.UnrecoverableError('Renote target is not public or home'); } // Renote対象がfollowersならfollowersにする @@ -299,7 +300,7 @@ export class NoteCreateService implements OnApplicationShutdown { break; case 'specified': // specified / direct noteはreject - throw new Error('Renote target is not public or home'); + throw new Bull.UnrecoverableError('Renote target is not public or home'); } } diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts index 6c77ef92d0..57dc2fe5f8 100644 --- a/packages/backend/src/core/activitypub/type.ts +++ b/packages/backend/src/core/activitypub/type.ts @@ -79,7 +79,6 @@ export function markOutgoing(object: T, _ba export function yumeNormalizeURL(url: string): string { const u = new URL(url); - u.hash = ''; u.host = toASCII(u.host); if (u.protocol && u.protocol !== 'https:') { throw new bull.UnrecoverableError('protocol is not https');