Use <:name:id> format for manamoji.

scryfall · Jan 10, 2017 · 06aba6e · 06aba6e
1 parent c9464d2
commit 06aba6e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/lib/messenger.js b/lib/messenger.js
@@ -37,7 +37,7 @@ class Messenger {
   makePromise(cardName, responseType) {
     return new Promise((resolve, reject) => {
       try {
-        new responseType(cardName).embed().then(embed => {
+        new responseType(this.client, cardName).embed().then(embed => {
           resolve(embed);
         });
       } catch(err) {

diff --git a/lib/middleware/manamoji.js b/lib/middleware/manamoji.js
@@ -1,8 +1,8 @@
 let substitutions = {
-  'CHAOS': ':manachaos:',
-  '{∞}': ':manainfinity:',
-  '{½}': ':manahalf:',
-  '{hr}': ':manahr:'
+  'CHAOS': 'manachaos',
+  '{∞}': 'manainfinity',
+  '{½}': 'manahalf',
+  '{hr}': 'manahr'
 };
 
 let COLORS = ['W', 'U', 'B', 'R', 'G'];
@@ -13,7 +13,7 @@ function _(before, after) {
   if (typeof after === 'undefined') {
     after = before;
   }
-  substitutions[`{${before}}`] = `:mana${after.toString().toLowerCase()}:`;
+  substitutions[`{${before}}`] = `mana${after.toString().toLowerCase()}`;
 }
 
 ADDTL.forEach(a => { _(a) });
@@ -25,17 +25,18 @@ COLORS.forEach(c => { COLORS.forEach(d => {
 }) });
 NUMBERS.forEach(n => { _(n) });
 
-function manamoji(str) {
-  const re = new RegExp(Object.keys(substitutions).map(v => {
-    return v.replace('{', '\\{').replace('}', '\\}');
-  }).join('|'), 'gi');
-  return str.replace(re, matched => {
-    return substitutions[matched];
-  });
-}
 
+module.exports = (client, embed) => {
+  function manamoji(str) {
+    const re = new RegExp(Object.keys(substitutions).map(v => {
+      return v.replace('{', '\\{').replace('}', '\\}');
+    }).join('|'), 'gi');
+    return str.replace(re, matched => {
+      const emoji = client.emojis.find('name', substitutions[matched]);
+      return emoji ? emoji.toString() : matched;
+    });
+  }
 
-module.exports = embed => {
   if (embed.title) {
     embed.title = manamoji(embed.title);
   }

diff --git a/lib/response-types.js b/lib/response-types.js
@@ -4,9 +4,9 @@ const Url = require('urijs');
 
 const manamoji = require('./middleware/manamoji');
 
-
 class TextResponse {
-  constructor(cardName) { 
+  constructor(client, cardName) {
+    this.client = client;
     this.cardName = cardName;
   }
 
@@ -39,7 +39,7 @@ class TextResponse {
     let parts = response.body.split('\n');
     const embedTitle = parts.shift();
     return {
-      title: embedTitle,
+      title: `${embedTitle}`,
       description: parts.join('\n'),
       url: response.headers['x-scryfall-card'],
       thumbnail: {
@@ -53,7 +53,7 @@ class TextResponse {
       this.makeRequest().then(response => {
         let embed = this.makeEmbed(response);
         this.middleware.length > 0 && this.middleware.forEach(mw => {
-          embed = mw(embed);
+          embed = mw(this.client, embed);
         });
         resolve(embed);
       });