@lotus-tree/fg-notation 1.1.3 → 1.3.0

package/lib/index.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,10 +11,12 @@ exports["default"] = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _sharp = _interopRequireDefault(require("sharp"));
@@ -25,6 +29,18 @@ var _sequelize = require("sequelize");
 
 var _bent = _interopRequireDefault(require("bent"));
 
+var _axios = _interopRequireDefault(require("axios"));
+
+var _info = require("./info.json");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 var getJSON = (0, _bent["default"])('json');
 
 var imgPath = _path["default"].join(__dirname, 'img');
@@ -33,6 +49,9 @@ var basicInputs = new Map();
 var gameInputs = new Map();
 var glossary = {};
 var terms = [];
+
+var grabs = _glob["default"].sync(_path["default"].join(imgPath, 'grabs/**.png'));
+
 getGlossary();
 setInterval(getGlossary, 5 * 60 * 1000);
 
@@ -41,17 +60,17 @@ function getGlossary() {
 }
 
 function _getGlossary() {
-  _getGlossary = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+  _getGlossary = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
     var result, tempG, tempT;
-    return _regenerator["default"].wrap(function _callee6$(_context6) {
+    return _regenerator["default"].wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context6.prev = _context6.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
-            _context6.next = 2;
+            _context7.next = 2;
             return getJSON('https://glossary.infil.net/json/glossary.json');
 
           case 2:
-            result = _context6.sent;
+            result = _context7.sent;
             tempG = {};
             tempT = [];
             result.forEach(function (i) {
@@ -64,10 +83,10 @@ function _getGlossary() {
 
           case 8:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
       }
-    }, _callee6);
+    }, _callee7);
   }));
   return _getGlossary.apply(this, arguments);
 }
@@ -77,27 +96,55 @@ _glob["default"].sync(_path["default"].join(imgPath, 'basic/**'), {
 }).forEach(function (p) {
   var input = p.split('/').pop().replace('.png', '');
   basicInputs.set(input, p);
-});
+  var alias = _info.aliases.inputs.basic[input];
 
-basicInputs.set('>>', _path["default"].join(imgPath, 'basic/doubleforward.png'));
+  if (alias) {
+    alias.forEach(function (i) {
+      basicInputs.set(i, p);
+      if (_info.sizes[input]) _info.sizes[i] = _info.sizes[input];
+    });
+  }
+});
 
-_glob["default"].sync(_path["default"].join(imgPath, 'games/**'), {
-  nodir: true
-}).forEach(function (p) {
+_glob["default"].sync(_path["default"].join(imgPath, 'games/*')).forEach(function (p) {
   var _path$parse = _path["default"].parse(_path["default"].relative(_path["default"].join(imgPath, 'games'), p)),
-      dir = _path$parse.dir,
-      name = _path$parse.name;
+      base = _path$parse.base;
 
-  if (!gameInputs.has(dir)) gameInputs.set(dir, new Map());
-  gameInputs.get(dir).set(name, p);
+  gameInputs.set(base, new Map());
+
+  _glob["default"].sync(_path["default"].join(imgPath, 'games', base, '**'), {
+    nodir: true
+  }).forEach(function (input) {
+    var _path$parse2 = _path["default"].parse(input),
+        name = _path$parse2.name;
+
+    gameInputs.get(base).set(name, input);
+  });
+
+  var alias = _info.aliases.inputs.games[base];
+
+  if (alias) {
+    for (var _i = 0, _Object$entries = Object.entries(alias); _i < _Object$entries.length; _i++) {
+      var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+          a = _Object$entries$_i[0],
+          s = _Object$entries$_i[1];
+
+      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 (var i = 0; i < input.length; i++) {
     var s1 = input.slice(0, 0 - i);
-    if (inputs.has(s1)) return [s1].concat((0, _toConsumableArray2["default"])(solveInput(inputs, input.slice(0 - i))));
+
+    if (inputs.has(s1)) {
+      var result = inputs.get(s1);
+      var remaining = solveInput(inputs, input.slice(0 - i));
+      return isString(result) ? [s1].concat((0, _toConsumableArray2["default"])(remaining)) : [].concat((0, _toConsumableArray2["default"])(result), (0, _toConsumableArray2["default"])(remaining));
+    }
   }
 
   throw new Error("Cannot find \"".concat(input, "\" as a recognizable input"));
@@ -108,54 +155,79 @@ function sendInput(_x, _x2, _x3, _x4) {
 }
 
 function _sendInput() {
-  _sendInput = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(inputs, result, message, caption) {
-    var canvas;
-    return _regenerator["default"].wrap(function _callee7$(_context7) {
+  _sendInput = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(inputs, result, message, caption) {
+    var width, images, left, canvas;
+    return _regenerator["default"].wrap(function _callee8$(_context8) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context8.prev = _context8.next) {
           case 0:
-            _context7.next = 2;
-            return (0, _sharp["default"])({
+            width = result.map(function (it) {
+              return _info.sizes[it] || 152;
+            }).reduce(function (a, b) {
+              return a + b;
+            }, 0);
+            images = [];
+            left = 0;
+            result.forEach(function (it, index) {
+              var size = _info.sizes[it] || 152;
+              images.push({
+                input: inputs.get(it),
+                left: left,
+                top: Math.floor((152 - size) / 2)
+              });
+              left += size;
+            });
+            canvas = (0, _sharp["default"])({
               create: {
-                width: 152 * result.length,
+                width: width,
                 height: 152,
                 channels: 4,
                 background: 'transparent'
               }
-            }).composite(result.map(function (it, index) {
-              return {
-                input: inputs.get(it),
-                left: index * 152,
-                top: 0,
-                width: 152,
-                height: 152
-              };
-            })).png().toBuffer();
+            }).png().composite(images);
+            _context8.next = 7;
+            return canvas.toBuffer();
 
-          case 2:
-            canvas = _context7.sent;
-            return _context7.abrupt("return", message.reply({
+          case 7:
+            canvas = _context8.sent;
+
+            if (!(result.length < 12)) {
+              _context8.next = 12;
+              break;
+            }
+
+            _context8.next = 11;
+            return (0, _sharp["default"])(canvas).resize({
+              height: 55
+            }).png().toBuffer();
+
+          case 11:
+            canvas = _context8.sent;
+
+          case 12:
+            return _context8.abrupt("return", message.reply({
               content: caption,
               files: [canvas]
             }));
 
-          case 4:
+          case 13:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
       }
-    }, _callee7);
+    }, _callee8);
   }));
   return _sendInput.apply(this, arguments);
 }
 
-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 mp >> 236 236 lk'
-  }
-};
+function checkGame(game) {
+  return gameInputs.has(game) ? game : _info.aliases.games[game];
+}
+
+function isString(x) {
+  return Object.prototype.toString.call(x) === '[object String]';
+}
+
 var _default = {
   name: 'fg-notation',
   about: {
@@ -207,7 +279,7 @@ var _default = {
                 }
 
                 name = message.content.split(' ').pop().replace(prefix, '');
-                _context.t0 = builtin[name];
+                _context.t0 = _info.builtin[name];
 
                 if (_context.t0) {
                   _context.next = 12;
@@ -249,7 +321,7 @@ var _default = {
       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;
+          var param, message, _param, gameInput, i1, game, inputs, result;
 
           return _regenerator["default"].wrap(function _callee2$(_context2) {
             while (1) {
@@ -257,9 +329,9 @@ var _default = {
                 case 0:
                   param = _ref.param;
                   message = _ref2.message;
-                  _param = (0, _slicedToArray2["default"])(param, 3), game = _param[1], i1 = _param[2];
+                  _param = (0, _slicedToArray2["default"])(param, 3), gameInput = _param[1], i1 = _param[2];
 
-                  if (!(!game || !i1)) {
+                  if (!(!gameInput || !i1)) {
                     _context2.next = 5;
                     break;
                   }
@@ -267,21 +339,27 @@ var _default = {
                   return _context2.abrupt("return", message.reply('Missing arguments. Example: >fgi sf 236P 214K'));
 
                 case 5:
+                  game = checkGame(gameInput);
+
                   if (gameInputs.has(game)) {
-                    _context2.next = 7;
+                    _context2.next = 8;
                     break;
                   }
 
                   return _context2.abrupt("return", message.reply("\"".concat(game, "\" is not a valid game. Available games: ").concat(Array.from(gameInputs.keys()).join(' '))));
 
-                case 7:
-                  inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
-                  result = param.slice(2).map(function (i) {
-                    return solveInput(inputs, i.toLowerCase());
-                  }).flat();
-                  sendInput(inputs, result, message);
+                case 8:
+                  try {
+                    inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
+                    result = param.slice(2).map(function (i) {
+                      return solveInput(inputs, i.toLowerCase());
+                    }).flat();
+                    sendInput(inputs, result, message);
+                  } catch (err) {
+                    message.reply(err.message);
+                  }
 
-                case 10:
+                case 9:
                 case "end":
                   return _context2.stop();
               }
@@ -302,7 +380,7 @@ var _default = {
       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;
+          var param, sequelize, message, _param2, gameInput, name, i1, game, inputs, input;
 
           return _regenerator["default"].wrap(function _callee3$(_context3) {
             while (1) {
@@ -310,9 +388,9 @@ var _default = {
                 case 0:
                   param = _ref3.param, sequelize = _ref3.sequelize;
                   message = _ref4.message;
-                  _param2 = (0, _slicedToArray2["default"])(param, 4), game = _param2[1], name = _param2[2], i1 = _param2[3];
+                  _param2 = (0, _slicedToArray2["default"])(param, 4), gameInput = _param2[1], name = _param2[2], i1 = _param2[3];
 
-                  if (!(!game || !name || !i1)) {
+                  if (!(!gameInput || !name || !i1)) {
                     _context3.next = 5;
                     break;
                   }
@@ -320,19 +398,22 @@ var _default = {
                   return _context3.abrupt("return", message.reply('Missing arguments. Example: >fgi sf testName 236P 214K'));
 
                 case 5:
+                  game = checkGame(gameInput);
+
                   if (gameInputs.has(game)) {
-                    _context3.next = 7;
+                    _context3.next = 8;
                     break;
                   }
 
                   return _context3.abrupt("return", message.reply("\"".concat(game, "\" is not a valid game. Available games: ").concat(Array.from(gameInputs.keys()).join(' '))));
 
-                case 7:
+                case 8:
+                  _context3.prev = 8;
                   inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
                   input = param.slice(3).map(function (i) {
                     return solveInput(inputs, i.toLowerCase());
                   }).flat().join(' ');
-                  _context3.next = 11;
+                  _context3.next = 13;
                   return sequelize.models.fginput.create({
                     guild: message.guild.id,
                     name: name,
@@ -341,15 +422,22 @@ var _default = {
                     input: input
                   });
 
-                case 11:
+                case 13:
                   message.channel.send("Saved command \"".concat(input, "\" as \"").concat(name, "\""));
+                  _context3.next = 19;
+                  break;
 
-                case 12:
+                case 16:
+                  _context3.prev = 16;
+                  _context3.t0 = _context3["catch"](8);
+                  message.reply(_context3.t0.message);
+
+                case 19:
                 case "end":
                   return _context3.stop();
               }
             }
-          }, _callee3);
+          }, _callee3, null, [[8, 16]]);
         }));
 
         function execute(_x7, _x8) {
@@ -483,9 +571,175 @@ var _default = {
           return _execute4.apply(this, arguments);
         }
 
+        return execute;
+      }()
+    },
+    grab: {
+      usage: 'grab @user',
+      desc: 'Command grab someone',
+      example: 'grab @ChitoWarlock',
+      execute: function () {
+        var _execute5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(_ref9, _ref10) {
+          var param, sequelize, message, mentions, user, mainPath, mainImage, options, avatarImage, mainMetadata, width, height, canvas;
+          return _regenerator["default"].wrap(function _callee6$(_context6) {
+            while (1) {
+              switch (_context6.prev = _context6.next) {
+                case 0:
+                  param = _ref9.param, sequelize = _ref9.sequelize;
+                  message = _ref10.message;
+                  mentions = message.mentions.users;
+
+                  if (!(mentions.size === 0)) {
+                    _context6.next = 5;
+                    break;
+                  }
+
+                  return _context6.abrupt("return", message.reply('You forgot to mention who to grab'));
+
+                case 5:
+                  if (!(mentions.size > 1)) {
+                    _context6.next = 7;
+                    break;
+                  }
+
+                  return _context6.abrupt("return", message.reply('Cannot grab multiple enemies!'));
+
+                case 7:
+                  user = mentions.first();
+                  mainPath = grabs[getRandomInt(0, grabs.length - 1)];
+                  _context6.next = 11;
+                  return (0, _sharp["default"])(mainPath);
+
+                case 11:
+                  mainImage = _context6.sent;
+                  _context6.next = 14;
+                  return Promise.resolve("".concat(mainPath.replace('.png', '.json'))).then(function (s) {
+                    return _interopRequireWildcard(require(s));
+                  });
+
+                case 14:
+                  options = _context6.sent;
+                  _context6.t0 = _sharp["default"];
+                  _context6.next = 18;
+                  return getBuffer(user.displayAvatarURL({
+                    format: 'png'
+                  }));
+
+                case 18:
+                  _context6.t1 = _context6.sent;
+                  _context6.next = 21;
+                  return (0, _context6.t0)(_context6.t1).resize(options.resize).rotate(options.rotate, {
+                    background: {
+                      r: 0,
+                      g: 0,
+                      b: 0,
+                      alpha: 0
+                    }
+                  });
+
+                case 21:
+                  avatarImage = _context6.sent;
+                  _context6.next = 24;
+                  return mainImage.metadata();
+
+                case 24:
+                  mainMetadata = _context6.sent;
+                  width = mainMetadata.width, height = mainMetadata.height;
+                  _context6.t2 = newCanvas(width, height);
+                  _context6.t3 = _objectSpread;
+                  _context6.next = 30;
+                  return avatarImage.toBuffer();
+
+                case 30:
+                  _context6.t4 = _context6.sent;
+                  _context6.t5 = {
+                    input: _context6.t4
+                  };
+                  _context6.t6 = options.composite;
+                  _context6.t7 = (0, _context6.t3)(_context6.t5, _context6.t6);
+                  _context6.next = 36;
+                  return mainImage.toBuffer();
+
+                case 36:
+                  _context6.t8 = _context6.sent;
+                  _context6.t9 = {
+                    input: _context6.t8
+                  };
+                  _context6.t10 = [_context6.t7, _context6.t9];
+                  _context6.next = 41;
+                  return _context6.t2.composite.call(_context6.t2, _context6.t10).png().toBuffer();
+
+                case 41:
+                  canvas = _context6.sent;
+                  message.reply({
+                    files: [canvas]
+                  });
+
+                case 43:
+                case "end":
+                  return _context6.stop();
+              }
+            }
+          }, _callee6);
+        }));
+
+        function execute(_x13, _x14) {
+          return _execute5.apply(this, arguments);
+        }
+
         return execute;
       }()
     }
   }
 };
-exports["default"] = _default;
+exports["default"] = _default;
+
+function getBuffer(_x15) {
+  return _getBuffer.apply(this, arguments);
+}
+
+function _getBuffer() {
+  _getBuffer = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(url) {
+    var input;
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
+      while (1) {
+        switch (_context9.prev = _context9.next) {
+          case 0:
+            _context9.next = 2;
+            return (0, _axios["default"])({
+              url: url,
+              responseType: 'arraybuffer'
+            });
+
+          case 2:
+            input = _context9.sent.data;
+            return _context9.abrupt("return", input);
+
+          case 4:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9);
+  }));
+  return _getBuffer.apply(this, arguments);
+}
+
+function newCanvas(width, height) {
+  var channels = 4;
+  var rgbaPixel = 0x00000000;
+  var canvas = Buffer.alloc(width * height * channels, rgbaPixel);
+  return (0, _sharp["default"])(canvas, {
+    raw: {
+      width: width,
+      height: height,
+      channels: channels
+    }
+  });
+}
+
+function getRandomInt(min, max) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}

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,25 +1,28 @@
-{
-  "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"
-  }
-}
+{
+  "name": "@lotus-tree/fg-notation",
+  "version": "1.3.0",
+  "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 --source-maps inline --out-dir dev",
+    "prepublishOnly": "yarn build"
+  },
+  "dependencies": {
+    "axios": "^0.27.2",
+    "bent": "^7.3.12",
+    "glob": "^7.2.0",
+    "sharp": "^0.29.3"
+  },
+  "peerDependencies": {
+    "@lotus-tree/command-handler": "^2.1.0"
+  },
+  "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/img/credits.txt

@@ -1,4 +1,4 @@
-These emojis were made by Magic (@MagicianStuff / @MagicianSketch).
-Using the Twemoji 13.1 open source emoji set.
-
+These emojis were made by Magic (@MagicianStuff / @MagicianSketch).
+Using the Twemoji 13.1 open source emoji set.
+
 These are public domain and can be used without credit.