Added globe, Magick++ ports wave 2

commands/funky.js

@@ -1,13 +1,11 @@
-const gm = require("gm").subClass({
-  imageMagick: true
-});
+const magick = require("../build/Release/image.node");
+const { promisify } = require("util");
 
 exports.run = async (message) => {
   message.channel.sendTyping();
   const image = await require("../utils/imagedetect.js")(message);
   if (image === undefined) return `${message.author.mention}, you need to provide an image to add New Funky Mode!`;
-  const watermark = "./assets/images/funky.png";
-  const buffer = await gm(image.path).coalesce().out("null:").out(watermark).gravity("NorthEast").scale(null, "%[fx:u.h]").out("-layers", "composite").bufferPromise(image.type, image.delay);
+  const buffer = await promisify(magick.watermark)(image.path, "./assets/images/funky.png", 3, true, image.type.toUpperCase(), image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0);
   return {
     file: buffer,
     name: `funky.${image.type}`

commands/gamexplain.js

@@ -1,13 +1,11 @@
-const gm = require("gm").subClass({
-  imageMagick: true
-});
+const magick = require("../build/Release/image.node");
+const { promisify } = require("util");
 
 exports.run = async (message) => {
   message.channel.sendTyping();
   const image = await require("../utils/imagedetect.js")(message);
   if (image === undefined) return `${message.author.mention}, you need to provide an image to make a GameXplain thumbnail meme!`;
-  const template = "./assets/images/gamexplain.png";
-  const buffer = await gm(template).background("white").out("null:").out("(").out(image.path).coalesce().out("-virtual-pixel", "transparent").scale("1181x571!").out(")").compose("over").gravity("Center").out("-geometry", "+0+40").out("-layers", "composite").bufferPromise(image.type, image.delay);
+  const buffer = await promisify(magick.gamexplain)(image.path, image.type.toUpperCase(), image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0);
   return {
     file: buffer,
     name: `gamexplain.${image.type}`

commands/globe.js

@@ -0,0 +1,18 @@
+const magick = require("../build/Release/image.node");
+const { promisify } = require("util");
+
+exports.run = async (message) => {
+  const image = await require("../utils/imagedetect.js")(message);
+  if (image === undefined) return `${message.author.mention}, you need to provide an image to spin!`;
+  const processMessage = await message.channel.createMessage("<a:processing:479351417102925854> Processing... This might take a while");
+  const buffer = await promisify(magick.globe)(image.path, image.type.toUpperCase(), image.delay ? (100 / image.delay.split("/")[0]) * image.delay.split("/")[1] : 0);
+  await processMessage.delete();
+  return {
+    file: buffer,
+    name: "globe.gif"
+  };
+};
+
+exports.aliases = ["rotate"];
+exports.category = 5;
+exports.help = "Spins an image";

natives/globe.cc

@@ -0,0 +1,77 @@
+#include <napi.h>
+#include <list>
+#include <iostream>
+#include <Magick++.h>
+
+using namespace std;
+using namespace Magick;
+
+class GlobeWorker : public Napi::AsyncWorker {
+ public:
+  GlobeWorker(Napi::Function& callback, string in_path, string type, int delay)
+      : Napi::AsyncWorker(callback), in_path(in_path), type(type), delay(delay) {}
+  ~GlobeWorker() {}
+
+  void Execute() {
+    list<Image> frames;
+    list<Image> coalesced;
+    list<Image> mid;
+    list<Image> result;
+    Image distort;
+    readImages(&frames, in_path);
+    distort.read("./assets/images/spheremap.png");
+    coalesceImages(&coalesced, frames.begin(), frames.end());
+
+    if (type != "GIF") {
+      list<Image>::iterator it = coalesced.begin();
+      for (int i = 0; i < 29; ++i) {
+        coalesced.push_back(*it);
+      }
+    }
+
+    int i = 0;
+
+    for (Image &image : coalesced) {
+      image.scale(Geometry("500x500!"));
+      image.alphaChannel(Magick::SetAlphaChannel);
+      size_t width = image.columns();
+      image.roll(Geometry("+" + to_string(width * i / coalesced.size())));
+      image.composite(distort, Magick::CenterGravity, Magick::DistortCompositeOp);
+      image.magick("GIF");
+      mid.push_back(image);
+      i++;
+    }
+
+    optimizeImageLayers(&result, mid.begin(), mid.end());
+    if (delay != 0) {
+      for_each(result.begin(), result.end(), animationDelayImage(delay));
+    } else if (type != "GIF") {
+      for_each(result.begin(), result.end(), animationDelayImage(5));
+    }
+    writeImages(result.begin(), result.end(), &blob);
+  }
+
+  void OnOK() {
+    Callback().Call({Env().Undefined(), Napi::Buffer<char>::Copy(Env(), (char *)blob.data(), blob.length())});
+  }
+
+ private:
+  string in_path, type;
+  int delay, wordlength, n;
+  size_t bytes, type_size;
+  Blob blob;
+};
+
+Napi::Value Globe(const Napi::CallbackInfo &info)
+{
+  Napi::Env env = info.Env();
+
+  string in_path = info[0].As<Napi::String>().Utf8Value();
+  string type = info[1].As<Napi::String>().Utf8Value();
+  int delay = info[2].As<Napi::Number>().Int32Value();
+  Napi::Function cb = info[3].As<Napi::Function>();
+
+  GlobeWorker* blurWorker = new GlobeWorker(cb, in_path, type, delay);
+  blurWorker->Queue();
+  return env.Undefined();
+}

natives/globe.h

@@ -0,0 +1,8 @@
+#ifndef ESMBOT_NATIVES_GLOBE_H_
+#define ESMBOT_NATIVES_GLOBE_H_
+
+#include <napi.h>
+
+Napi::Value Globe(const Napi::CallbackInfo& info);
+
+#endif

natives/image.cc

@@ -9,6 +9,8 @@
 #include "flip.h"
 #include "flop.h"
 #include "freeze.h"
+#include "gamexplain.h"
+#include "globe.h"
 #include "invert.h"
 #include "watermark.h"
 
@@ -24,6 +26,8 @@ Napi::Object Init(Napi::Env env, Napi::Object exports)
   exports.Set(Napi::String::New(env, "flip"), Napi::Function::New(env, Flip));
   exports.Set(Napi::String::New(env, "flop"), Napi::Function::New(env, Flop));
   exports.Set(Napi::String::New(env, "freeze"), Napi::Function::New(env, Freeze));
+  exports.Set(Napi::String::New(env, "gamexplain"), Napi::Function::New(env, Gamexplain));
+  exports.Set(Napi::String::New(env, "globe"), Napi::Function::New(env, Globe));
   exports.Set(Napi::String::New(env, "invert"), Napi::Function::New(env, Invert));
   exports.Set(Napi::String::New(env, "watermark"), Napi::Function::New(env, Watermark));
   return exports;