summary refs log tree commit diff
path: root/src/database
diff options
context:
space:
mode:
Diffstat (limited to 'src/database')
-rw-r--r--src/database/entities/Channel.ts3
-rw-r--r--src/database/entities/Member.ts3
-rw-r--r--src/database/entities/Session.ts7
-rw-r--r--src/database/entities/User.ts4
4 files changed, 10 insertions, 7 deletions
diff --git a/src/database/entities/Channel.ts b/src/database/entities/Channel.ts

index 17a2a628..6771fc40 100644 --- a/src/database/entities/Channel.ts +++ b/src/database/entities/Channel.ts
@@ -20,7 +20,7 @@ import { HTTPError } from "lambert-server/HTTPError"; import { Column, Entity, JoinColumn, ManyToOne, OneToMany, RelationId } from "typeorm"; import { DmChannelDTO } from "../../util/dtos"; import { ChannelCreateEvent, ChannelRecipientRemoveEvent, ThreadCreateEvent, ThreadMembersUpdateEvent } from "../../util/interfaces"; -import { InvisibleCharacters, Snowflake, emitEvent, getPermission, trimSpecial, Permissions, Config, DiscordApiErrors } from "../../util/util"; +import { InvisibleCharacters, Snowflake, emitEvent, getPermission, Permissions, Config, DiscordApiErrors } from "../../util/util"; import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; import { Invite } from "./Invite"; @@ -35,6 +35,7 @@ import { Member } from "./Member"; import { ChannelPermissionOverwrite, ChannelType, PublicChannel, PublicUserProjection, ThreadMetadata } from "@spacebar/schemas"; import { OrmUtils } from "../../util/imports"; import { ThreadMember } from "./ThreadMember"; +import { trimSpecial } from "@spacebar/extensions"; @Entity({ name: "channels", diff --git a/src/database/entities/Member.ts b/src/database/entities/Member.ts
index b9fbac3d..b5b0b398 100644 --- a/src/database/entities/Member.ts +++ b/src/database/entities/Member.ts
@@ -21,13 +21,14 @@ import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, JoinTabl import { Ban, Channel, PublicGuildRelations } from "./index"; import { ReadyGuildDTO } from "../../util/dtos"; import { GuildCreateEvent, GuildDeleteEvent, GuildMemberAddEvent, GuildMemberRemoveEvent, GuildMemberUpdateEvent, MessageCreateEvent } from "../../util/interfaces"; -import { Config, emitEvent, DiscordApiErrors, Stopwatch } from "../../util/util"; +import { Config, emitEvent, DiscordApiErrors } from "../../util/util"; import { BaseClassWithoutId } from "./BaseClass"; import { Guild } from "./Guild"; import { Message } from "./Message"; import { Role } from "./Role"; import { User } from "./User"; import { AvatarDecorationData, Collectibles, DisplayNameStyle, PublicMember, PublicMemberProjection, UserGuildSettings } from "@spacebar/schemas"; +import { Stopwatch } from "@spacebar/extensions"; export const MemberPrivateProjection: (keyof Member)[] = [ "id", diff --git a/src/database/entities/Session.ts b/src/database/entities/Session.ts
index e0e622db..cfe7803c 100644 --- a/src/database/entities/Session.ts +++ b/src/database/entities/Session.ts
@@ -17,12 +17,13 @@ */ import crypto from "node:crypto"; +import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn, RelationId } from "typeorm"; +import { randomUpperString } from "@spacebar/api"; +import { DateBuilder, TimeSpan } from "@spacebar/extensions"; import { User } from "./User"; import { BaseClassWithoutId } from "./BaseClass"; -import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn, RelationId } from "typeorm"; import { Activity, ClientStatus, GatewaySession, GatewaySessionClientInfo, PrivateStatus } from "../../util/interfaces"; -import { randomUpperString } from "@spacebar/api"; -import { DateBuilder, IpDataClient, TimeSpan } from "../../util/util"; +import { IpDataClient } from "../../util/util"; @Entity({ name: "sessions", diff --git a/src/database/entities/User.ts b/src/database/entities/User.ts
index 5f40adb3..5c2c4fe1 100644 --- a/src/database/entities/User.ts +++ b/src/database/entities/User.ts
@@ -18,8 +18,8 @@ import { Request } from "express"; import { Column, Entity, JoinColumn, OneToMany, OneToOne } from "typeorm"; -import { Config, Email, FieldErrors, Snowflake, Stopwatch, trimSpecial } from "@spacebar/util"; -import { Random } from "@spacebar/util/util/Random"; +import { Config, Email, FieldErrors, Snowflake } from "@spacebar/util"; +import { Stopwatch, trimSpecial, Random } from "@spacebar/extensions"; import { BaseClass } from "./BaseClass"; import { Channel } from "./Channel"; import { ConnectedAccount } from "./ConnectedAccount";