mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-23 00:29:22 +09:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge 2958cccd5b into 3c81926f71

Browse Source
This commit is contained in:
鴇峰 朔華 2024-12-22 13:58:42 +09:00 committed by GitHub
commit 8593ea66d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/core/RemoteUserResolveService.ts
View File

@ -74,7 +74,7 @@ export class RemoteUserResolveService {
if (user == null) { if (user == null) {
const self = await this.resolveSelf(acctLower); const self = await this.resolveSelf(acctLower);
if (self.href.startsWith(this.config.url)) { if (this.utilityService.isUriLocal(self.href)) {
const local = this.apDbResolverService.parseUri(self.href); const local = this.apDbResolverService.parseUri(self.href);
if (local.local && local.type === 'users') { if (local.local && local.type === 'users') {
// the LR points to local // the LR points to local

4
packages/backend/src/core/activitypub/ApRendererService.ts
View File

@ -27,6 +27,7 @@ import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFil
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { CustomEmojiService } from '@/core/CustomEmojiService.js'; import { CustomEmojiService } from '@/core/CustomEmojiService.js';
import { IdService } from '@/core/IdService.js'; import { IdService } from '@/core/IdService.js';
import { UtilityService } from '@/core/UtilityService.js';
import { JsonLdService } from './JsonLdService.js'; import { JsonLdService } from './JsonLdService.js';
import { ApMfmService } from './ApMfmService.js'; import { ApMfmService } from './ApMfmService.js';
import { CONTEXT } from './misc/contexts.js'; import { CONTEXT } from './misc/contexts.js';
@ -61,6 +62,7 @@ export class ApRendererService {
private apMfmService: ApMfmService, private apMfmService: ApMfmService,
private mfmService: MfmService, private mfmService: MfmService,
private idService: IdService, private idService: IdService,
private utilityService: UtilityService,
) { ) {
} }
@ -574,7 +576,7 @@ export class ApRendererService {
@bindThis @bindThis
public renderUndo(object: string | IObject, user: { id: MiUser['id'] }): IUndo { public renderUndo(object: string | IObject, user: { id: MiUser['id'] }): IUndo {
const id = typeof object !== 'string' && typeof object.id === 'string' && object.id.startsWith(this.config.url) ? `${object.id}/undo` : undefined; const id = typeof object !== 'string' && typeof object.id === 'string' && this.utilityService.isUriLocal(object.id) ? `${object.id}/undo` : undefined;
return { return {
type: 'Undo', type: 'Undo',

3
packages/backend/test/unit/RelayService.ts
View File

@ -3,6 +3,8 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { UtilityService } from '@/core/UtilityService.js';
process.env.NODE_ENV = 'test'; process.env.NODE_ENV = 'test';
import { jest } from '@jest/globals'; import { jest } from '@jest/globals';
@ -40,6 +42,7 @@ describe('RelayService', () => {
ApRendererService, ApRendererService,
RelayService, RelayService,
UserEntityService, UserEntityService,
UtilityService,
], ],
}) })
.useMocker((token) => { .useMocker((token) => {