Skip to content

Commit 2fb91b7

Browse files
committed
Fixed weekly reports printing incorrectly
Fixed XP showing incorrectly Fixed menu bug
1 parent 24c65d2 commit 2fb91b7

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

modules/XPHelper.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,14 @@ exports.calcXPFromLevel = level => Math.floor(-2550*(1 - Math.pow(1.02, level)))
6060
* @param {number} xp - total XP
6161
* @returns {number} - XP required to level up
6262
*/
63-
exports.calcLevelFromXP = xp => Math.floor(Math.log(1/2550*xp + 1) / Math.log(1.02));
63+
exports.calcLevelFromXP = xp => {
64+
let currentXP = 0;
65+
let lastXP = 0;
66+
let i = 0;
67+
for (; currentXP < xp; i++) {
68+
const levelXP = exports.calcXPFromLevel(i);
69+
currentXP += levelXP - lastXP;
70+
lastXP = levelXP;
71+
}
72+
return i - 2;
73+
}

modules/menuHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ const createRow = (currentPage, length) => {
285285
}
286286

287287
const createDropDownBox = actions => {
288-
const actionList = actions.map(a => a.name).join("/");
288+
const actionList = actions.map(a => a.name).join("/").slice(0,100);
289289
return new MessageActionRow().addComponents(
290290
new MessageSelectMenu().setCustomId("actions").setPlaceholder(actionList).addOptions(
291291
actions.map(

modules/weeklyReviewRenderer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ const {getDaysBetweenDates} = require("./dateHelper");
1717
* @param tasks - tasks to display
1818
*/
1919

20-
exports.displayReview = async (user, channel, tasks) => {
20+
exports.displayReview = async (user, interaction, tasks) => {
2121
const reviewImage = new MessageAttachment(await getWeeklyReview(user, tasks), `${user.name}_review.png`);
2222

23-
return channel.send({content: `<@${user.discordid}> your weekly report has been published`, files: [reviewImage]});
23+
return interaction.editReply({content: `<@${user.discordid}> your weekly report has been published`, files: [reviewImage]});
2424
};
2525

2626
/**
@@ -58,7 +58,7 @@ const getWeeklyReview = async (user, tasks) => {
5858
* @param canvas
5959
* @return {Promise<void>}
6060
*/
61-
const drawHeaderFooter = async(canvas, user) => {
61+
const drawHeaderFooter = async (canvas, user) => {
6262
const context = canvas.getContext("2d");
6363
context.font = "30px \"Akira\"";
6464

slash/skilltree/weekly.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ exports.run = async (client, interaction) => {
2121
user.username = discorduser.username;
2222
const tasks = await getRecentTasks(userID, 7);
2323
//Display weekly analytics
24-
displayReview(user, interaction.channel, tasks);
24+
displayReview(user, interaction, tasks);
2525
};
2626

2727
exports.conf = {

0 commit comments

Comments
 (0)