mirrors/pissbot-9000
1
0
Fork 0
mirror of https://gitlab.com/bignutty/labscore.git synced 2025-06-08 06:03:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[nextgen] mostly implemented

Browse source
This commit is contained in:
bignutty 2025-02-11 23:50:53 +01:00
parent 4e62cecf0f
commit f226d7170a
12 changed files with 194 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

5
commands/interaction/slash/search/anime.js
View file

@ -2,7 +2,8 @@ const { anime } = require('#api');
const { paginator } = require('#client');
const { PERMISSION_GROUPS, OMNI_ANIME_FORMAT_TYPES } = require('#constants');
const { createEmbed, formatPaginationEmbeds, page, hexToEmbedColor } = require('#utils/embed');
const { hexToDecimalColor } = require("#utils/color");
const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed');
const { acknowledge } = require('#utils/interactions');
const { smallPill, link, pill, stringwrapPreserveWords} = require('#utils/markdown');
const { editOrReply } = require('#utils/message');
@ -38,7 +39,7 @@ function renderAnimeResultsPage(context, res){
if(res.image) result.image = { url: res.image };
// Render Color
if(res.color) result.color = hexToEmbedColor(res.color);
if(res.color) result.color = hexToDecimalColor(res.color);
// Render Episode Metadata
if(res.episodes) {

5
commands/interaction/slash/search/maps.js
View file

@ -1,7 +1,8 @@
const { maps, mapsSupplemental } = require('#api');
const { PERMISSION_GROUPS } = require('#constants');
const { createEmbed, hexToEmbedColor } = require('#utils/embed');
const { hexToDecimalColor } = require("#utils/color");
const { createEmbed } = require('#utils/embed');
const { acknowledge } = require('#utils/interactions');
const { link, icon, iconAsEmojiObject, citation } = require('#utils/markdown');
const { editOrReply } = require('#utils/message')
@ -19,7 +20,7 @@ function renderPlaceCard(context, place) {
},
description: `${place.address.full}`,
url: place.url,
color: hexToEmbedColor(place.style.color)
color: hexToDecimalColor(place.style.color)
})]
if (place.display_type) {

5
commands/interaction/slash/search/movie.js
View file

@ -2,7 +2,8 @@ const { movie } = require('#api');
const { paginator } = require('#client');
const { PERMISSION_GROUPS, OMNI_ANIME_FORMAT_TYPES, OMNI_MOVIE_TYPES } = require('#constants');
const { createEmbed, formatPaginationEmbeds, page, hexToEmbedColor } = require('#utils/embed');
const { hexToDecimalColor } = require("#utils/color");
const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed');
const { acknowledge } = require('#utils/interactions');
const { smallPill, pill } = require('#utils/markdown');
const { editOrReply } = require('#utils/message');
@ -29,7 +30,7 @@ function renderMovieResultsPage(context, res){
if(res.image) result.image = { url: res.image };
// Render Color
if(res.color) result.color = hexToEmbedColor(res.color);
if(res.color) result.color = hexToDecimalColor(res.color);
return page(result);
}

53
commands/message/dev/test.js
View file

@ -30,6 +30,7 @@ module.exports = {
label: "single sub page",
inline: true,
visible: true,
disableCache: true,
resolvePage: ()=>{
return [
createEmbed("success", context, "smiley")
@ -42,8 +43,6 @@ module.exports = {
// Next to pagination or new row
inline: false,
visible: (page) => {
console.log(page.getAllState());
console.log(page.getState("t_1"));
return (page.getState("key") === "t_1")
},
resolvePage: (pg) => {
@ -76,7 +75,55 @@ module.exports = {
createEmbed("default", context, { description: "this is a dynamic sub page " + Math.random()})
].map((p)=>page(p));
}
}
},
conditional_button_2: {
// Button Label
label: "Conditional",
// Next to pagination or new row
inline: false,
visible: true,
resolvePage: (pg) => {throw "a"}
},
conditional_button_3: {
// Button Label
label: "Conditional",
// Next to pagination or new row
inline: false,
visible: true,
resolvePage: (pg) => {throw "a"}
},
conditional_button_4: {
// Button Label
label: "Conditional",
// Next to pagination or new row
inline: false,
visible: true,
resolvePage: (pg) => {throw "a"}
},
conditional_button_5: {
// Button Label
label: "Conditional",
// Next to pagination or new row
inline: false,
visible: true,
resolvePage: (pg) => {throw "a"}
},
conditional_button_6: {
// Button Label
label: "Conditional",
// Next to pagination or new row
inline: false,
visible: true,
resolvePage: (pg) => {throw "a"}
},
conditional_button_7: {
// Button Label
label: "Conditional",
// Next to pagination or new row
inline: false,
visible: true,
resolvePage: (pg) => {throw "a"}
},
}
})
}catch(e){

27
commands/message/search/anime.js
View file

@ -1,13 +1,15 @@
const { anime } = require('#api');
const { paginator } = require('#client');
const { PERMISSION_GROUPS, OMNI_ANIME_FORMAT_TYPES } = require('#constants');
const { PERMISSION_GROUPS, OMNI_ANIME_FORMAT_TYPES, COLORS, COLORS_HEX} = require('#constants');
const { createEmbed, formatPaginationEmbeds, page, hexToEmbedColor } = require('#utils/embed');
const { hexToDecimalColor } = require("#utils/color");
const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed');
const { acknowledge } = require('#utils/interactions');
const { smallPill, link, pill, stringwrap, stringwrapPreserveWords} = require('#utils/markdown');
const { editOrReply } = require('#utils/message');
const DynamicCardStack = require("../../../labscore/cardstack/DynamicCardStack");
const {STATIC_ASSETS} = require("#utils/statics");
function renderAnimeResultsPage(context, res){
let result = createEmbed("default", context, {
@ -39,7 +41,7 @@ function renderAnimeResultsPage(context, res){
if(res.image) result.image = { url: res.image };
// Render Color
if(res.color) result.color = hexToEmbedColor(res.color);
if(res.color) result.color = hexToDecimalColor(res.color);
// Render Episode Metadata
if(res.episodes) {
@ -60,7 +62,8 @@ function renderAnimeResultsPage(context, res){
return page(result, {}, {
episodes_key: res.supplemental.episodes,
name: res.title
name: res.title,
color: hexToDecimalColor(res.color || COLORS_HEX.embed)
});
}
@ -111,10 +114,11 @@ module.exports = {
},
renderLoadingState: (pg) => {
return createEmbed("default", context, {
description: `-# ${pg.getState("name")} > **Episodes**`,
description: `-# ${pg.getState("name")} › **Episodes**`,
image: {
url: `https://bignutty.gitlab.io/webstorage4/v2/assets/loading/04_chat_loading.1zn1ocfb72tc.gif`
}
url: STATIC_ASSETS.card_skeleton
},
color: pg.getState("color")
})
},
// Will resolve all conditions at paginator creation time
@ -130,13 +134,16 @@ module.exports = {
let i = 0;
return [
createEmbed("default", context, {
description: `-# ${pg.getState("name")} > **Episodes**\n\nepisode page ${i++}`,
description: `-# ${pg.getState("name")} › **Episodes**\n\nepisode page ${i++}`,
color: pg.getState("color")
}),
createEmbed("default", context, {
description: `-# ${pg.getState("name")} > **Episodes**\n\nepisode page ${i++}`,
description: `-# ${pg.getState("name")} › **Episodes**\n\nepisode page ${i++}`,
color: pg.getState("color")
}),
createEmbed("default", context, {
description: `-# ${pg.getState("name")} > **Episodes**\n\nepisode page ${i++}`,
description: `-# ${pg.getState("name")} › **Episodes**\n\nepisode page ${i++}`,
color: pg.getState("color")
})
].map((p)=>page(p));
}

5
commands/message/search/maps.js
View file

@ -1,7 +1,8 @@
const { maps, mapsSupplemental } = require('#api');
const { PERMISSION_GROUPS } = require('#constants');
const { createEmbed, hexToEmbedColor } = require('#utils/embed');
const { hexToDecimalColor } = require("#utils/color");
const { createEmbed } = require('#utils/embed');
const { acknowledge } = require('#utils/interactions');
const { link, icon, iconAsEmojiObject, citation, stringwrap } = require('#utils/markdown');
const { editOrReply } = require('#utils/message')
@ -18,7 +19,7 @@ function renderPlaceCard(context, place) {
},
description: `${place.address.full}`,
url: place.url,
color: hexToEmbedColor(place.style.color)
color: hexToDecimalColor(place.style.color)
})]
if (place.display_type) {

5
commands/message/search/movie.js
View file

@ -2,7 +2,8 @@ const { movie } = require('#api');
const { paginator } = require('#client');
const { PERMISSION_GROUPS, OMNI_ANIME_FORMAT_TYPES, OMNI_MOVIE_TYPES } = require('#constants');
const { createEmbed, formatPaginationEmbeds, page, hexToEmbedColor } = require('#utils/embed');
const { hexToDecimalColor } = require("#utils/color");
const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed');
const { acknowledge } = require('#utils/interactions');
const { smallPill, pill } = require('#utils/markdown');
const { editOrReply } = require('#utils/message');
@ -28,7 +29,7 @@ function renderMovieResultsPage(context, res){
if(res.image) result.image = { url: res.image };
// Render Color
if(res.color) result.color = hexToEmbedColor(res.color);
if(res.color) result.color = hexToDecimalColor(res.color);
return page(result);
}

96
labscore/cardstack/DynamicCardStack.js
View file

@ -5,6 +5,7 @@ const { MessageComponentTypes, InteractionCallbackTypes } = require("detritus-cl
const { Message } = require("detritus-client/lib/structures");
const { ComponentContext, Components, ComponentActionRow} = require("detritus-client/lib/utils");
const {createEmbed, page} = require("#utils/embed");
const {STATIC_ASSETS} = require("#utils/statics");
const activeStacks = new Map();
@ -19,6 +20,10 @@ const SUBCATEGORY_STATE_TYPES = Object.freeze({
MULTI_PAGE: 2,
});
const STACK_CACHE_KEYS = Object.freeze({
RESULT_CARDS: 0
})
/**
* DynamicCardStack represents an interactive stacks
* of cards (embeds) for the user to paginate through
@ -35,6 +40,7 @@ class DynamicCardStack {
* @param {Number} options.startingIndex Starting card index
* @param {boolean} options.loop Wrap paging
* @param {number} options.expires CardStack timeout
* @param {boolean} options.disableStackCache Allows disabling the stack result cache, meaning that every trigger will reevaluate a stack
*/
constructor(context, options){
this.context = context;
@ -49,10 +55,14 @@ class DynamicCardStack {
this.uniqueId = (Date.now()*Math.random()).toString(36);
this.stackCache = {};
this.pageState = [];
this.subcategoryState = SUBCATEGORY_STATE_TYPES.SINGLE_PAGE;
this.currentSelectedSubcategory = null;
this.lastInteraction = Date.now();
this.spawned = 0;
console.log("now spawning " + this.uniqueId)
this._spawn();
}
@ -64,6 +74,7 @@ class DynamicCardStack {
console.log("killing " + this.uniqueId)
clearTimeout(this.timeout);
this.listener.clear();
if(clearComponents) await this._edit(this.currentPage(), [])
// Remove reference to free the cardstack for GC
@ -89,6 +100,23 @@ class DynamicCardStack {
activeStacks.set(this.context.message?.id, this);
}
_createTimeout(){
return setTimeout(()=>{
/*
// This currently isn't doable with our Components listener.
if(this.spawned - this.lastInteraction <= this.expires){
clearTimeout(this.timeout)
this.spawned = Date.now();
// New expiry time is 30 seconds
this.expires = 30*1000;
this.timeout = this._createTimeout();
} else {
this.kill(true);
}*/
this.kill(true);
}, this.expires)
}
/**
* Creates a new cardstack in the given channel
*/
@ -116,10 +144,9 @@ class DynamicCardStack {
}
})
this.timeout = setTimeout(()=>{
console.log(this.uniqueId + " timed out.")
this.kill(true);
}, this.expires)
this.timeout = this._createTimeout()
this.spawned = Date.now()
return this._edit({
...this.getCurrentCard(),
@ -221,7 +248,7 @@ class DynamicCardStack {
*/
_renderComponents(disabled = false){
let nComponents = new ComponentActionRow({})
let nComponentsSecondary = new ComponentActionRow({})
let nComponentsSecondary = [new ComponentActionRow({})]
// First Row always starts with built-in components
for(const b of this.buttons){
@ -251,7 +278,7 @@ class DynamicCardStack {
disabled: disabled
}
if(button.condition && typeof(button.condition) == "function") component.disabled = !button.condition(this);
if(!disabled && button.condition && typeof(button.condition) == "function") component.disabled = !button.condition(this);
if(button.label){
if(typeof(button.label) === "function") component.label = button.label(this);
@ -263,19 +290,43 @@ class DynamicCardStack {
if(this.currentSelectedSubcategory === b) component.style = 1;
if(button.inline) nComponents.addButton(component);
else nComponentsSecondary.addButton(component);
else {
if(nComponentsSecondary[nComponentsSecondary.length - 1].components.length >= 5){
nComponentsSecondary.push(new ComponentActionRow({}))
}
nComponentsSecondary[nComponentsSecondary.length - 1].addButton(component);
}
}
if(nComponentsSecondary.components.length >= 1) return [nComponents, nComponentsSecondary]
if(nComponentsSecondary[0].components.length >= 1) return [nComponents, ...nComponentsSecondary]
return [nComponents];
}
_setCachedValue(index, componentId, key, value){
if(!this.stackCache[index]) this.stackCache[index] = {};
if(!this.stackCache[index][componentId]) this.stackCache[index][componentId] = {};
this.stackCache[index][componentId][key] = value;
}
_getCachedValue(index, componentId, key){
if(!this.stackCache[index]) return null;
if(!this.stackCache[index][componentId]) return null;
if(!this.stackCache[index][componentId][key]) return null;
return this.stackCache[index][componentId][key];
}
/**
* Handles an interaction from the attached components
* @param {ComponentContext} ctx
*/
async _handleInteraction(ctx){
if(ctx.user.id !== this.context.user.id) return ctx.respond({
type: InteractionCallbackTypes.DEFERRED_UPDATE_MESSAGE
})
this.lastInteraction = Date.now();
// should be a built-in button
if(["next","previous"].includes(ctx.data.customId)){
console.log("triggering button")
@ -311,10 +362,24 @@ class DynamicCardStack {
}
else this.currentSelectedSubcategory = ctx.data.customId;
this.cachedIndex = this.index;
console.log("new category is " + this.currentSelectedSubcategory)
// TODO: allow overriding index
this.index = 0;
try{
if(this._getCachedValue(this.rootIndex, ctx.data.customId, STACK_CACHE_KEYS.RESULT_CARDS) !== null){
this.activeCardStack = [...this._getCachedValue(this.rootIndex, ctx.data.customId, STACK_CACHE_KEYS.RESULT_CARDS)];
await ctx.respond({
type: InteractionCallbackTypes.UPDATE_MESSAGE,
data: Object.assign(this.currentPage(), {components:this._renderComponents(false)})
})
return;
} else {
let processingEmbed = page(createEmbed("default", ctx, {
"description": "looading..."
image: {
url: STATIC_ASSETS.card_skeleton
}
}))
if(this.interactive_components[ctx.data.customId].renderLoadingState) processingEmbed = page(this.interactive_components[ctx.data.customId].renderLoadingState(this));
@ -323,9 +388,12 @@ class DynamicCardStack {
data: Object.assign(processingEmbed, { components: this._renderComponents(true)})
})
try{
// TODO: cache resolved stacks
this.activeCardStack = await this.interactive_components[ctx.data.customId].resolvePage(this);
if(!this.interactive_components[ctx.data.customId].disableCache){
this._setCachedValue(this.rootIndex, ctx.data.customId, STACK_CACHE_KEYS.RESULT_CARDS, [...this.activeCardStack]);
}
}
} catch(e){
this.activeCardStack = [
page(createEmbed("error", ctx, "Stack rendering failed."))
@ -333,11 +401,9 @@ class DynamicCardStack {
console.log("resolve failed:")
console.log(e)
}
// TODO: allow overriding index
this.index = 0;
setTimeout(()=>{
return this._edit(Object.assign(this.currentPage(), {components:this.listener}))
return this._edit(Object.assign(this.currentPage(), {components:this._renderComponents()}))
}, 1500)
return;

11
labscore/constants.js
View file

@ -1,4 +1,5 @@
const { Permissions } = require("detritus-client/lib/constants")
const { decimalToHexColor } = require("#utils/color");
module.exports.DISCORD_INVITES = Object.freeze({
support: "https://discord.gg/8c4p6xcjru",
@ -40,6 +41,16 @@ module.exports.COLORS = Object.freeze({
incognito: 10057726,
})
module.exports.COLORS_HEX = Object.freeze({
error: decimalToHexColor(module.exports.COLORS.error),
success: decimalToHexColor(module.exports.COLORS.success),
warning: decimalToHexColor(module.exports.COLORS.warning),
embed: decimalToHexColor(module.exports.COLORS.embed),
brand: decimalToHexColor(module.exports.COLORS.brand),
nsfw: decimalToHexColor(module.exports.COLORS.nsfw),
incognito: decimalToHexColor(module.exports.COLORS.incognito),
})
// Permission requirements that apply to commands
module.exports.PERMISSION_GROUPS = Object.freeze({
// Baseline permission set for regular commands

7
labscore/utils/color.js Normal file
View file

@ -0,0 +1,7 @@
module.exports.hexToDecimalColor = (color)=>{
return parseInt(color.split("#")[1], 16)
}
module.exports.decimalToHexColor = (color)=>{
return "#" + color.toString(16);
}

4
labscore/utils/embed.js
View file

@ -186,7 +186,3 @@ module.exports.page = function(embed, message = {}, metadata = {}){
_meta: metadata,
})
}
module.exports.hexToEmbedColor = (color)=>{
return parseInt(color.split("#")[1], 16)
}

5
labscore/utils/statics.js
View file

@ -10,6 +10,10 @@ const Statics = Object.freeze({
}
},
assets: {
card_skeleton: {
file: "loading/04_chat_loading.1zn1ocfb72tc.gif",
revision: 0
},
chat_loading: {
file: "loading/05_chat_loading.7y2ji893rho0.gif",
revision: 0
@ -291,6 +295,7 @@ module.exports.STATIC_ICONS = Object.freeze({
})
module.exports.STATIC_ASSETS = Object.freeze({
card_skeleton: staticAsset(Statics.assets.card_skeleton),
chat_loading: staticAsset(Statics.assets.chat_loading),
chat_loading_small: staticAsset(Statics.assets.chat_loading_small),
image_loading: staticAsset(Statics.assets.image_loading),