From 4fc58796474efea046ccf5bed5934df34948b1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D1=8C=D0=B5=D0=B2=20=D0=94?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= <dvasiliev97@yandex.ru>
Date: Wed, 4 Sep 2019 21:23:26 +0300
Subject: [PATCH] fix(merge): rollback merge

---
 src/core/Bot.ts      |  7 +++++--
 src/core/BotEmbed.ts | 12 +-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/core/Bot.ts b/src/core/Bot.ts
index 18ffa07..af53dd5 100644
--- a/src/core/Bot.ts
+++ b/src/core/Bot.ts
@@ -9,7 +9,6 @@ import BotMediaPlayer from './BotMediaPlayer';
 import BotConsoleReader from './BotConsoleReader';
 import BotCommandMap from './BotCommandMap';
 import { ParsedMessage, parse } from './BotCommandParser';
-import { embedPing } from './BotEmbed';
 
 import logger from '../utils/logger';
 
@@ -60,7 +59,11 @@ class YBot implements Bot {
 
     this.commands = new BotCommandMap()
       .on('ping', (cmd: ParsedMessage, msg: Message): void => {
-        msg.channel.send(embedPing(this.client));
+        let phrases = ['Can\'t stop won\'t stop!', ':ping_pong: Pong Bitch!'];
+
+        if (msg.guild) phrases = phrases.concat(msg.guild.emojis.array().map((x): string => x.name));
+
+        msg.channel.send(`${this.client.ping}ms, :${random(phrases)}:`);
       })
       .on('help', help)
       .on('join', join)
diff --git a/src/core/BotEmbed.ts b/src/core/BotEmbed.ts
index d1318dc..868cbd4 100644
--- a/src/core/BotEmbed.ts
+++ b/src/core/BotEmbed.ts
@@ -1,4 +1,4 @@
-import { RichEmbed, Client } from 'discord.js';
+import { RichEmbed } from 'discord.js';
 
 import { MediaItem } from './BotMedia';
 import BotMediaQueue from './BotMediaQueue';
@@ -100,20 +100,10 @@ const embedMultipleTracksAdded = (tracks: MediaItem[]): RichEmbed => {
   return embed;
 };
 
-const embedPing = (client: Client): RichEmbed => {
-  const embed = new RichEmbed()
-    .setColor('#ffdb4d')
-    .setDescription(`⌛ ${Math.ceil(client.ping)}`)
-    .setFooter(copyright, logoYandexMusicURL);
-
-  return embed;
-};
-
 export {
   embedTrackAdded,
   embedNowPlaying,
   embedList,
   embedHelp,
   embedMultipleTracksAdded,
-  embedPing,
 };