yume/paricafe
1
0
Fork 0
mirror of https://github.com/paricafe/misskey.git synced 2024-11-24 10:36:43 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
fly_mc 2024-11-18 23:35:46 +08:00
parent 9263c485c4
commit ecd0211226
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/backend/src/core/activitypub/ApInboxService.ts
View file

@ -86,7 +86,6 @@ export class ApInboxService {
private apQuestionService: ApQuestionService,
private queueService: QueueService,
private globalEventService: GlobalEventService,
private federatedInstanceService: FederatedInstanceService,
) {
this.logger = this.apLoggerService.logger;
}

19
packages/backend/src/core/activitypub/models/ApNoteService.ts
View file

@ -5,6 +5,7 @@
import { forwardRef, Inject, Injectable } from '@nestjs/common';
import { In } from 'typeorm';
import * as Bull from 'bullmq';
import { DI } from '@/di-symbols.js';
import type { PollsRepository, EmojisRepository, NotesRepository, MiMeta } from '@/models/_.js';
import type { Config } from '@/config.js';
@ -235,6 +236,18 @@ export class ApNoteService {
})
.catch(async err => {
this.logger.warn(`Error in inReplyTo ${note.inReplyTo} - ${err.statusCode ?? err}`);
if (visibility === 'followers') { throw err; } // private reply
if (err.message === 'Instance is blocked') { throw err; }
if (err.message === 'blocked host') { throw err; }
if (err instanceof IdentifiableError) {
if (err.id === '85ab9bd7-3a41-4530-959d-f07073900109') { throw err; } // actor has been suspended
}
if (err instanceof StatusError) {
if (err.statusCode === 404) { return null; } // eat 404 error
}
if (err instanceof Bull.UnrecoverableError) {
return null; // eat unrecoverableerror
}
throw err;
})
: null;
@ -242,14 +255,14 @@ export class ApNoteService {
// 引用
let quote: MiNote | undefined | null = null;
if (note._misskey_quote ?? note.quoteUrl) {
if (note._misskey_quote ?? note.quoteUrl ?? note.quoteUri) {
const tryResolveNote = async (uri: string): Promise<
| { status: 'ok'; res: MiNote }
| { status: 'permerror' | 'temperror' }
> => {
if (!/^https?:/.test(uri)) return { status: 'permerror' };
if (typeof uri !== 'string' || !/^https?:/.test(uri)) return { status: 'permerror' };
try {
const res = await this.resolveNote(uri);
const res = await this.resolveNote(uri, { resolver });
if (res == null) return { status: 'permerror' };
return { status: 'ok', res };
} catch (e) {