Skip to content

Commit

Permalink
⭐ Switch from eris to discord.js
Browse files Browse the repository at this point in the history
  • Loading branch information
Duelist committed Sep 5, 2019
1 parent 2d9c5cb commit 2ad33f3
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 35 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -21,7 +21,7 @@
"chance": "^1.0.6",
"cli-table": "^0.3.1",
"debug": "^2.2.0",
"eris": "^0.10.1",
"discord.js": "^11.5.1",
"ioredis": "^2.1.0",
"lodash": "^4.17.4",
"module-alias": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/bot/commands/king/index.ts
Expand Up @@ -32,5 +32,5 @@ export default async function king({
await redis.setString({ key: REDIS_KEY, value: author.username })

// Send the response to the channel it was sent from
await message.channel.createMessage(response)
await message.channel.send(response)
}
6 changes: 2 additions & 4 deletions src/bot/commands/metacoins/index.ts
Expand Up @@ -23,15 +23,13 @@ export default async function message({

if (!args || _.isEmpty(args)) {
const coins = await metacoins.getMetacoinsForUser(author.id)
await channel.createMessage(
MESSAGE.METACOIN_COUNT(author.mention, coins.toString()),
)
await channel.send(MESSAGE.METACOIN_COUNT(author.mention, coins.toString()))
return
}

if (args[0] === 'leaderboard') {
const leaderboard = await metacoins.getLeaderboard()
await channel.createMessage(leaderboard.toString())
await channel.send(leaderboard.toString())
return
}
}
2 changes: 1 addition & 1 deletion src/bot/commands/ping/index.ts
Expand Up @@ -9,5 +9,5 @@ export default async function ping({
message: { author: { username: string }; channel: any }
}) {
// Send the response to the channel it was sent from
await message.channel.createMessage('pong')
await message.channel.send('pong')
}
3 changes: 2 additions & 1 deletion src/bot/index.ts
@@ -1,5 +1,6 @@
import 'module-alias/register'
import metabot from '@bot/metabot'
import { token } from '@bot/configs/metabot'

// Connect to Discord
metabot.connect()
metabot.login(token)
7 changes: 3 additions & 4 deletions src/bot/metabot.ts
@@ -1,10 +1,9 @@
const Eris = require('eris')
import Discord from 'discord.js'

import { token } from '@bot/configs/metabot'
import { handleMessageCreate } from '@bot/utils/metabot'

const bot = new Eris(token)
const bot = new Discord.Client()

bot.on('messageCreate', handleMessageCreate)
bot.on('message', handleMessageCreate)

export default bot
12 changes: 4 additions & 8 deletions src/bot/utils/metabot.ts
Expand Up @@ -19,8 +19,8 @@ async function handleMessageCreate(message: any) {
if (message.content[0] === PREFIX) {
// Get the command name and arguments from the message
const tokens = _.split(message.content, ' ')
const commandName = _.head(tokens).substring(1)
const args = _.tail(tokens)
const commandName = _.head(tokens).substring(PREFIX.length)
const args = _.filter(_.tail(tokens), token => !!token)
const command = commands[commandName]

if (!command) {
Expand All @@ -30,13 +30,9 @@ async function handleMessageCreate(message: any) {
try {
await command({ args, message })
} catch (err) {
await message.channel.createMessage(
COMMAND_ERROR_MESSAGE + ': ' + err,
)
await message.channel.send(COMMAND_ERROR_MESSAGE + ': ' + err)
}
}
}

export {
handleMessageCreate,
}
export { handleMessageCreate }
41 changes: 26 additions & 15 deletions yarn.lock
Expand Up @@ -259,6 +259,17 @@ define-properties@^1.1.3:
dependencies:
object-keys "^1.0.12"

discord.js@^11.5.1:
version "11.5.1"
resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-11.5.1.tgz#910fb9f6410328581093e044cafb661783a4d9e8"
integrity sha512-tGhV5xaZXE3Z+4uXJb3hYM6gQ1NmnSxp9PClcsSAYFVRzH6AJH74040mO3afPDMWEAlj8XsoPXXTJHTxesqcGw==
dependencies:
long "^4.0.0"
prism-media "^0.0.3"
snekfetch "^3.6.4"
tweetnacl "^1.0.0"
ws "^6.0.0"

doctrine@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
Expand All @@ -276,16 +287,6 @@ emoji-regex@^7.0.1:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==

eris@^0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/eris/-/eris-0.10.1.tgz#1ecc13ff06d45edb86c344b70ec2dd2e7ef270df"
integrity sha512-POWCQ91xmG75U5V3i2bAvh/hco+HkgF+YJzerTcULe++AgKutA4l1adxqUrJ13Nxah/O+olkkQCufO+gQoawtA==
dependencies:
ws "^6.0.0"
optionalDependencies:
opusscript "^0.0.4"
tweetnacl "^1.0.0"

es-abstract@^1.12.0:
version "1.13.0"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
Expand Down Expand Up @@ -731,6 +732,11 @@ lolex@1.3.2:
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
integrity sha1-fD2mL/yzDw9agKJWbKJORdigHzE=

long@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==

mimic-fn@^1.0.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
Expand Down Expand Up @@ -826,11 +832,6 @@ optionator@^0.8.2:
type-check "~0.3.2"
wordwrap "~1.0.0"

opusscript@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/opusscript/-/opusscript-0.0.4.tgz#c718edcfdcd2a1f55fadb266dd07268d4a46afde"
integrity sha512-bEPZFE2lhUJYQD5yfTFO4RhbRZ937x6hRwBC1YoGacT35bwDVwKFP1+amU8NYfZL/v4EU7ZTU3INTqzYAnuP7Q==

os-tmpdir@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
Expand Down Expand Up @@ -858,6 +859,11 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=

prism-media@^0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-0.0.3.tgz#8842d4fae804f099d3b48a9a38e3c2bab6f4855b"
integrity sha512-c9KkNifSMU/iXT8FFTaBwBMr+rdVcN+H/uNv1o+CuFeTThNZNTOrQ+RgXA1yL/DeLk098duAeRPP3QNPNbhxYQ==

progress@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
Expand Down Expand Up @@ -1011,6 +1017,11 @@ slice-ansi@^2.1.0:
astral-regex "^1.0.0"
is-fullwidth-code-point "^2.0.0"

snekfetch@^3.6.4:
version "3.6.4"
resolved "https://registry.yarnpkg.com/snekfetch/-/snekfetch-3.6.4.tgz#d13e80a616d892f3d38daae4289f4d258a645120"
integrity sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw==

sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
Expand Down

0 comments on commit 2ad33f3

Please sign in to comment.