Minz/toho-miku
1
0
Fork 0
Code Issues 33 Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Merge new rendering into master #60

Merged
JanGross merged 25 commits from dev-new-rendering into master 2023-08-07 17:34:19 +02:00
Conversation 0 Commits 25 Files Changed 17 +151 -33
5 changed files with 151 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56ff2f96a5 - Show all commits

7
README.md
View File

@@ -1,10 +1,11 @@
# Toho Miku ![miku-banner](https://github.com/JanGross/toho-miku/assets/13641301/70ae153f-5e1d-4f49-9793-659ac3631403)
[![](https://dcbadge.vercel.app/api/server/uWFpsYnbPX)](https://discord.gg/uWFpsYnbPX) [![Support the project on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dtoho_miku%26type%3Dpatrons&style=for-the-badge)](https://patreon.com/toho_miku) [![](https://dcbadge.vercel.app/api/server/uWFpsYnbPX)](https://discord.gg/uWFpsYnbPX) [![Support the project on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dtoho_miku%26type%3Dpatrons&style=for-the-badge)](https://patreon.com/toho_miku)
Part of this project are Part of this project are
- [Toho-Mon](https://github.com/JanGross/toho-mon) Bot status monitoring with webhook alerts - [Toho-Mon](https://github.com/JanGross/toho-mon) Bot status monitoring with webhook alerts
- [Toho-Reno](https://github.com/JanGross/toho-reno) Headless render node - [Toho-Reno](https://github.com/JanGross/toho-reno) Godot render node
- [Job-Server](https://github.com/JanGross/job-server) Jobserver managing render jobs - [Toho-Jose](https://github.com/JanGross/toho-jose) Jobserver managing render jobs
### Run dev container ### Run dev container

110
commands/missing.js Normal file
View File

@@ -0,0 +1,110 @@
const { SlashCommandBuilder, AttachmentBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType } = require("discord.js");
const { Card, User, Group, Character, Badge } = require("../models");
const { Rendering, UserUtils } = require("../util");
const { QUALITY_NAMES } = require("../config/constants");
const Sequelize = require("sequelize");
const fs = require("fs");
const edit = require("./edit");
//fetch all cards owned by the user and list them
module.exports = {
data: new SlashCommandBuilder()
.setName("missing")
.setDescription("View missing things")
.addStringOption((option) =>
option
.setName("group")
.setDescription("Thing identifier")
.setRequired(false)
.setAutocomplete(true)
),
permissionLevel: 0,
async execute(interaction) {
await interaction.deferReply();
let groupId = interaction.options.getString("group");
let user = await UserUtils.getUserByDiscordId(interaction.member.user.id);
let embed = new EmbedBuilder()
.setTitle(`Missing cards`);
let description = "";
if (groupId) {
try {
let missing = await this.FindMissingFromGroup(user.id, groupId);
missing.map((character) => {
description += `[${character.id}] ${character.name}\n`;
});
} catch (error) {
console.error('Error:', error);
throw error;
}
} else {
let missingCounts = await this.CountMissingFromGroup(user.id);
missingCounts.sort(({missingCount:a}, {missingCount:b}) => b-a);
missingCounts.map((group) => {
if (group.missingCount > 0) {
description += `${group.name}: ${group.missingCount}\n`;
}
});
}
embed.setDescription(description);
await interaction.editReply({ embeds: [embed] });
return;
},
async CountMissingFromGroup(userId) {
try {
const groups = await Group.findAll({
where: { enabled: 1 }
});
const missingCountByGroup = await Promise.all(
groups.map(async (group) => {
const characters = await Character.findAll({
where: { groupId: group.id, enabled: 1 },
include: [
{
model: Card,
where: { userId: userId },
required: false,
},
],
});
const missingCount = characters.reduce((total, character) => {
return total + (character.Cards.length === 0 ? 1 : 0);
}, 0);
return {
id: group.id,
name: group.name,
missingCount: missingCount,
};
})
);
return missingCountByGroup;
} catch (error) {
console.error('Error:', error);
throw error;
}
},
async FindMissingFromGroup(userId, groupId) {
const missingCards = await Character.findAll({
attributes: ['groupId', 'id', 'name'],
include: [{
model: Card,
attributes: [],
required: false,
where: { userId: userId, burned: 0 },
}],
where: { groupId: groupId },
having: Sequelize.literal('COUNT(Cards.id) = 0'),
group: ['Character.id'],
});
return missingCards;
}
}

6
events/autocompleteRequest.js
View File

@@ -40,6 +40,12 @@ module.exports = {
} }
} }
if (interaction.commandName === 'missing') {
choices = (await SearchUtils.findByName(Group, focusedOption.value))["choices"];
}
if (interaction.commandName === 'wishlist') { if (interaction.commandName === 'wishlist') {
choices = (await SearchUtils.findByName(Character, focusedOption.value))["choices"]; choices = (await SearchUtils.findByName(Character, focusedOption.value))["choices"];
} }

1
models/character.js
View File

@@ -13,6 +13,7 @@ module.exports = (sequelize, DataTypes) => {
Character.belongsTo(models.Group, { foreignKey: 'groupId', }); Character.belongsTo(models.Group, { foreignKey: 'groupId', });
// A character can belong to many badges // A character can belong to many badges
Character.belongsToMany(models.Badge, { through: 'BadgeCharacter' }); Character.belongsToMany(models.Badge, { through: 'BadgeCharacter' });
Character.hasMany(models.Card, { foreignKey: 'characterId' });
} }
} }
Character.init({ Character.init({

60
package-lock.json generated
View File

@@ -707,9 +707,9 @@
} }
}, },
"node_modules/dottie": { "node_modules/dottie": {
"version": "2.0.3", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.3.tgz", "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.4.tgz",
"integrity": "sha512-4liA0PuRkZWQFQjwBypdxPfZaRWiv5tkhMXY2hzsa2pNf5s7U3m9cwUchfNKe8wZQxdGPQQzO6Rm2uGe0rvohQ==" "integrity": "sha512-iz64WUOmp/ECQhWMJjTWFzJN/wQ7RJ5v/a6A2OiCwjaGCpNo66WGIjlSf+IULO9DQd0b4cFawLOTbiKSrpKodw=="
}, },
"node_modules/editorconfig": { "node_modules/editorconfig": {
"version": "0.15.3", "version": "0.15.3",
@@ -1655,9 +1655,9 @@
} }
}, },
"node_modules/node-abi/node_modules/semver": { "node_modules/node-abi/node_modules/semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
}, },
@@ -2029,9 +2029,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"node_modules/semver": { "node_modules/semver": {
"version": "5.7.1", "version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"bin": { "bin": {
"semver": "bin/semver" "semver": "bin/semver"
} }
@@ -2189,9 +2189,9 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"node_modules/sequelize/node_modules/semver": { "node_modules/sequelize/node_modules/semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
}, },
@@ -2244,9 +2244,9 @@
} }
}, },
"node_modules/sharp/node_modules/semver": { "node_modules/sharp/node_modules/semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dependencies": { "dependencies": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
}, },
@@ -3292,9 +3292,9 @@
"integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==" "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="
}, },
"dottie": { "dottie": {
"version": "2.0.3", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.3.tgz", "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.4.tgz",
"integrity": "sha512-4liA0PuRkZWQFQjwBypdxPfZaRWiv5tkhMXY2hzsa2pNf5s7U3m9cwUchfNKe8wZQxdGPQQzO6Rm2uGe0rvohQ==" "integrity": "sha512-iz64WUOmp/ECQhWMJjTWFzJN/wQ7RJ5v/a6A2OiCwjaGCpNo66WGIjlSf+IULO9DQd0b4cFawLOTbiKSrpKodw=="
}, },
"editorconfig": { "editorconfig": {
"version": "0.15.3", "version": "0.15.3",
@@ -4031,9 +4031,9 @@
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"requires": { "requires": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
} }
@@ -4288,9 +4288,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"semver": { "semver": {
"version": "5.7.1", "version": "5.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
}, },
"send": { "send": {
"version": "0.18.0", "version": "0.18.0",
@@ -4371,9 +4371,9 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}, },
"semver": { "semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"requires": { "requires": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
} }
@@ -4431,9 +4431,9 @@
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "7.3.8", "version": "7.5.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"requires": { "requires": {
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
} }