natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

cleo ide moment

This commit is contained in:
ThatOneCalculator 2022-12-04 12:53:55 -08:00
parent df1359e392
commit 8ab290b708
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/backend/src/models/repositories/user.ts
View File

@ -1,17 +1,18 @@
import {In, Not} from 'typeorm'; import { URL } from 'url';
import { In, Not } from 'typeorm';
import Ajv from 'ajv'; import Ajv from 'ajv';
import {ILocalUser, IRemoteUser, User} from '@/models/entities/user.js'; import type { ILocalUser, IRemoteUser } from '@/models/entities/user.js';
import { User } from '@/models/entities/user.js';
import config from '@/config/index.js'; import config from '@/config/index.js';
import {Packed} from '@/misc/schema.js'; import type { Packed } from '@/misc/schema.js';
import {awaitAll, Promiseable} from '@/prelude/await-all.js'; import type { Promiseable } from '@/prelude/await-all.js';
import {populateEmojis} from '@/misc/populate-emojis.js'; import { awaitAll } from '@/prelude/await-all.js';
import {getAntennas} from '@/misc/antenna-cache.js'; import { populateEmojis } from '@/misc/populate-emojis.js';
import {USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD} from '@/const.js'; import { getAntennas } from '@/misc/antenna-cache.js';
import {Cache} from '@/misc/cache.js'; import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
import {db} from '@/db/postgre.js'; import { Cache } from '@/misc/cache.js';
import {Instance} from '../entities/instance.js'; import { db } from '@/db/postgre.js';
import {resolveUser} from "@/remote/resolve-user"; import { resolveUser } from '@/remote/resolve-user.js';
import {URL} from "url";
import { import {
AnnouncementReads, AnnouncementReads,
Announcements, Announcements,
@ -31,14 +32,15 @@ import {
UserGroupJoinings, UserGroupJoinings,
UserNotePinings, UserNotePinings,
UserProfiles, UserProfiles,
UserSecurityKeys UserSecurityKeys,
} from '../index.js'; } from '../index.js';
import type { Instance } from '../entities/instance.js';
const userInstanceCache = new Cache<Instance | null>(1000 * 60 * 60 * 3); const userInstanceCache = new Cache<Instance | null>(1000 * 60 * 60 * 3);
type IsUserDetailed<Detailed extends boolean> = Detailed extends true ? Packed<'UserDetailed'> : Packed<'UserLite'>; type IsUserDetailed<Detailed extends boolean> = Detailed extends true ? Packed<'UserDetailed'> : Packed<'UserLite'>;
type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends boolean> = type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends boolean> =
Detailed extends true ? Detailed extends true ?
ExpectsMe extends true ? Packed<'MeDetailed'> : ExpectsMe extends true ? Packed<'MeDetailed'> :
ExpectsMe extends false ? Packed<'UserDetailedNotMe'> : ExpectsMe extends false ? Packed<'UserDetailedNotMe'> :
Packed<'UserDetailed'> : Packed<'UserDetailed'> :
@ -185,10 +187,10 @@ export const UserRepository = db.getRepository(User).extend({
return await resolveUser(id, null); return await resolveUser(id, null);
} }
let url = new URL(uri); const url = new URL(uri);
let userTag = url.pathname; let userTag = url.pathname;
if (userTag.startsWith("@")) { if (userTag.startsWith('@')) {
userTag = userTag.substring(1); userTag = userTag.substring(1);
} }