@lotus-tree/fg-notation 1.1.0 → 1.2.0

package/lib/info.json

@@ -0,0 +1,33 @@
+{
+  "sizes": { "+": 55 },
+
+  "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 mp >> 236 236 lk"
+    }
+  },
+
+  "aliases": {
+    "games": {
+      "bbt": "bbtag",
+      "db": "dbz"
+    },
+
+    "inputs": {
+      "basic": {
+        "doubleforward": [">>"]
+      },
+
+      "games": {
+        "bbtag": {
+          "throw": ["b","+","c"],
+          "crb": ["d","+","p"],
+          "airdash": ["a","+","b"],
+          "reversal": ["a","+","d"]
+        }
+      }
+    }
+  }
+}

package/package.json

@@ -1,17 +1,22 @@
 {
   "name": "@lotus-tree/fg-notation",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "main": "lib/index.js",
   "module": "src/index.js",
   "scripts": {
-    "build": "babel --delete-dir-on-start --copy-files --source-maps inline --root-mode upward src --out-dir lib",
-    "dev": "yarn build --watch"
+    "run-babel": "babel --delete-dir-on-start --copy-files src",
+    "build": "yarn run run-babel --out-dir lib",
+    "dev": "yarn run run-babel --watch --source-maps inline --out-dir dev",
+    "prepublishOnly": "yarn build"
   },
   "dependencies": {
+    "bent": "^7.3.12",
     "glob": "^7.2.0",
-    "request-promise": "^4.2.6",
     "sharp": "^0.29.3"
   },
+  "peerDependencies": {
+    "@lotus-tree/command-handler": "^2.1.0"
+  },
   "devDependencies": {
     "@babel/cli": "^7.16.7",
     "@babel/core": "^7.16.7",

package/src/index.js

@@ -2,8 +2,11 @@ import sharp from 'sharp'
 import path from 'path'
 import glob from 'glob'
 import { DataTypes } from 'sequelize'
-import rp from 'request-promise'
+import bent from 'bent'
 
+import { sizes, aliases, builtin } from './info.json'
+
+const getJSON = bent('json')
 const imgPath = path.join(__dirname, 'img')
 const basicInputs = new Map()
 const gameInputs = new Map()
@@ -15,7 +18,7 @@ getGlossary()
 setInterval(getGlossary, 5 * 60 * 1000)
 
 async function getGlossary () {
-  const result = JSON.parse(await rp('https://glossary.infil.net/json/glossary.json'))
+  const result = await getJSON('https://glossary.infil.net/json/glossary.json')
   const tempG = {}
   const tempT = []
 
@@ -33,50 +36,89 @@ glob.sync(path.join(imgPath, 'basic/**'), { nodir: true })
   .forEach(p => {
     const input = p.split('/').pop().replace('.png', '')
     basicInputs.set(input, p)
-  })
 
-basicInputs.set('>>', path.join(imgPath, 'basic/doubleforward.png'))
+    const alias = aliases.inputs.basic[input]
+    if (alias) {
+      alias.forEach(i => {
+        basicInputs.set(i, p)
+        if (sizes[input]) sizes[i] = sizes[input]
+      })
+    }
+  })
 
-glob.sync(path.join(imgPath, 'games/**'), { nodir: true })
+glob.sync(path.join(imgPath, 'games/*'))
   .forEach(p => {
-    const { dir, name } = path.parse(path.relative(path.join(imgPath, 'games'), p))
+    const { base } = path.parse(path.relative(path.join(imgPath, 'games'), p))
+    gameInputs.set(base, new Map())
+
+    glob.sync(path.join(imgPath, 'games', base, '**'), { nodir: true })
+      .forEach(input => {
+        const { name } = path.parse(input)
+        gameInputs.get(base).set(name, input)
+      })
+
+    const alias = aliases.inputs.games[base]
 
-    if (!gameInputs.has(dir)) gameInputs.set(dir, new Map())
-    gameInputs.get(dir).set(name, p)
+    if (alias) {
+      for (const [a, s] of Object.entries(alias)) {
+        gameInputs.get(base).set(a, s)
+      }
+    }
   })
 
 function solveInput (inputs, input) {
-  if (inputs.has(input)) return [input]
+  if (inputs.has(input)) return isString(inputs.get(input)) ? [input] : inputs.get(input)
 
   for (let i = 0; i < input.length; i++) {
     const s1 = input.slice(0, 0 - i)
-    if (inputs.has(s1)) return [s1, ...solveInput(inputs, input.slice(0 - i))]
+
+    if (inputs.has(s1)) {
+      const result = inputs.get(s1)
+      const remaining = solveInput(inputs, input.slice(0 - i))
+
+      return isString(result) ? [s1, ...remaining] : [...result, ...remaining]
+    }
   }
 
   throw new Error(`Cannot find "${input}" as a recognizable input`)
 }
 
 async function sendInput (inputs, result, message, caption) {
-  const canvas = await sharp({ create: { width: 152 * result.length, height: 152, channels: 4, background: 'transparent' } })
-    .composite(result.map((it, index) =>
-      ({ input: inputs.get(it), left: index * 152, top: 0, width: 152, height: 152 })
-    ))
+  const width = result.map(it => sizes[it] || 152).reduce((a, b) => a + b, 0)
+  const images = []
+  let left = 0
+
+  result.forEach((it, index) => {
+    const size = sizes[it] || 152
+    images.push({ input: inputs.get(it), left, top: Math.floor((152 - size) / 2) })
+    left += size
+  })
+
+  let canvas = sharp({ create: { width, height: 152, channels: 4, background: 'transparent' } })
     .png()
-    .toBuffer()
+    .composite(images)
+
+  canvas = await canvas.toBuffer()
+
+  if (result.length < 12) canvas = await sharp(canvas).resize({ height: 55 }).png().toBuffer()
 
   return message.reply({ content: caption, files: [canvas] })
 }
 
-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 mp >> 236 236 lk'
-  }
+function checkGame (game) {
+  return gameInputs.has(game) ? game : aliases.games[game]
+}
+
+function isString (x) {
+  return Object.prototype.toString.call(x) === '[object String]'
 }
 
 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'],
 
@@ -127,14 +169,20 @@ export default {
       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')
+        const [, gameInput, i1] = param
+        if (!gameInput || !i1) return message.reply('Missing arguments. Example: >fgi sf 236P 214K')
+
+        const game = checkGame(gameInput)
         if (!gameInputs.has(game)) return message.reply(`"${game}" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)
 
-        const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
-        const result = param.slice(2).map(i => solveInput(inputs, i.toLowerCase())).flat()
+        try {
+          const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
+          const result = param.slice(2).map(i => solveInput(inputs, i.toLowerCase())).flat()
 
-        sendInput(inputs, result, message)
+          sendInput(inputs, result, message)
+        } catch (err) {
+          message.reply(err.message)
+        }
       }
     },
     fgsave: {
@@ -142,16 +190,22 @@ export default {
       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')
+        const [, gameInput, name, i1] = param
+        if (!gameInput || !name || !i1) return message.reply('Missing arguments. Example: >fgi sf testName 236P 214K')
+
+        const game = checkGame(gameInput)
         if (!gameInputs.has(game)) return message.reply(`"${game}" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)
 
-        const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
-        const input = param.slice(3).map(i => solveInput(inputs, i.toLowerCase())).flat().join(' ')
+        try {
+          const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
+          const input = param.slice(3).map(i => solveInput(inputs, i.toLowerCase())).flat().join(' ')
 
-        await sequelize.models.fginput.create({ guild: message.guild.id, name, createdBy: message.author.id, game, input })
+          await sequelize.models.fginput.create({ guild: message.guild.id, name, createdBy: message.author.id, game, input })
 
-        message.channel.send(`Saved command "${input}" as "${name}"`)
+          message.channel.send(`Saved command "${input}" as "${name}"`)
+        } catch (err) {
+          message.reply(err.message)
+        }
       }
     },
     fgcaption: {
@@ -188,7 +242,7 @@ export default {
         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(url)
+        message.reply(`Multiple terms found: ${url}`)
       }
     }
   }

package/src/info.json

@@ -0,0 +1,33 @@
+{
+  "sizes": { "+": 55 },
+
+  "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 mp >> 236 236 lk"
+    }
+  },
+
+  "aliases": {
+    "games": {
+      "bbt": "bbtag",
+      "db": "dbz"
+    },
+
+    "inputs": {
+      "basic": {
+        "doubleforward": [">>"]
+      },
+
+      "games": {
+        "bbtag": {
+          "throw": ["b","+","c"],
+          "crb": ["d","+","p"],
+          "airdash": ["a","+","b"],
+          "reversal": ["a","+","d"]
+        }
+      }
+    }
+  }
+}