Format Upvotes like real reddit in subreddit commands

This commit is contained in:
Dragon Fire
2020-06-08 16:07:03 -04:00
parent c6365bb4a5
commit 7ff1de7539
8 changed files with 23 additions and 23 deletions
+8 -12
View File
@@ -3,7 +3,7 @@ const { createCanvas, loadImage, registerFont } = require('canvas');
const moment = require('moment');
const request = require('node-superfetch');
const path = require('path');
const { base64 } = require('../../util/Util');
const { base64, formatNumberK } = require('../../util/Util');
const { wrapText } = require('../../util/Canvas');
const { TWITTER_KEY, TWITTER_SECRET } = process.env;
registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Noto-Regular.ttf'), { family: 'Noto' });
@@ -108,21 +108,21 @@ module.exports = class TweetCommand extends Command {
ctx.fillText('Twitter for Xiao', 31 + timeLen + 6, base2StartY + 16);
ctx.fillStyle = '#8899a6';
ctx.font = '16px Noto';
ctx.fillText(this.formatNumber(replies), 87, base2StartY + 139);
ctx.fillText(this.formatNumber(likes), 509, base2StartY + 139);
ctx.fillText(this.formatNumber(retweets), 300, base2StartY + 139);
ctx.fillText(formatNumberK(replies), 87, base2StartY + 139);
ctx.fillText(formatNumberK(likes), 509, base2StartY + 139);
ctx.fillText(formatNumberK(retweets), 300, base2StartY + 139);
ctx.fillStyle = 'white';
ctx.font = 'normal bold 18px Noto';
ctx.fillText(this.formatNumber(retweets), 31, base2StartY + 77);
const retweetsLen = ctx.measureText(this.formatNumber(retweets)).width;
ctx.fillText(formatNumberK(retweets), 31, base2StartY + 77);
const retweetsLen = ctx.measureText(formatNumberK(retweets)).width;
ctx.fillStyle = '#8899a6';
ctx.font = '18px Noto';
ctx.fillText('Retweets', 31 + retweetsLen + 5, base2StartY + 77);
const retweetsWordLen = ctx.measureText('Retweets').width;
ctx.fillStyle = 'white';
ctx.font = 'normal bold 18px Noto';
ctx.fillText(this.formatNumber(likes), 31 + retweetsLen + 5 + retweetsWordLen + 10, base2StartY + 77);
const likesLen = ctx.measureText(this.formatNumber(likes)).width;
ctx.fillText(formatNumberK(likes), 31 + retweetsLen + 5 + retweetsWordLen + 10, base2StartY + 77);
const likesLen = ctx.measureText(formatNumberK(likes)).width;
ctx.fillStyle = '#8899a6';
ctx.font = '18px Noto';
ctx.fillText('Likes', 31 + retweetsLen + 5 + retweetsWordLen + 10 + likesLen + 5, base2StartY + 77);
@@ -172,8 +172,4 @@ module.exports = class TweetCommand extends Command {
};
}
}
formatNumber(number) {
return number > 999 ? `${(number / 1000).toLocaleString(undefined, { maximumFractionDigits: 1 })}K` : number;
}
};
+2 -2
View File
@@ -1,6 +1,6 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { formatNumber } = require('../../util/Util');
const { formatNumberK } = require('../../util/Util');
module.exports = class AwwnimeCommand extends SubredditCommand {
constructor(client) {
@@ -25,6 +25,6 @@ module.exports = class AwwnimeCommand extends SubredditCommand {
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`${formatNumber(post.ups)}`);
.setFooter(`${formatNumberK(post.ups)}`);
}
};
+2 -2
View File
@@ -1,6 +1,6 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { list, formatNumber } = require('../../util/Util');
const { list, formatNumberK } = require('../../util/Util');
const subreddits = require('../../assets/json/hentai');
module.exports = class HentaiCommand extends SubredditCommand {
@@ -43,6 +43,6 @@ module.exports = class HentaiCommand extends SubredditCommand {
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`${formatNumber(post.ups)}`);
.setFooter(`${formatNumberK(post.ups)}`);
}
};
+2 -2
View File
@@ -1,6 +1,6 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { list, formatNumber } = require('../../util/Util');
const { list, formatNumberK } = require('../../util/Util');
const subreddits = require('../../assets/json/meme');
module.exports = class MemeCommand extends SubredditCommand {
@@ -35,6 +35,6 @@ module.exports = class MemeCommand extends SubredditCommand {
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`${formatNumber(post.ups)}`);
.setFooter(`${formatNumberK(post.ups)}`);
}
};
+2 -2
View File
@@ -1,6 +1,6 @@
const SubredditCommand = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { list, formatNumber } = require('../../util/Util');
const { list, formatNumberK } = require('../../util/Util');
const subreddits = require('../../assets/json/porn');
module.exports = class PornCommand extends SubredditCommand {
@@ -44,6 +44,6 @@ module.exports = class PornCommand extends SubredditCommand {
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`${formatNumber(post.ups)}`);
.setFooter(`${formatNumberK(post.ups)}`);
}
};
+2 -2
View File
@@ -1,6 +1,6 @@
const SubredditCommandBase = require('../../structures/commands/Subreddit');
const { MessageEmbed } = require('discord.js');
const { shorten, formatNumber } = require('../../util/Util');
const { shorten, formatNumberK } = require('../../util/Util');
module.exports = class SubredditCommand extends SubredditCommandBase {
constructor(client) {
@@ -32,7 +32,7 @@ module.exports = class SubredditCommand extends SubredditCommandBase {
.setImage(post.post_hint === 'image' ? post.url : null)
.setURL(`https://www.reddit.com${post.permalink}`)
.setTimestamp(post.created_utc * 1000)
.setFooter(`${formatNumber(post.score)}`);
.setFooter(`${formatNumberK(post.score)}`);
if (post.thumbnail && post.thumbnail !== 'self' && post.post_hint !== 'image') {
embed.setThumbnail(post.thumbnail);
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "xiao",
"version": "116.8.0",
"version": "116.8.1",
"description": "Your personal server companion.",
"main": "Xiao.js",
"scripts": {
+4
View File
@@ -72,6 +72,10 @@ module.exports = class Util {
});
}
static formatNumberK(number) {
return number > 999 ? `${(number / 1000).toLocaleString(undefined, { maximumFractionDigits: 1 })}K` : number;
}
static base64(text, mode = 'encode') {
if (mode === 'encode') return Buffer.from(text).toString('base64');
if (mode === 'decode') return Buffer.from(text, 'base64').toString('utf8') || null;