From 698ad90d3e82a15b85ceb021ad5667109ac0bcdb Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 31 Mar 2023 15:26:15 +1100 Subject: Revert "Merge pull request #1008 from spacebarchat/dev/samuel" This reverts commit 69ea71aa9e0bd2e5a98904a66fba0ad3745707cb, reversing changes made to 8b2faf0b18336e5dff1eeff4e849bcfd96b09e88. --- src/util/entities/User.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/util/entities/User.ts') diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index ec7a11d6..df9af328 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -34,7 +34,7 @@ import { trimSpecial, } from ".."; import { BitField } from "../util/BitField"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { ConnectedAccount } from "./ConnectedAccount"; import { Member } from "./Member"; import { Relationship } from "./Relationship"; @@ -94,7 +94,7 @@ export interface UserPrivate extends Pick { } @Entity("users") -export class User extends EntityCache { +export class User extends BaseClass { @Column() username: string; // username max length 32, min 2 (should be configurable) -- cgit 1.5.1