Merge pull request #32 from project-yuigahama/next

v1.0.6-pre

.gitignore

@@ -62,10 +62,9 @@ typings/
 
 # Provider
 src/bwd/provider/
+
+# Visual Studio IDE
 .vs/
 
 # JetBrains IDE
 .idea/
-
-# Firebase
-resources/serviceAccount.json

README.md

@@ -36,3 +36,7 @@ npm run start
 * [cross-env](https://github.com/kentcdodds/cross-env)
 * [firebase-admin](https://github.com/firebase/firebase-admin-node)
 * [fs-nextra](https://github.com/bdistin/fs-nextra)
+* [nsfwjs](https://github.com/infinitered/nsfwjs)
+* [cross-env](https://github.com/kentcdodds/cross-env)
+* [canvas](https://github.com/Automattic/node-canvas)
+* [@tensorflow/tfjs-node](https://github.com/tensorflow/tfjs-node)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuigahama",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Powerful multifunction discord bot",
   "main": "src/Yui.js",
   "scripts": {
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/InkoHX/Yui#readme",
   "dependencies": {
-    "@tensorflow/tfjs-node": "^1.1.2",
+    "@tensorflow/tfjs-node": "^1.2.1",
     "canvas": "^2.5.0",
     "cross-env": "^5.2.0",
     "dblapi.js": "^2.3.0",

src/Yui.js

@@ -56,7 +56,6 @@ const client = new Client({
 if ('DBL_TOKEN' in process.env) {
   const DBL = new DBLAPI(process.env.DBL_TOKEN, client)
   DBL.on('error', error => client.emit('DblError', error))
-  DBL.on('posted', () => client.emit('DblPosted'))
 }
 
 client.login()

src/commands/Game/ETS2/truckers-mp.js

@@ -0,0 +1,35 @@
+const { Command, KlasaMessage, RichDisplay } = require('klasa')
+const { MessageEmbed } = require('discord.js')
+const fetch = require('node-fetch')
+
+class TruckersMP extends Command {
+  constructor (...args) {
+    super(...args, {
+      enabled: true,
+      requiredPermissions: ['MANAGE_MESSAGES'],
+      description: language => language.get('COMMAND_TRUCKERS_MP_DESCRIPTION')
+    })
+  }
+
+  /**
+   * @param {KlasaMessage} message
+   */
+  async run (message) {
+    const data = await fetch('https://stats.truckersmp.com/api/v4/overall.json').then(res => res.json()).catch(() => null)
+    if (data === null) throw new Error('Request failed.')
+    if (data.error === true) return message.sendMessage('Error.')
+    const Display = new RichDisplay()
+
+    for (let index = 0; index < data.color.length; index++) {
+      const color = data.color[index]
+      const embed = new MessageEmbed().setColor(color)
+      const server = data.data[index]
+      embed.setTitle(server.name).addField('Players', server.players, true).addField('Max Players', server.max_players, true)
+      Display.addPage(embed)
+    }
+
+    return Display.run(message)
+  }
+}
+
+module.exports = TruckersMP

src/commands/Guild/Information/emoji-info.js

@@ -0,0 +1,33 @@
+const { Command, KlasaMessage } = require('klasa')
+const { MessageEmbed, GuildEmoji } = require('discord.js')
+
+module.exports = class extends Command {
+  constructor (...args) {
+    super(...args, {
+      runIn: ['text'],
+      description: language => language.get('COMMAND_EMOJI_INFO_DESCRIPTION'),
+      usage: '<emoji:emoji>'
+    })
+  }
+
+  /**
+   * @param {KlasaMessage} message
+   * @param {[GuildEmoji]} usage
+   */
+  async run (message, [emoji]) {
+    const Embed = new MessageEmbed()
+      .setColor('RANDOM')
+      .setThumbnail(emoji.url)
+      .addField('Emoji name', emoji.name, true)
+      .addField('ID', emoji.id, true)
+      .addField('Animated', emoji.animated ? 'Yes' : 'No', true)
+      .addField('Deleted', emoji.deleted ? 'Yes' : 'No', true)
+      .setFooter('Created At')
+      .setTimestamp(emoji.createdTimestamp)
+
+    const author = await emoji.fetchAuthor().catch(() => null)
+
+    if (author === null) return message.sendEmbed(Embed)
+    else return message.sendEmbed(Embed.setAuthor(`${author.tag} has added.`, author.avatarURL({ format: 'png' })))
+  }
+}

src/commands/Guild/Information/guildinfo.js

@@ -51,6 +51,8 @@ class GuideInfo extends Command {
       .setFooter('Created At')
       .addField('Guild ID', message.guild.id, true)
       .addField('Owner', message.guild.owner !== null ? message.guild.owner.user.tag : 'None', true)
+      .addField('Server Boost Level', `Lv.${message.guild.premiumTier}`, true)
+      .addField('Boosters', message.guild.premiumSubscriptionCount || 0, true)
       .addField('Members', memberCount, true)
       .addField('Channels', Channels, true)
       .addField('Emojis', Emojis, true)

src/commands/Guild/Information/topinvite.js

@@ -1,4 +1,4 @@
-const { Command, KlasaMessage, RichDisplay } = require('klasa')
+const { Command, KlasaMessage, RichDisplay, Timestamp } = require('klasa')
 const { MessageEmbed } = require('discord.js')
 
 class TopInvite extends Command {
@@ -15,33 +15,25 @@ class TopInvite extends Command {
    */
   async run (message) {
     const invites = await message.guild.fetchInvites()
-    const inviters = []
-
-    if (invites.size === 0) return message.sendMessage(message.language.get('COMMAND_TOP_INVITE_NOT_FOUND'))
-    invites.map((invite) => {
-      inviters.push({ inviter: invite.inviter ? invite.inviter : null, url: invite.url, uses: invite.uses, createdAt: invite.createdAt })
-    })
-
-    inviters.sort((a, b) => {
-      return a.uses < b.uses
-    })
+    const top = invites.filter(invite => invite.uses > 0).sort((a, b) => b.uses - a.uses).first(10)
+    if (top.length === 0) throw message.language.get('COMMAND_TOP_INVITE_FAIL')
 
     const Display = new RichDisplay()
     let count = 0
 
-    inviters.forEach((value) => {
+    top.map((invite) => {
       count++
       Display.addPage(new MessageEmbed()
         .setColor('RANDOM')
-        .setThumbnail(value.inviter.avatarURL({ format: 'png' }) || 'https://discordapp.com/assets/dd4dbc0016779df1378e7812eabaa04d.png')
-        .setTitle(`${value.inviter !== null ? value.inviter.tag : 'Unknown'} - Top ${count}`)
-        .addField('URL', value.url, true)
-        .addField('Uses', value.uses, true)
-        .setTimestamp(value.createdAt)
+        .setTitle(`Top ${count}`)
+        .addField('Uses', invite.uses, true)
+        .addField('Code', invite.code, true)
+        .addField('Author', invite.inviter !== null ? invite.inviter.tag : 'Deleted', true)
+        .addField('Created At', new Timestamp('YYYY-MM-DD HH:mm:ss').display(invite.createdTimestamp), true)
       )
     })
 
-    return Display.run(await message.send('Loading...'))
+    return Display.run(message)
   }
 }
 

src/languages/en-US.js

@@ -60,7 +60,7 @@ module.exports = class extends Language {
       COMMAND_MOJANG_STATUS: 'Display the status of various Mojang services.',
       COMMAND_MDN_DESCRIPTION: 'You can search MDN Web docs.',
       COMMAND_TOP_INVITE_DESCRIPTION: 'Display the invitation ranking.',
-      COMMAND_TOP_INVITE_NOT_FOUND: 'There is no invitation link.',
+      COMMAND_TOP_INVITE_FAIL: 'There are no invites, or none of them have been used!',
       IMAGE_FILTER_DELETE_MESSAGE: 'Please do not send NSFW images to SFW channels.',
       COMMAND_IMAGE_FILTER_DESCRIPTION: 'Powerful image filter.',
       COMMAND_IMAGE_FILTER_EXTENDED_HELP: [
@@ -82,7 +82,9 @@ module.exports = class extends Language {
       COMMAND_APPROVAL_DISABLED: 'The approval has been discarded.',
       COMMAND_APPROVAL_FAIL: 'It is not a server or YuigahamaBot has not been introduced.',
       COMMAND_APPROVAL_ENABLED_RLREADY: 'This server has already been approved.',
-      COMMAND_APPROVAL_DISABLED_RLREADY: 'This server has not been approved.'
+      COMMAND_APPROVAL_DISABLED_RLREADY: 'This server has not been approved.',
+      COMMAND_TRUCKERS_MP_DESCRIPTION: 'Display the TruckersMP status.',
+      COMMAND_EMOJI_INFO_DESCRIPTION: 'Display detailed information of emoji.'
     }
   }
 

src/languages/ja-JP.js

@@ -230,7 +230,7 @@ module.exports = class extends Language {
       COMMAND_MOJANG_STATUS: 'さまざまなMojangサービスの状態を表示します。',
       COMMAND_MDN_DESCRIPTION: 'MDN Web docs を検索することができます。',
       COMMAND_TOP_INVITE_DESCRIPTION: '招待回数ランキングを表示します。',
-      COMMAND_TOP_INVITE_NOT_FOUND: '招待リンクが一つもありません。',
+      COMMAND_TOP_INVITE_FAIL: '招待リンクが一つもないか、存在するが一度も使われていません。',
       IMAGE_FILTER_DELETE_MESSAGE: 'NSFWチャンネルでないSFWチャンネルにNSFW画像を送信しないでください。',
       COMMAND_IMAGE_FILTER_DESCRIPTION: '強力な画像フィルター、ポルノ画像や卑猥な画像を削除します。',
       COMMAND_IMAGE_FILTER_EXTENDED_HELP: [
@@ -252,7 +252,9 @@ module.exports = class extends Language {
       COMMAND_APPROVAL_DISABLED: '承認を破棄しました。',
       COMMAND_APPROVAL_FAIL: (id) => `${id}はサーバーでないもしくは${this.client.user.tag}を導入していません。`,
       COMMAND_APPROVAL_ENABLED_RLREADY: '既に認証しています。',
-      COMMAND_APPROVAL_DISABLED_RLREADY: 'このサーバーは認証されていません。'
+      COMMAND_APPROVAL_DISABLED_RLREADY: 'このサーバーは認証されていません。',
+      COMMAND_TRUCKERS_MP_DESCRIPTION: 'TruckersMPのサーバー情報を表示します。',
+      COMMAND_EMOJI_INFO_DESCRIPTION: '絵文字の詳細情報を表示します。'
     }
   }
 

test/Utils.test.js

@@ -11,7 +11,7 @@ describe('Utils', () => {
   })
 
   describe('resolveModTypeColor', () => {
-    it('Return integer', () => {
+    it('Return number', () => {
       assert.strictEqual(typeof utils.resolveModTypeColor('KICK'), 'number')
       assert.strictEqual(typeof utils.resolveModTypeColor('BAN'), 'number')
       assert.strictEqual(typeof utils.resolveModTypeColor('UNKNOWN'), 'number')
@@ -25,4 +25,32 @@ describe('Utils', () => {
       assert.strictEqual(utils.resolveModTypeColor('???'), 0x000000)
     })
   })
+
+  describe('getFilterLevel', () => {
+    it('Return number', () => {
+      assert.strictEqual(typeof utils.getFilterLevel(1), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(2), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(3), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(4), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(5), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(6), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(7), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(8), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(9), 'number')
+      assert.strictEqual(typeof utils.getFilterLevel(0), 'number')
+    })
+
+    it('Return correct value', () => {
+      assert.strictEqual(utils.getFilterLevel(1), 0.9)
+      assert.strictEqual(utils.getFilterLevel(2), 0.8)
+      assert.strictEqual(utils.getFilterLevel(3), 0.7)
+      assert.strictEqual(utils.getFilterLevel(4), 0.6)
+      assert.strictEqual(utils.getFilterLevel(5), 0.5)
+      assert.strictEqual(utils.getFilterLevel(6), 0.4)
+      assert.strictEqual(utils.getFilterLevel(7), 0.3)
+      assert.strictEqual(utils.getFilterLevel(8), 0.2)
+      assert.strictEqual(utils.getFilterLevel(9), 0.1)
+      assert.strictEqual(utils.getFilterLevel(0), 0.6)
+    })
+  })
 })