versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2026-03-13 05:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up database with new schema

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-04-13 15:21:38 -10:00
parent a65249b79d
commit 0ca77e9dcc
No known key found for this signature in database
24 changed files with 10174 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

28
database/entities/Status.ts
View file

@ -23,7 +23,7 @@ import {
instance,
type like,
status,
statusToUser,
statusToMentions,
user,
} from "~drizzle/schema";
import type { APIAttachment } from "~types/entities/attachment";
@ -946,8 +946,8 @@ export const createNewStatus = async (
await db
.insert(emojiToStatus)
.values({
a: emoji.id,
b: newStatus.id,
emojiId: emoji.id,
statusId: newStatus.id,
})
.execute();
}
@ -955,10 +955,10 @@ export const createNewStatus = async (
// Connect mentions
for (const mention of mentions ?? []) {
await db
.insert(statusToUser)
.insert(statusToMentions)
.values({
a: newStatus.id,
b: mention.id,
statusId: newStatus.id,
userId: mention.id,
})
.execute();
}
@ -1109,8 +1109,8 @@ export const editStatus = async (
await db
.insert(emojiToStatus)
.values({
a: emoji.id,
b: updated.id,
emojiId: emoji.id,
statusId: updated.id,
})
.execute();
}
@ -1118,10 +1118,10 @@ export const editStatus = async (
// Connect mentions
for (const mention of mentions) {
await db
.insert(statusToUser)
.insert(statusToMentions)
.values({
a: updated.id,
b: mention.id,
statusId: updated.id,
userId: mention.id,
})
.execute();
}
@ -1157,11 +1157,11 @@ export const statusToAPI = async (
userFetching?: UserWithRelations,
): Promise<APIStatus> => {
const wasPinnedByUser = userFetching
? !!(await db.query.statusToUser.findFirst({
? !!(await db.query.userPinnedNotes.findFirst({
where: (relation, { and, eq }) =>
and(
eq(relation.a, statusToConvert.id),
eq(relation.b, userFetching?.id),
eq(relation.statusId, statusToConvert.id),
eq(relation.userId, userFetching?.id),
),
}))
: false;

18
database/entities/User.ts
View file

@ -108,14 +108,14 @@ export const userExtrasTemplate = (name: string) => ({
instance: true,
emojis: {
with: {
instance: true,
emoji: {
with: {
instance: true,
},
},
},
},
},
extras: {
//
followerCount: sql`SELECT COUNT(*) FROM relationship WHERE owner_id = user.id AND following = true`,
},
}); */
export interface AuthData {
@ -262,8 +262,8 @@ export const transformOutputToUserWithRelations = (
followingCount: unknown;
statusCount: unknown;
emojis: {
a: string;
b: string;
userId: string;
emojiId: string;
emoji?: EmojiWithInstance;
}[];
instance: InferSelectModel<typeof instance> | null;
@ -447,8 +447,8 @@ export const resolveUser = async (
if (emojis.length > 0) {
await db.insert(emojiToUser).values(
emojis.map((emoji) => ({
a: emoji.id,
b: newUser.id,
emojiId: emoji.id,
userId: newUser.id,
})),
);
}