From 7bce1bb140a050da4428efcd64dc147456761b23 Mon Sep 17 00:00:00 2001 From: Jason Yoo Date: Mon, 1 Apr 2024 12:24:39 +0900 Subject: [PATCH] =?UTF-8?q?[Fix]=20=EC=9B=94=EB=B3=84=20=ED=86=B5=EA=B3=84?= =?UTF-8?q?=EA=B0=80=20=EC=9E=91=EB=8F=99=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20(#31)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 2 +- src/bot.ts | 16 ++++++++-------- src/database/drivers/GenericDriver.ts | 2 +- src/slack/Wbc.ts | 6 +++--- theme/fun.js | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index 41de42d..e58caf9 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -120,7 +120,7 @@ Route.add({ */ Route.add({ method: 'GET', - path: `${apiPath}scoreboard/{listType}/{scoreTypeInput}/{month}/{year}`, + path: `${apiPath}monthlyScoreboard/{listType}/{scoreTypeInput}/{month}/{year}`, handler: async (request: any, res: any) => { try { const { listType, scoreTypeInput, month, year } = request.params; diff --git a/src/bot.ts b/src/bot.ts index f38ad95..61b3ba7 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -5,7 +5,7 @@ import { parseMessage, parseReactedMessage } from './lib/parseMessage'; import { validBotMention, validMessage, validReaction } from './lib/validator'; import Rtm from './slack/Rtm'; import Wbc from './slack/Wbc'; -import log from 'bog' +import log from 'bog'; const { enableDecrement, dailyCap, dailyDecCap, emojiInc, emojiDec, disableEmojiDec } = config.slack; @@ -19,7 +19,7 @@ interface Updates { type: string; } const emojis: Array = []; -const dashBoardUrl = 'http://ec2-43-201-180-152.ap-northeast-2.compute.amazonaws.com:3333/' +const dashBoardUrl = 'http://ec2-43-201-180-152.ap-northeast-2.compute.amazonaws.com:3333/'; const incEmojis = emojiInc.split(',').map((emoji) => emoji.trim()); incEmojis.forEach((emoji: string) => emojis.push({ type: 'inc', emoji })); @@ -50,7 +50,7 @@ const notifyUser = (user: string, message: string, messageBlock?: Object[]) => { }; const handleBurritos = async (giver: string, channel: string, duckedMessage: string, duckedMessageLink: string, updates: Updates[]) => { - log.info(updates) + log.info(updates); if (!enableDecrement) { const burritos = await BurritoStore.givenBurritosToday(giver, 'from'); const diff = dailyCap - burritos; @@ -92,8 +92,8 @@ const handleBurritos = async (giver: string, channel: string, duckedMessage: str const leftOverDucks = dailyCap - givenDucks; const receivers = [...new Set(updates.map((it) => it.username))]; const eachGivenDucks = Math.ceil(updates.length / receivers.length); - const firstLineContent = duckedMessage.split('\n')[0] ?? "" - const trailingDots = duckedMessage.split('\n').length > 1 ? "..." : "" + const firstLineContent = duckedMessage.split('\n')[0] ?? ''; + const trailingDots = duckedMessage.split('\n').length > 1 ? '...' : ''; notifyUser( giver, `${receivers @@ -145,7 +145,7 @@ const start = () => { if (result) { const { giver, updates } = result; if (updates.length) { - const messageLink = await Wbc.fetchMessageLink(event.channel, event.event_ts) + const messageLink = await Wbc.fetchMessageLink(event.channel, event.event_ts); await handleBurritos(giver, event.channel, event.text, messageLink, updates); } } @@ -157,10 +157,10 @@ const start = () => { if (validReaction(event, emojis)) { const channelId = event.item.channel; const originalContent = await Wbc.fetchReactedMessage(channelId, event.item.ts); - const messageLink = await Wbc.fetchMessageLink(channelId, event.item.ts) + const messageLink = await Wbc.fetchMessageLink(channelId, event.item.ts); const { updates } = parseReactedMessage(event, originalContent, emojis); if (updates.length) { - await handleBurritos(event.user, channelId, originalContent.text, messageLink,updates); + await handleBurritos(event.user, channelId, originalContent.text, messageLink, updates); } } }); diff --git a/src/database/drivers/GenericDriver.ts b/src/database/drivers/GenericDriver.ts index 35bb168..8c836d7 100644 --- a/src/database/drivers/GenericDriver.ts +++ b/src/database/drivers/GenericDriver.ts @@ -123,7 +123,7 @@ class GenericDriver extends Store implements Driver { } const selected = data .filter((item: any) => { - if (item.given_at.getMonth() === month && item.given_at.getFullYear() === year) { + if (item.given_at.getMonth() + 1 == month && item.given_at.getFullYear() == year) { if (user) { if (item[listType] === user) return item; } else { diff --git a/src/slack/Wbc.ts b/src/slack/Wbc.ts index 2409671..6ad781c 100644 --- a/src/slack/Wbc.ts +++ b/src/slack/Wbc.ts @@ -90,20 +90,20 @@ class Wbc { limit: 1, }); - log.info(res.messages[0]) + log.info(res.messages[0]); return res.messages[0]; } async fetchMessageLink(channelId: string, ts: number) { log.info('Fetching messageLink'); - log.info(`channelid ${channelId} ts ${ts}`) + log.info(`channelid ${channelId} ts ${ts}`); const res = await this.wbc.chat.getPermalink({ channel: channelId, message_ts: ts, }); - return res.permalink + return res.permalink; } } diff --git a/theme/fun.js b/theme/fun.js index cc12cff..3fd3cbc 100644 --- a/theme/fun.js +++ b/theme/fun.js @@ -45,8 +45,8 @@ const renderMonthPicker = () => { const year = date.getFullYear(); console.log({ month, year }); fetcher('monthlyScore', { listType, scoreType, month, year }).then((response) => { - console.log(response); store = response; + sortUsers(); render(); }); }, @@ -85,7 +85,7 @@ async function fetcher(type, { username, listType, scoreType, month, year }) { return json; } case 'monthlyScore': { - const res = await fetch(`/api/scoreboard/${listType}/${scoreType}/${month}/${year}`); + const res = await fetch(`/api/monthlyScoreboard/${listType}/${scoreType}/${month}/${year}`); const json = await res.json(); return json.data; }