diff --git a/commands/other/remind.js b/commands/other/remind.js index e1c4763c..5e1512a5 100644 --- a/commands/other/remind.js +++ b/commands/other/remind.js @@ -1,5 +1,6 @@ const Command = require('../../structures/Command'); const moment = require('moment'); +const { shorten } = require('../../util/Util'); module.exports = class RemindCommand extends Command { constructor(client) { @@ -24,7 +25,7 @@ module.exports = class RemindCommand extends Command { if (exists) return msg.reply('Only one reminder can be set per channel per user.'); const timeMs = time.startDate.getTime() - Date.now(); const display = moment().add(timeMs, 'ms').fromNow(); - const title = time.eventTitle || 'something'; + const title = time.eventTitle ? shorten(time.eventTitle, 500) : 'something'; await this.client.timers.setTimer(msg.channel.id, timeMs, msg.author.id, title); return msg.say(`🕰️ Okay, I will remind you **"${title}"** ${display}.`); } diff --git a/package.json b/package.json index ae585968..92b69cdd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "119.44.1", + "version": "119.44.2", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { diff --git a/structures/timer/TimerManager.js b/structures/timer/TimerManager.js index 1904099d..b56c329e 100644 --- a/structures/timer/TimerManager.js +++ b/structures/timer/TimerManager.js @@ -1,12 +1,10 @@ -const Redis = require('../Redis'); - module.exports = class TimerManager { constructor(client) { Object.defineProperty(this, 'client', { value: client }); } async fetchAll() { - const timers = await Redis.db.hgetall('timer'); + const timers = await this.client.redis.hgetall('timer'); for (let data of Object.values(timers)) { data = JSON.parse(data); await this.setTimer(data.channelID, new Date(data.time) - new Date(), data.userID, data.title, false); @@ -21,14 +19,14 @@ module.exports = class TimerManager { const channel = await this.client.channels.fetch(channelID); await channel.send(`🕰️ <@${userID}>, you wanted me to remind you of: **"${title}"**.`); } finally { - await Redis.db.hdel('timer', `${channelID}-${userID}`); + await this.client.redis.hdel('timer', `${channelID}-${userID}`); } }, time); - if (updateRedis) await Redis.db.hset('timer', { [`${channelID}-${userID}`]: JSON.stringify(data) }); + if (updateRedis) await this.client.redis.hset('timer', { [`${channelID}-${userID}`]: JSON.stringify(data) }); return timeout; } exists(channelID, userID) { - return Redis.db.hexists('timer', `${channelID}-${userID}`); + return this.client.redis.hexists('timer', `${channelID}-${userID}`); } };