Peaceultime/obsidian-visualiser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add character selection using campaign visibility and player characters in campaign

Browse Source
This commit is contained in:
Clément Pons
2025-11-17 17:54:28 +01:00
parent d8480e7366
commit 3de2b0fe19
7 changed files with 98 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/api/campaign/[id].get.ts
View File

@@ -19,20 +19,17 @@ export default defineEventHandler(async (e) => {
const db = useDatabase();
const data = db.query.campaignTable.findFirst({
columns: { owner: false },
with: {
members: { with: { member: { columns: { username: true, id: true } } }, columns: { id: false, rights: false, user: false }, extras: { 'characters': sql`NULL`.as('characters') } },
characters: { with: { character: { columns: { id: true, name: true, owner: true } } } },
members: { with: { member: { columns: { username: true, id: true } } }, columns: { id: false, user: false } },
characters: { with: { character: { columns: { id: true, name: true, owner: true } } }, columns: { character: false } },
owner: { columns: { username: true, id: true } },
logs: { columns: { details: true, from: true, timestamp: true, type: true }, orderBy: ({ timestamp }) => timestamp }
logs: { columns: { details: true, from: true, timestamp: true, type: true }, orderBy: ({ timestamp }) => timestamp },
},
where: ({ id: _id }) => eq(_id, parseInt(id, 10)),
}).sync();
if(data && (data.owner.id === session.user.id || data.members.find(e => e.member?.id === session.user!.id)))
{
data.members.forEach(e => e.characters = data.characters.filter(_e => _e.character?.owner === e.member?.id));
return data as Campaign;
}
if(data && (data.owner.id === session.user.id || data.members.find(e => e.member?.id === session.user!.id))) return data as Campaign;
else if(!data) return setResponseStatus(e, 404);
else return setResponseStatus(e, 403);
});

22
server/api/character/[id].get.ts
View File

@@ -1,7 +1,8 @@
import useDatabase from '~/composables/useDatabase';
import { characterTable } from '~/db/schema';
import { campaignCharactersTable, campaignMembersTable, campaignTable, characterAbilitiesTable, characterChoicesTable, characterLevelingTable, characterTable, characterTrainingTable, usersTable } from '~/db/schema';
import { group } from '#shared/general.util';
import type { Character, CharacterVariables, Level, MainStat, TrainingLevel } from '~/types/character';
import type { Character, MainStat, TrainingLevel } from '~/types/character';
import { and, eq, exists, getTableColumns, isNotNull, or, sql } from 'drizzle-orm';
export default defineEventHandler(async (e) => {
const id = getRouterParam(e, "id");
@@ -21,6 +22,7 @@ export default defineEventHandler(async (e) => {
}
const db = useDatabase();
const character = db.query.characterTable.findFirst({
with: {
abilities: true,
@@ -29,9 +31,23 @@ export default defineEventHandler(async (e) => {
choices: true,
user: {
columns: { username: true }
},
campaign: {
columns: { character: false, id: false, },
with: {
campaign: {
columns: { owner: true, },
with: {
members: { columns: { user: true } }
}
}
}
}
},
where: (character, { eq, and }) => and(eq(character.id, parseInt(id, 10)), eq(characterTable.owner, session.user!.id)),
where: and(eq(characterTable.id, parseInt(id, 10)), or(eq(characterTable.visibility, 'public'), eq(characterTable.owner, session.user!.id), exists(db.select({ id: sql`NULL` }).from(campaignCharactersTable)
.leftJoin(campaignTable, eq(campaignCharactersTable.id, campaignTable.id))
.leftJoin(campaignMembersTable, and(eq(campaignMembersTable.id, campaignTable.id), eq(campaignMembersTable.user, session.user.id)))
.where(and(eq(campaignCharactersTable.character, parseInt(id, 10)), or(eq(campaignTable.owner, session.user.id), isNotNull(campaignMembersTable.user))))))),
}).sync();
if(character !== undefined)