mirror of
https://github.com/versia-pub/server.git
synced 2026-03-13 22:09:16 +01:00
refactor(database): 🚚 Only import ORM table data from @versia/kit
This commit is contained in:
parent
2f8b85a299
commit
7a73b8db91
116 changed files with 193 additions and 202 deletions
|
|
@ -1,8 +1,7 @@
|
|||
import type { Notification as ApiNotification } from "@versia/client/types";
|
||||
import { Note, User } from "@versia/kit/db";
|
||||
import { Note, User, db } from "@versia/kit/db";
|
||||
import type { Notifications } from "@versia/kit/tables";
|
||||
import type { InferSelectModel } from "drizzle-orm";
|
||||
import { db } from "~/drizzle/db";
|
||||
import type { Notifications } from "~/drizzle/schema";
|
||||
import type { StatusWithRelations } from "./status.ts";
|
||||
import {
|
||||
type UserWithRelations,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,13 @@ import { mentionValidator } from "@/api";
|
|||
import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization";
|
||||
import markdownItTaskLists from "@hackmd/markdown-it-task-lists";
|
||||
import type { ContentFormat } from "@versia/federation/types";
|
||||
import { User } from "@versia/kit/db";
|
||||
import { User, db } from "@versia/kit/db";
|
||||
import {
|
||||
type Attachments,
|
||||
Instances,
|
||||
type Notes,
|
||||
Users,
|
||||
} from "@versia/kit/tables";
|
||||
import {
|
||||
type InferSelectModel,
|
||||
and,
|
||||
|
|
@ -27,13 +33,6 @@ import markdownItContainer from "markdown-it-container";
|
|||
import markdownItTocDoneRight from "markdown-it-toc-done-right";
|
||||
import type { ApplicationType } from "~/classes/database/application.ts";
|
||||
import type { EmojiWithInstance } from "~/classes/database/emoji.ts";
|
||||
import { db } from "~/drizzle/db";
|
||||
import {
|
||||
type Attachments,
|
||||
Instances,
|
||||
type Notes,
|
||||
Users,
|
||||
} from "~/drizzle/schema";
|
||||
import { config } from "~/packages/config-manager/index.ts";
|
||||
import {
|
||||
type UserWithInstance,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import type { Tokens } from "@versia/kit/tables";
|
||||
import type { InferSelectModel } from "drizzle-orm";
|
||||
import type { Tokens } from "~/drizzle/schema";
|
||||
|
||||
/**
|
||||
* The type of token.
|
||||
|
|
|
|||
|
|
@ -3,18 +3,17 @@ import type {
|
|||
FollowAccept,
|
||||
FollowReject,
|
||||
} from "@versia/federation/types";
|
||||
import { User } from "@versia/kit/db";
|
||||
import { type InferSelectModel, eq, sql } from "drizzle-orm";
|
||||
import type { ApplicationType } from "~/classes/database/application.ts";
|
||||
import type { EmojiWithInstance } from "~/classes/database/emoji.ts";
|
||||
import { db } from "~/drizzle/db";
|
||||
import { User, db } from "@versia/kit/db";
|
||||
import {
|
||||
Applications,
|
||||
type Instances,
|
||||
type Roles,
|
||||
Tokens,
|
||||
type Users,
|
||||
} from "~/drizzle/schema";
|
||||
} from "@versia/kit/tables";
|
||||
import { type InferSelectModel, eq, sql } from "drizzle-orm";
|
||||
import type { ApplicationType } from "~/classes/database/application.ts";
|
||||
import type { EmojiWithInstance } from "~/classes/database/emoji.ts";
|
||||
import type { Token } from "./token.ts";
|
||||
|
||||
export type UserType = InferSelectModel<typeof Users>;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue