@lotus-tree/fg-notation 1.0.0 → 1.1.3

package/lib/index.js

@@ -11,10 +11,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _sharp = _interopRequireDefault(require("sharp"));
 
 var _path = _interopRequireDefault(require("path"));
@@ -23,10 +23,54 @@ var _glob = _interopRequireDefault(require("glob"));
 
 var _sequelize = require("sequelize");
 
+var _bent = _interopRequireDefault(require("bent"));
+
+var getJSON = (0, _bent["default"])('json');
+
 var imgPath = _path["default"].join(__dirname, 'img');
 
 var basicInputs = new Map();
 var gameInputs = new Map();
+var glossary = {};
+var terms = [];
+getGlossary();
+setInterval(getGlossary, 5 * 60 * 1000);
+
+function getGlossary() {
+  return _getGlossary.apply(this, arguments);
+}
+
+function _getGlossary() {
+  _getGlossary = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+    var result, tempG, tempT;
+    return _regenerator["default"].wrap(function _callee6$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            _context6.next = 2;
+            return getJSON('https://glossary.infil.net/json/glossary.json');
+
+          case 2:
+            result = _context6.sent;
+            tempG = {};
+            tempT = [];
+            result.forEach(function (i) {
+              var term = i.term.toLowerCase();
+              tempG[term] = i;
+              tempT.push(term);
+            });
+            glossary = tempG;
+            terms = tempT;
+
+          case 8:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee6);
+  }));
+  return _getGlossary.apply(this, arguments);
+}
 
 _glob["default"].sync(_path["default"].join(imgPath, 'basic/**'), {
   nodir: true
@@ -64,13 +108,13 @@ function sendInput(_x, _x2, _x3, _x4) {
 }
 
 function _sendInput() {
-  _sendInput = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(inputs, result, message, caption) {
+  _sendInput = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(inputs, result, message, caption) {
     var canvas;
-    return _regenerator["default"].wrap(function _callee5$(_context5) {
+    return _regenerator["default"].wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
-            _context5.next = 2;
+            _context7.next = 2;
             return (0, _sharp["default"])({
               create: {
                 width: 152 * result.length,
@@ -89,18 +133,18 @@ function _sendInput() {
             })).png().toBuffer();
 
           case 2:
-            canvas = _context5.sent;
-            return _context5.abrupt("return", message.reply({
+            canvas = _context7.sent;
+            return _context7.abrupt("return", message.reply({
               content: caption,
               files: [canvas]
             }));
 
           case 4:
           case "end":
-            return _context5.stop();
+            return _context7.stop();
         }
       }
-    }, _callee5);
+    }, _callee7);
   }));
   return _sendInput.apply(this, arguments);
 }
@@ -109,11 +153,15 @@ var builtin = {
   37: {
     game: 'sf',
     caption: '***LETS GO JUSTIN!***',
-    input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 hp >> 236 236 lk'
+    input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk'
   }
 };
 var _default = {
   name: 'fg-notation',
+  about: {
+    name: 'FG Notation',
+    value: '[Instructions and source code](https://lotus.chitowarlock.com/fgnotation)\n[Infil\'s Fighting Game Glossary](https://glossary.infil.net)\n[MagicianStuff\'s Fighthing Game notations emotes](https://twitter.com/MagicianStuff/status/1477931054484893697)'
+  },
   intents: ['GUILD_MESSAGES'],
   partials: ['MESSAGE'],
   preload: function preload(sequelize) {
@@ -197,8 +245,8 @@ var _default = {
   commands: {
     fgi: {
       usage: 'fgi [game] [inputs]',
-      desc: 'This command displays information about a command',
-      example: 'help perms',
+      desc: 'Converts a list of inputs into an image',
+      example: 'fgi sf 236P 214K',
       execute: function () {
         var _execute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref, _ref2) {
           var param, message, _param, game, i1, inputs, result;
@@ -250,8 +298,8 @@ var _default = {
     },
     fgsave: {
       usage: 'fgsave [game] [name] [inputs]',
-      desc: 'This command displays information about a command',
-      example: 'help perms',
+      desc: 'Saves a list of inputs into a command',
+      example: 'fgi sf testName 236P 214K',
       execute: function () {
         var _execute2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref3, _ref4) {
           var param, sequelize, message, _param2, game, name, i1, inputs, input;
@@ -312,9 +360,9 @@ var _default = {
       }()
     },
     fgcaption: {
-      usage: 'fgsave [name] [caption]',
-      desc: 'This command displays information about a command',
-      example: 'help perms',
+      usage: 'fgcaption [name] [caption]',
+      desc: 'Adds a caption to a saved input command',
+      example: 'fgcaption testName This is a caption',
       execute: function () {
         var _execute3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(_ref5, _ref6) {
           var param, sequelize, message, _param3, name, i1, row;
@@ -373,10 +421,71 @@ var _default = {
           return _execute3.apply(this, arguments);
         }
 
+        return execute;
+      }()
+    },
+    fgglossary: {
+      usage: 'fgglossary [search term]',
+      desc: 'Searches for a term on Infil\'s Glossary',
+      example: 'fgglossary mexican uppercut',
+      execute: function () {
+        var _execute4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(_ref7, _ref8) {
+          var param, sequelize, message, params, search, result, url;
+          return _regenerator["default"].wrap(function _callee5$(_context5) {
+            while (1) {
+              switch (_context5.prev = _context5.next) {
+                case 0:
+                  param = _ref7.param, sequelize = _ref7.sequelize;
+                  message = _ref8.message;
+                  params = param.slice(1);
+
+                  if (!(params.length === 0)) {
+                    _context5.next = 5;
+                    break;
+                  }
+
+                  return _context5.abrupt("return", message.reply('Missing search term. Example: >fgglossary mexican uppercut'));
+
+                case 5:
+                  search = params.join(' ').toLowerCase();
+                  result = terms.filter(function (i) {
+                    return i.includes(search);
+                  });
+                  url = "https://glossary.infil.net/?t=".concat(params.join('%20').toLowerCase());
+
+                  if (!(result.length === 0)) {
+                    _context5.next = 10;
+                    break;
+                  }
+
+                  return _context5.abrupt("return", message.reply("Term \"".concat(search, "\" not found")));
+
+                case 10:
+                  if (!(result.length === 1)) {
+                    _context5.next = 12;
+                    break;
+                  }
+
+                  return _context5.abrupt("return", message.reply("```".concat(glossary[result[0]].def, "```Source: <").concat(url, ">")));
+
+                case 12:
+                  message.reply("Multiple terms found: ".concat(url));
+
+                case 13:
+                case "end":
+                  return _context5.stop();
+              }
+            }
+          }, _callee5);
+        }));
+
+        function execute(_x11, _x12) {
+          return _execute4.apply(this, arguments);
+        }
+
         return execute;
       }()
     }
   }
 };
-exports["default"] = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/index.js"],"names":["imgPath","path","join","__dirname","basicInputs","Map","gameInputs","glob","sync","nodir","forEach","p","input","split","pop","replace","set","parse","relative","dir","name","has","get","solveInput","inputs","i","length","s1","slice","Error","sendInput","result","message","caption","create","width","height","channels","background","composite","map","it","index","left","top","png","toBuffer","canvas","reply","content","files","builtin","game","intents","partials","preload","sequelize","define","guild","type","DataTypes","STRING","primaryKey","createdBy","events","messageCreate","global","client","config","author","id","user","member","guildId","prefix","startsWith","models","fginput","findOne","where","row","commands","fgi","usage","desc","example","execute","param","i1","Array","from","keys","toLowerCase","flat","fgsave","channel","send","fgcaption","save"],"mappings":"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","sourcesContent":["import sharp from 'sharp'\r\nimport path from 'path'\r\nimport glob from 'glob'\r\nimport { DataTypes } from 'sequelize'\r\n\r\nconst imgPath = path.join(__dirname, 'img')\r\nconst basicInputs = new Map()\r\nconst gameInputs = new Map()\r\n\r\nglob.sync(path.join(imgPath, 'basic/**'), { nodir: true })\r\n  .forEach(p => {\r\n    const input = p.split('/').pop().replace('.png', '')\r\n    basicInputs.set(input, p)\r\n  })\r\n\r\nbasicInputs.set('>>', path.join(imgPath, 'basic/doubleforward.png'))\r\n\r\nglob.sync(path.join(imgPath, 'games/**'), { nodir: true })\r\n  .forEach(p => {\r\n    const { dir, name } = path.parse(path.relative(path.join(imgPath, 'games'), p))\r\n\r\n    if (!gameInputs.has(dir)) gameInputs.set(dir, new Map())\r\n    gameInputs.get(dir).set(name, p)\r\n  })\r\n\r\nfunction solveInput (inputs, input) {\r\n  if (inputs.has(input)) return [input]\r\n\r\n  for (let i = 0; i < input.length; i++) {\r\n    const s1 = input.slice(0, 0 - i)\r\n    if (inputs.has(s1)) return [s1, ...solveInput(inputs, input.slice(0 - i))]\r\n  }\r\n\r\n  throw new Error(`Cannot find \"${input}\" as a recognizable input`)\r\n}\r\n\r\nasync function sendInput (inputs, result, message, caption) {\r\n  const canvas = await sharp({ create: { width: 152 * result.length, height: 152, channels: 4, background: 'transparent' } })\r\n    .composite(result.map((it, index) =>\r\n      ({ input: inputs.get(it), left: index * 152, top: 0, width: 152, height: 152 })\r\n    ))\r\n    .png()\r\n    .toBuffer()\r\n\r\n  return message.reply({ content: caption, files: [canvas] })\r\n}\r\n\r\nconst builtin = {\r\n  37: {\r\n    game: 'sf',\r\n    caption: '***LETS GO JUSTIN!***',\r\n    input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 hp >> 236 236 lk'\r\n  }\r\n}\r\n\r\nexport default {\r\n  name: 'fg-notation',\r\n  intents: ['GUILD_MESSAGES'],\r\n  partials: ['MESSAGE'],\r\n\r\n  preload: sequelize => {\r\n    sequelize.define('fginput', {\r\n      guild: {\r\n        type: DataTypes.STRING,\r\n        primaryKey: true\r\n      },\r\n      name: {\r\n        type: DataTypes.STRING,\r\n        primaryKey: true\r\n      },\r\n      createdBy: DataTypes.STRING,\r\n      game: DataTypes.STRING,\r\n      caption: DataTypes.STRING,\r\n      input: DataTypes.STRING\r\n    })\r\n  },\r\n\r\n  events: {\r\n    async messageCreate (global, message) {\r\n      const { client, config, sequelize } = global\r\n      if (message.author.id === client.user.id || !message.member) return\r\n\r\n      const guildId = message.guildId\r\n      const { prefix } = config[guildId]\r\n\r\n      if (message.content.startsWith(prefix)) {\r\n        const name = message.content.split(' ').pop().replace(prefix, '')\r\n        const row = builtin[name] || (\r\n          await sequelize.models.fginput.findOne({\r\n            where: { guild: message.guild.id, name }\r\n          })\r\n        )\r\n\r\n        if (row) {\r\n          const inputs = new Map([...basicInputs, ...gameInputs.get(row.game)])\r\n          sendInput(inputs, row.input.split(' '), message, row.caption)\r\n        }\r\n      }\r\n    }\r\n  },\r\n\r\n  commands: {\r\n    fgi: {\r\n      usage: 'fgi [game] [inputs]',\r\n      desc: 'This command displays information about a command',\r\n      example: 'help perms',\r\n      execute: async ({ param }, { message }) => {\r\n        const [, game, i1] = param\r\n        if (!game || !i1) return message.reply('Missing arguments. Example: >fgi sf 236P 214K')\r\n        if (!gameInputs.has(game)) return message.reply(`\"${game}\" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)\r\n\r\n        const inputs = new Map([...basicInputs, ...gameInputs.get(game)])\r\n        const result = param.slice(2).map(i => solveInput(inputs, i.toLowerCase())).flat()\r\n\r\n        sendInput(inputs, result, message)\r\n      }\r\n    },\r\n    fgsave: {\r\n      usage: 'fgsave [game] [name] [inputs]',\r\n      desc: 'This command displays information about a command',\r\n      example: 'help perms',\r\n      execute: async ({ param, sequelize }, { message }) => {\r\n        const [, game, name, i1] = param\r\n        if (!game || !name || !i1) return message.reply('Missing arguments. Example: >fgi sf testName 236P 214K')\r\n        if (!gameInputs.has(game)) return message.reply(`\"${game}\" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)\r\n\r\n        const inputs = new Map([...basicInputs, ...gameInputs.get(game)])\r\n        const input = param.slice(3).map(i => solveInput(inputs, i.toLowerCase())).flat().join(' ')\r\n\r\n        await sequelize.models.fginput.create({ guild: message.guild.id, name, createdBy: message.author.id, game, input })\r\n\r\n        message.channel.send(`Saved command \"${input}\" as \"${name}\"`)\r\n      }\r\n    },\r\n    fgcaption: {\r\n      usage: 'fgsave [name] [caption]',\r\n      desc: 'This command displays information about a command',\r\n      example: 'help perms',\r\n      execute: async ({ param, sequelize }, { message }) => {\r\n        const [, name, i1] = param\r\n        if (!name || !i1) return message.reply('Missing arguments. Example: >fgi testName This is a caption')\r\n\r\n        const row = await sequelize.models.fginput.findOne({\r\n          where: { guild: message.guild.id, name }\r\n        })\r\n\r\n        if (!row) return message.reply(`\"${name}\" is not a saved input list`)\r\n        row.caption = param.slice(2).join(' ')\r\n        await row.save()\r\n\r\n        message.channel.send(`Saved caption for input list \"${name}\"`)\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}
+exports["default"] = _default;

package/package.json

@@ -1,10 +1,25 @@
-{
-  "name": "@lotus-tree/fg-notation",
-  "version": "1.0.0",
-  "main": "lib/index.js",
-  "module": "src/index.js",
-  "dependencies": {
-    "glob": "^7.2.0",
-    "sharp": "^0.29.3"
-  }
-}
+{
+  "name": "@lotus-tree/fg-notation",
+  "version": "1.1.3",
+  "main": "lib/index.js",
+  "module": "src/index.js",
+  "scripts": {
+    "run-babel": "babel --delete-dir-on-start --copy-files src",
+    "build": "yarn run run-babel --out-dir lib",
+    "dev": "yarn run run-babel --watch --out-dir dev",
+    "prepublishOnly": "yarn build"
+  },
+  "dependencies": {
+    "@lotus-tree/command-handler": "^2.0.0",
+    "bent": "^7.3.12",
+    "glob": "^7.2.0",
+    "sharp": "^0.29.3"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.16.7",
+    "@babel/core": "^7.16.7",
+    "@babel/node": "^7.16.7",
+    "@babel/plugin-transform-runtime": "^7.16.7",
+    "@babel/preset-env": "^7.16.7"
+  }
+}

package/src/index.js

@@ -2,11 +2,34 @@ import sharp from 'sharp'
 import path from 'path'
 import glob from 'glob'
 import { DataTypes } from 'sequelize'
+import bent from 'bent'
 
+const getJSON = bent('json')
 const imgPath = path.join(__dirname, 'img')
 const basicInputs = new Map()
 const gameInputs = new Map()
 
+let glossary = {}
+let terms = []
+
+getGlossary()
+setInterval(getGlossary, 5 * 60 * 1000)
+
+async function getGlossary () {
+  const result = await getJSON('https://glossary.infil.net/json/glossary.json')
+  const tempG = {}
+  const tempT = []
+
+  result.forEach(i => {
+    const term = i.term.toLowerCase()
+    tempG[term] = i
+    tempT.push(term)
+  })
+
+  glossary = tempG
+  terms = tempT
+}
+
 glob.sync(path.join(imgPath, 'basic/**'), { nodir: true })
   .forEach(p => {
     const input = p.split('/').pop().replace('.png', '')
@@ -49,12 +72,16 @@ const builtin = {
   37: {
     game: 'sf',
     caption: '***LETS GO JUSTIN!***',
-    input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 hp >> 236 236 lk'
+    input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk'
   }
 }
 
 export default {
   name: 'fg-notation',
+  about: {
+    name: 'FG Notation',
+    value: '[Instructions and source code](https://lotus.chitowarlock.com/fgnotation)\n[Infil\'s Fighting Game Glossary](https://glossary.infil.net)\n[MagicianStuff\'s Fighthing Game notations emotes](https://twitter.com/MagicianStuff/status/1477931054484893697)'
+  },
   intents: ['GUILD_MESSAGES'],
   partials: ['MESSAGE'],
 
@@ -102,8 +129,8 @@ export default {
   commands: {
     fgi: {
       usage: 'fgi [game] [inputs]',
-      desc: 'This command displays information about a command',
-      example: 'help perms',
+      desc: 'Converts a list of inputs into an image',
+      example: 'fgi sf 236P 214K',
       execute: async ({ param }, { message }) => {
         const [, game, i1] = param
         if (!game || !i1) return message.reply('Missing arguments. Example: >fgi sf 236P 214K')
@@ -117,8 +144,8 @@ export default {
     },
     fgsave: {
       usage: 'fgsave [game] [name] [inputs]',
-      desc: 'This command displays information about a command',
-      example: 'help perms',
+      desc: 'Saves a list of inputs into a command',
+      example: 'fgi sf testName 236P 214K',
       execute: async ({ param, sequelize }, { message }) => {
         const [, game, name, i1] = param
         if (!game || !name || !i1) return message.reply('Missing arguments. Example: >fgi sf testName 236P 214K')
@@ -133,9 +160,9 @@ export default {
       }
     },
     fgcaption: {
-      usage: 'fgsave [name] [caption]',
-      desc: 'This command displays information about a command',
-      example: 'help perms',
+      usage: 'fgcaption [name] [caption]',
+      desc: 'Adds a caption to a saved input command',
+      example: 'fgcaption testName This is a caption',
       execute: async ({ param, sequelize }, { message }) => {
         const [, name, i1] = param
         if (!name || !i1) return message.reply('Missing arguments. Example: >fgi testName This is a caption')
@@ -150,6 +177,24 @@ export default {
 
         message.channel.send(`Saved caption for input list "${name}"`)
       }
+    },
+    fgglossary: {
+      usage: 'fgglossary [search term]',
+      desc: 'Searches for a term on Infil\'s Glossary',
+      example: 'fgglossary mexican uppercut',
+      execute: async ({ param, sequelize }, { message }) => {
+        const params = param.slice(1)
+        if (params.length === 0) return message.reply('Missing search term. Example: >fgglossary mexican uppercut')
+
+        const search = params.join(' ').toLowerCase()
+        const result = terms.filter(i => i.includes(search))
+        const url = `https://glossary.infil.net/?t=${params.join('%20').toLowerCase()}`
+
+        if (result.length === 0) return message.reply(`Term "${search}" not found`)
+        if (result.length === 1) return message.reply(`\`\`\`${glossary[result[0]].def}\`\`\`Source: <${url}>`)
+
+        message.reply(`Multiple terms found: ${url}`)
+      }
     }
   }
 }