Compare commits

...

3 Commits

Author SHA1 Message Date
鴇峰 朔華
9a26a19195
Merge 2958cccd5b into dac3b1f405 2024-11-30 14:37:51 +09:00
鴇峰 朔華
2958cccd5b fix(test backend): RelayServiceでUtilityServiceを使う 2024-11-28 16:53:01 +09:00
鴇峰 朔華
6584e6cd03 fix(backend): ローカル判定でisUriLocalを使用していない箇所を修正 2024-11-28 15:48:40 +09:00
3 changed files with 7 additions and 2 deletions

View File

@ -74,7 +74,7 @@ export class RemoteUserResolveService {
if (user == null) {
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);
if (local.local && local.type === 'users') {
// the LR points to local

View File

@ -27,6 +27,7 @@ import type { UsersRepository, UserProfilesRepository, NotesRepository, DriveFil
import { bindThis } from '@/decorators.js';
import { CustomEmojiService } from '@/core/CustomEmojiService.js';
import { IdService } from '@/core/IdService.js';
import { UtilityService } from '@/core/UtilityService.js';
import { JsonLdService } from './JsonLdService.js';
import { ApMfmService } from './ApMfmService.js';
import { CONTEXT } from './misc/contexts.js';
@ -61,6 +62,7 @@ export class ApRendererService {
private apMfmService: ApMfmService,
private mfmService: MfmService,
private idService: IdService,
private utilityService: UtilityService,
) {
}
@ -574,7 +576,7 @@ export class ApRendererService {
@bindThis
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 {
type: 'Undo',

View File

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