e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

fixed it for good

Browse source
This commit is contained in:
cutestnekoaqua 2022-12-07 01:15:32 +01:00
parent 2cda9971a9
commit f47813cf0e
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
packages/backend/src/models/repositories/user.ts
View file

@ -12,7 +12,10 @@ import { getAntennas } from '@/misc/antenna-cache.js';
import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js'; import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
import { Cache } from '@/misc/cache.js'; import { Cache } from '@/misc/cache.js';
import { db } from '@/db/postgre.js'; import { db } from '@/db/postgre.js';
import { resolveUser } from '@/remote/resolve-user.js'; import { isActor, getApId } from '@/remote/activitypub/type.js';
import DbResolver from '@/remote/activitypub/db-resolver.js';
import Resolver from '@/remote/activitypub/resolver.js';
import { createPerson } from '@/remote/activitypub/models/person.js';
import { import {
AnnouncementReads, AnnouncementReads,
Announcements, Announcements,
@ -181,20 +184,24 @@ export const UserRepository = db.getRepository(User).extend({
}, },
async userFromURI(uri: string): Promise<User | null> { async userFromURI(uri: string): Promise<User | null> {
if (uri.startsWith(config.url + '/')) { const dbResolver = new DbResolver();
const id = uri.split('/').pop(); let local = await dbResolver.getUserFromApId(uri);
if (id == undefined) return null; if (local) {
return await resolveUser(id, null); return local;
}
// fetching Object once from remote
const resolver = new Resolver();
const object = await resolver.resolve(uri) as any;
// /@user If a URI other than the id is specified,
// the URI is determined here
if (uri !== object.id) {
local = await dbResolver.getUserFromApId(object.id);
if (local != null) return local;
} }
const url = new URL(uri); return isActor(object) ? await createPerson(getApId(object)) : null;
let userTag = url.pathname;
if (userTag.startsWith('@')) {
userTag = userTag.substring(1);
}
return await resolveUser(userTag, url.host);
}, },
async getHasUnreadAntenna(userId: User['id']): Promise<boolean> { async getHasUnreadAntenna(userId: User['id']): Promise<boolean> {