From 715ed3bb7b2c3071358e027b45d9a6547740a7f1 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Thu, 20 Jan 2022 22:52:29 -0600
Subject: [PATCH] Added quality option to jpeg, adjusted CMakeLists, more
 tweaks

---
 CMakeLists.txt                   | 14 ++++++++------
 commands/image-editing/jpeg.js   | 14 +++++++++++---
 commands/image-editing/reddit.js |  4 ++--
 natives/caption.cc               |  2 +-
 natives/jpeg.cc                  |  6 ++++--
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd224e1..cf68ad9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,19 +1,21 @@
 cmake_minimum_required(VERSION 3.9)
 cmake_policy(SET CMP0042 NEW)
-project (image)
+project(image)
 include_directories(${CMAKE_JS_INC})
 file(GLOB SOURCE_FILES "natives/*.cc" "natives/*.h")
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
-add_definitions(-DNAPI_CPP_EXCEPTIONS)
-add_definitions(-DNAPI_VERSION=3)
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror=format-security -Wno-cast-function-type -fexceptions -D_GLIBCXX_ASSERTIONS -fstack-clash-protection -pedantic -D_GLIBCXX_USE_CXX11_ABI=1")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+add_definitions(-DNAPI_VERSION=5)
 
 execute_process(COMMAND node -p "require('node-addon-api').include"
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE NODE_ADDON_API_DIR
-        )
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE NODE_ADDON_API_DIR
+)
 string(REPLACE "\n" "" NODE_ADDON_API_DIR ${NODE_ADDON_API_DIR})
 string(REPLACE "\"" "" NODE_ADDON_API_DIR ${NODE_ADDON_API_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${NODE_ADDON_API_DIR})
diff --git a/commands/image-editing/jpeg.js b/commands/image-editing/jpeg.js
index 7d683fa..60170f8 100644
--- a/commands/image-editing/jpeg.js
+++ b/commands/image-editing/jpeg.js
@@ -1,11 +1,19 @@
 import ImageCommand from "../../classes/imageCommand.js";
 
 class JPEGCommand extends ImageCommand {
-  static description = "Adds max JPEG compression to an image";
-  static aliases = ["needsmorejpeg", "jpegify", "magik2", "morejpeg", "jpg"];
+  params() {
+    const quality = parseInt(this.args[0]);
+    return {
+      quality: isNaN(quality) ? 1 : Math.max(1, Math.min(quality, 100))
+    };
+  }
+
+  static description = "Adds JPEG compression to an image";
+  static aliases = ["needsmorejpeg", "jpegify", "magik2", "morejpeg", "jpg", "quality"];
+  static arguments = ["{quality}"];
 
   static noImage = "You need to provide an image to add more JPEG!";
   static command = "jpeg";
 }
 
-export default JPEGCommand;
\ No newline at end of file
+export default JPEGCommand;
diff --git a/commands/image-editing/reddit.js b/commands/image-editing/reddit.js
index 18b3173..c27d88b 100644
--- a/commands/image-editing/reddit.js
+++ b/commands/image-editing/reddit.js
@@ -1,6 +1,6 @@
 import ImageCommand from "../../classes/imageCommand.js";
 import { random } from "../../utils/misc.js";
-const names = ["esmBot", "me_irl", "dankmemes", "hmmm", "gaming", "wholesome", "chonkers", "memes", "funny", "pcmasterrace", "bellybros"];
+const names = ["esmBot", "me_irl", "dankmemes", "hmmm", "gaming", "wholesome", "chonkers", "memes", "funny", "pcmasterrace", "thomastheplankengine"];
 
 class RedditCommand extends ImageCommand {
   params() {
@@ -16,4 +16,4 @@ class RedditCommand extends ImageCommand {
   static command = "reddit";
 }
 
-export default RedditCommand;
\ No newline at end of file
+export default RedditCommand;
diff --git a/natives/caption.cc b/natives/caption.cc
index c81b1ef..cc1523a 100644
--- a/natives/caption.cc
+++ b/natives/caption.cc
@@ -37,7 +37,7 @@ Napi::Value Caption(const Napi::CallbackInfo &info) {
     Image caption_image(Geometry(query), Color("white"));
     caption_image.fillColor("black");
     caption_image.alpha(true);
-    caption_image.fontPointsize(width / 13);
+    caption_image.fontPointsize((double)width / 13);
     caption_image.textGravity(Magick::CenterGravity);
     caption_image.read("pango:<span font_family=\"" +
                        (font == "roboto" ? "Roboto Condensed" : font) +
diff --git a/natives/jpeg.cc b/natives/jpeg.cc
index 5194c00..c77415a 100644
--- a/natives/jpeg.cc
+++ b/natives/jpeg.cc
@@ -13,6 +13,8 @@ Napi::Value Jpeg(const Napi::CallbackInfo &info) {
   try {
     Napi::Object obj = info[0].As<Napi::Object>();
     Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
+    int quality =
+        obj.Has("quality") ? obj.Get("quality").As<Napi::Number>().Int32Value() : 0;
     string type = obj.Get("type").As<Napi::String>().Utf8Value();
     int delay =
         obj.Has("delay") ? obj.Get("delay").As<Napi::Number>().Int32Value() : 0;
@@ -36,7 +38,7 @@ Napi::Value Jpeg(const Napi::CallbackInfo &info) {
 
       for (Image &image : coalesced) {
         Blob temp;
-        image.quality(1);
+        image.quality(quality);
         image.magick("JPEG");
         image.write(&temp);
         Image newImage(temp);
@@ -75,4 +77,4 @@ Napi::Value Jpeg(const Napi::CallbackInfo &info) {
   } catch (...) {
     throw Napi::Error::New(env, "Unknown error");
   }
-}
\ No newline at end of file
+}