This commit is contained in:
@@ -5,6 +5,7 @@ const upload = require('../services/storage');
|
||||
|
||||
const Campaign = require('../models/Campaign');
|
||||
const Actor = require('../models/Actor');
|
||||
const Folder = require('../models/Folder');
|
||||
const Map = require('../models/Map');
|
||||
|
||||
async function userOwnsCampaign(campaignId, userId) {
|
||||
@@ -12,6 +13,15 @@ async function userOwnsCampaign(campaignId, userId) {
|
||||
return Boolean(campaign);
|
||||
}
|
||||
|
||||
// Folders the campaign's actors are grouped into, in the shape the sidebar groups by
|
||||
// (the notes, items and maps each keep a tree of their own, see models/Folder.js).
|
||||
async function actorFolders(campaignId) {
|
||||
return Folder.find({ campaign: campaignId, target: 'actor' })
|
||||
.select('_id name parentFolder date color')
|
||||
.sort({ date: -1 })
|
||||
.lean();
|
||||
}
|
||||
|
||||
router.get('/list', async (req, res) => {
|
||||
try {
|
||||
const { campaign } = req.query;
|
||||
@@ -19,7 +29,7 @@ router.get('/list', async (req, res) => {
|
||||
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
|
||||
const actors = await Actor.find({ campaign }).sort({ name: 1 }).lean();
|
||||
res.json({ status: 'ok', actors });
|
||||
res.json({ status: 'ok', actors, folders: await actorFolders(campaign) });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.json({ status: 'error', msg: 'errors.internal' });
|
||||
@@ -46,13 +56,22 @@ router.post('/create', async (req, res) => {
|
||||
|
||||
router.post('/update', async (req, res) => {
|
||||
try {
|
||||
const { id, name, species, className, subclass, level, abilityScores, armorClass, speed, proficiencies, inventory, traits, spells, image } = req.body;
|
||||
const { id, name, species, className, subclass, level, abilityScores, armorClass, speed, proficiencies, inventory, traits, spells, image, folder } = req.body;
|
||||
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||
|
||||
const actor = await Actor.findById(id);
|
||||
if (!actor) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
if (!(await userOwnsCampaign(actor.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
|
||||
// `null` moves the actor to the root of the actor list, an id files it in one of
|
||||
// this campaign's actor folders; anything else is refused.
|
||||
if (folder !== undefined) {
|
||||
if (!(await Folder.belongsToSection(folder || null, actor.campaign, 'actor'))) {
|
||||
return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
}
|
||||
actor.folder = folder || null;
|
||||
}
|
||||
|
||||
if (name !== undefined) actor.name = String(name).trim();
|
||||
if (species !== undefined) actor.species = species;
|
||||
if (className !== undefined) actor.className = className;
|
||||
|
||||
Reference in New Issue
Block a user