murm
/
mrmBot-Matrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch image load warnings, set message limit to 50, don't crash the bot if .git is missing

This commit is contained in:
Essem 2021-10-23 13:58:19 -05:00
parent ab3ae7b9c6
commit f5a0fa5f7c
No known key found for this signature in database
GPG Key ID: 7D497397CC3A2A8C
39 changed files with 305 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app.js
View File

@ -45,7 +45,7 @@ k <BBBw BBBBEBBBBBBBBBBBBBBBBBQ4BM #
*+, " F'"'*^~~~^"^\` V+*^
\`"""
esmBot ${esmBotVersion} (${(await exec("git rev-parse HEAD")).stdout.substring(0, 7)}), powered by eris-fleet ${erisFleetVersion}
esmBot ${esmBotVersion} (${(await exec("git rev-parse HEAD").catch(() => {})).stdout.substring(0, 7)}), powered by eris-fleet ${erisFleetVersion}
`);
}
@ -89,6 +89,7 @@ const Admiral = new Fleet({
repliedUser: true
},
guildSubscriptions: false,
messageLimit: 50,
intents: [
"guilds",
"guildVoiceStates",

2
events/messageCreate.js
View File

@ -122,8 +122,6 @@ export default async (client, cluster, worker, ipc, message) => {
case 3:
fileSize = 104856616;
break;
default:
break;
}
}
if (result.file.length > fileSize) {

9
natives/blur.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Blur(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
if (sharp) {

9
natives/blurple.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -23,7 +24,13 @@ Napi::Value Blurple(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> blurpled;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

14
natives/caption.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -23,7 +24,13 @@ Napi::Value Caption(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> captioned;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
size_t width = frames.front().baseColumns();
string query(to_string(width - ((width / 25) * 2)) + "x");
@ -32,7 +39,10 @@ Napi::Value Caption(const Napi::CallbackInfo &info) {
caption_image.alpha(true);
caption_image.fontPointsize(width / 13);
caption_image.textGravity(Magick::CenterGravity);
caption_image.read("pango:<span font_family=\"" + (font == "roboto" ? "Roboto Condensed" : font) + "\" weight=\"" + (font != "impact" ? "bold" : "normal") + "\">" + caption + "</span>");
caption_image.read("pango:<span font_family=\"" +
(font == "roboto" ? "Roboto Condensed" : font) +
"\" weight=\"" + (font != "impact" ? "bold" : "normal") +
"\">" + caption + "</span>");
caption_image.extent(Geometry(width, caption_image.rows() + (width / 13)),
Magick::CenterGravity);

9
natives/caption2.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -24,7 +25,13 @@ Napi::Value CaptionTwo(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> captioned;
Blob caption_blob;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
size_t width = frames.front().baseColumns();
string query(to_string(width - ((width / 25) * 2)) + "x");

9
natives/circle.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Circle(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> blurred;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/crop.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Crop(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

10
natives/deepfry.cc
View File

@ -1,8 +1,8 @@
#include <Magick++.h>
#include <napi.h>
#include <list>
#include <iostream>
#include <list>
using namespace std;
using namespace Magick;
@ -22,7 +22,13 @@ Napi::Value Deepfry(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> blurred;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/explode.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -22,7 +23,13 @@ Napi::Value Explode(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> blurred;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/flag.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -23,7 +24,13 @@ Napi::Value Flag(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
Image watermark;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read(overlay);
watermark.alphaChannel(Magick::SetAlphaChannel);
watermark.evaluate(Magick::AlphaChannel, Magick::MultiplyEvaluateOperator,

9
natives/flip.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -23,7 +24,13 @@ Napi::Value Flip(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/freeze.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -56,7 +57,13 @@ Napi::Value Freeze(const Napi::CallbackInfo &info) {
Blob blob;
list<Image> frames;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
size_t frameSize = frames.size();
int framePos = clamp(frame, 0, (int)frameSize);
frames.resize(framePos + 1);

9
natives/gamexplain.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -22,7 +23,13 @@ Napi::Value Gamexplain(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
Image watermark;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read("./assets/images/gamexplain.png");
coalesceImages(&coalesced, frames.begin(), frames.end());

9
natives/globe.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -23,7 +24,13 @@ Napi::Value Globe(const Napi::CallbackInfo &info) {
list<Image> mid;
Image distort;
Image overlay;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
distort.read("./assets/images/spheremap.png");
overlay.read("./assets/images/sphere_overlay.png");
coalesceImages(&coalesced, frames.begin(), frames.end());

9
natives/invert.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Invert(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for_each(coalesced.begin(), coalesced.end(), negateImage());

9
natives/jpeg.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -24,7 +25,13 @@ Napi::Value Jpeg(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> jpeged;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/leak.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -22,7 +23,13 @@ Napi::Value Leak(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
Image watermark;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read("./assets/images/leak.png");
coalesceImages(&coalesced, frames.begin(), frames.end());

9
natives/magik.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Magik(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> blurred;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

17
natives/meme.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -25,7 +26,13 @@ Napi::Value Meme(const Napi::CallbackInfo &info) {
list<Image> mid;
Image top_text;
Image bottom_text;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
int width = coalesced.front().columns();
@ -42,7 +49,9 @@ Napi::Value Meme(const Napi::CallbackInfo &info) {
top_text_fill.morphology(Magick::EdgeOutMorphology, "Octagon");
top_text_fill.backgroundColor("black");
top_text_fill.alphaChannel(Magick::ShapeAlphaChannel);
if (dividedWidth > 1) top_text_fill.morphology(Magick::DilateMorphology, "Octagon", dividedWidth);
if (dividedWidth > 1)
top_text_fill.morphology(Magick::DilateMorphology, "Octagon",
dividedWidth);
top_text.composite(top_text_fill, Magick::CenterGravity,
Magick::DstOverCompositeOp);
@ -58,7 +67,9 @@ Napi::Value Meme(const Napi::CallbackInfo &info) {
bottom_text_fill.morphology(Magick::EdgeOutMorphology, "Octagon");
bottom_text_fill.backgroundColor("black");
bottom_text_fill.alphaChannel(Magick::ShapeAlphaChannel);
if (dividedWidth > 1) bottom_text_fill.morphology(Magick::DilateMorphology, "Octagon", dividedWidth);
if (dividedWidth > 1)
bottom_text_fill.morphology(Magick::DilateMorphology, "Octagon",
dividedWidth);
bottom_text.composite(bottom_text_fill, Magick::CenterGravity,
Magick::DstOverCompositeOp);
}

9
natives/mirror.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -27,7 +28,13 @@ Napi::Value Mirror(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
MagickCore::GravityType gravity;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
if (vertical && first) {

9
natives/motivate.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -25,7 +26,13 @@ Napi::Value Motivate(const Napi::CallbackInfo &info) {
list<Image> mid;
Image top;
Image bottom;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
top.size(Geometry("600"));

9
natives/reddit.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -23,7 +24,13 @@ Napi::Value Reddit(const Napi::CallbackInfo &info) {
list<Image> mid;
Image watermark;
Image text_image;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read("./assets/images/reddit.png");
text_image.textGravity(Magick::WestGravity);

9
natives/resize.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -26,7 +27,13 @@ Napi::Value Resize(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> blurred;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/reverse.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Reverse(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
if (soos) {

9
natives/scott.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -22,7 +23,13 @@ Napi::Value Scott(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
Image watermark;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read("./assets/images/scott.png");
coalesceImages(&coalesced, frames.begin(), frames.end());

15
natives/snapchat.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -13,7 +14,8 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) {
Napi::Object obj = info[0].As<Napi::Object>();
Napi::Buffer<char> data = obj.Get("data").As<Napi::Buffer<char>>();
string caption = obj.Get("caption").As<Napi::String>().Utf8Value();
float pos = obj.Has("pos") ? obj.Get("pos").As<Napi::Number>().FloatValue() : 0.5;
float pos =
obj.Has("pos") ? obj.Get("pos").As<Napi::Number>().FloatValue() : 0.5;
string type = obj.Get("type").As<Napi::String>().Utf8Value();
int delay =
obj.Has("delay") ? obj.Get("delay").As<Napi::Number>().Int32Value() : 0;
@ -24,7 +26,13 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> captioned;
Blob caption_blob;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
size_t width = frames.front().baseColumns();
size_t height = frames.front().baseRows();
@ -44,8 +52,7 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) {
for (Image &image : coalesced) {
list<Image> images;
image.composite(caption_image, 0, height * pos,
Magick::OverCompositeOp);
image.composite(caption_image, 0, height * pos, Magick::OverCompositeOp);
image.magick(type);
image.animationDelay(delay == 0 ? image.animationDelay() : delay);
captioned.push_back(image);

17
natives/speed.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -83,7 +84,13 @@ Napi::Value Speed(const Napi::CallbackInfo &info) {
Blob blob;
list<Image> frames;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
for (list<Image>::iterator i = frames.begin(); i != frames.end(); ++i) {
int index = distance(frames.begin(), i);
@ -126,7 +133,13 @@ Napi::Value Speed(const Napi::CallbackInfo &info) {
Blob blob;
list<Image> frames;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
for (int i = 0; i < speed - 1; ++i) {
frames.remove_if([counter = 0](const auto x) mutable {

9
natives/spin.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Spin(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
if (type != "gif") {

9
natives/swirl.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Swirl(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/tile.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Tile(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

9
natives/trump.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -22,7 +23,13 @@ Napi::Value Trump(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
Image watermark;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read("./assets/images/trump.png");
coalesceImages(&coalesced, frames.begin(), frames.end());

9
natives/uncaption.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Uncaption(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
Image firstImage = coalesced.front();

9
natives/wall.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -21,7 +22,13 @@ Napi::Value Wall(const Napi::CallbackInfo &info) {
list<Image> frames;
list<Image> coalesced;
list<Image> mid;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
coalesceImages(&coalesced, frames.begin(), frames.end());
for (Image &image : coalesced) {

8
natives/watermark.cc
View File

@ -32,7 +32,13 @@ Napi::Value Watermark(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
Image watermark;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read(water);
if (resize && append) {
string query(to_string(frames.front().baseColumns()) + "x");

9
natives/wdt.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -22,7 +23,13 @@ Napi::Value Wdt(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> mid;
Image watermark;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
watermark.read("./assets/images/whodidthis.png");
coalesceImages(&coalesced, frames.begin(), frames.end());

9
natives/whisper.cc
View File

@ -1,6 +1,7 @@
#include <Magick++.h>
#include <napi.h>
#include <iostream>
#include <list>
using namespace std;
@ -23,7 +24,13 @@ Napi::Value Whisper(const Napi::CallbackInfo &info) {
list<Image> coalesced;
list<Image> captioned;
Blob caption_blob;
readImages(&frames, Blob(data.Data(), data.Length()));
try {
readImages(&frames, Blob(data.Data(), data.Length()));
} catch (Magick::WarningCoder &warning) {
cerr << "Coder Warning: " << warning.what() << endl;
} catch (Magick::Warning &warning) {
cerr << "Warning: " << warning.what() << endl;
}
size_t width = frames.front().baseColumns();
size_t height = frames.front().baseRows();

6
utils/pagination/awaitinteractions.js
View File

@ -2,10 +2,10 @@
import { EventEmitter } from "events";
class InteractionCollector extends EventEmitter {
constructor(client, message, options = {}) {
constructor(client, message, timeout = 120000) {
super();
this.message = message;
this.options = options;
//this.time = timeout;
this.ended = false;
this.bot = client;
this.listener = async (packet) => {
@ -13,7 +13,7 @@ class InteractionCollector extends EventEmitter {
await this.verify(packet.d.message, packet.d.data.custom_id, packet.d.id, packet.d.token, packet.d.member ? packet.d.member.user.id : packet.d.user.id);
};
this.bot.on("rawWS", this.listener);
if (options.time) setTimeout(() => this.stop("time"), options.time);
setTimeout(() => this.stop("time"), timeout);
}
async verify(message, interaction, id, token, member) {

2
utils/pagination/pagination.js
View File

@ -72,7 +72,7 @@ export default async (client, message, pages, timeout = 120000) => {
};
let currentPage = await client.createMessage(message.channel.id, Object.assign(pages[page], options, pages.length > 1 ? components : {}));
if (pages.length > 1) {
const interactionCollector = new InteractionCollector(client, currentPage, { time: timeout });
const interactionCollector = new InteractionCollector(client, currentPage, timeout);
interactionCollector.on("interaction", async (interaction, id, token, member) => {
if (member === message.author.id) {
switch (interaction) {