From ff8430663720f4ea308fd69b58cacc9f92881b99 Mon Sep 17 00:00:00 2001 From: Essem Date: Wed, 22 Jun 2022 11:00:31 -0500 Subject: [PATCH] Change default searx URL, update packages --- natives/caption.cc | 4 +- natives/caption2.cc | 4 +- natives/crop.cc | 4 +- natives/deepfry.cc | 4 +- natives/flag.cc | 4 +- natives/flip.cc | 4 +- natives/freeze.cc | 4 +- natives/gamexplain.cc | 4 +- natives/globe.cc | 6 +- natives/jpeg.cc | 4 +- natives/meme.cc | 4 +- natives/mirror.cc | 4 +- natives/motivate.cc | 4 +- natives/reddit.cc | 4 +- natives/resize.cc | 9 ++- natives/reverse.cc | 4 +- natives/snapchat.cc | 4 +- natives/speed.cc | 4 +- natives/uncaption.cc | 4 +- natives/watermark.cc | 4 +- natives/whisper.cc | 4 +- natives/zamn.cc | 4 +- pnpm-lock.yaml | 126 +++++++++++++++++++++++------------------- servers.json | 2 +- 24 files changed, 119 insertions(+), 104 deletions(-) diff --git a/natives/caption.cc b/natives/caption.cc index fa45e27..ecb68dd 100644 --- a/natives/caption.cc +++ b/natives/caption.cc @@ -25,7 +25,7 @@ Napi::Value Caption(const Napi::CallbackInfo &info) { int width = in.width(); int size = width / 10; int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); int textWidth = width - ((width / 25) * 2); string font_string = (font == "roboto" ? "Roboto Condensed" : font) + " " + @@ -47,7 +47,7 @@ Napi::Value Caption(const Napi::CallbackInfo &info) { VImage::option()->set("extend", "white")); vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; VImage frame = captionImage.join( diff --git a/natives/caption2.cc b/natives/caption2.cc index afc9051..446a030 100644 --- a/natives/caption2.cc +++ b/natives/caption2.cc @@ -27,7 +27,7 @@ Napi::Value CaptionTwo(const Napi::CallbackInfo &info) { int width = in.width(); int size = width / 13; int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); int textWidth = width - ((width / 25) * 2); string font_string = @@ -48,7 +48,7 @@ Napi::Value CaptionTwo(const Napi::CallbackInfo &info) { VImage::option()->set("extend", "white")); vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; VImage frame = diff --git a/natives/crop.cc b/natives/crop.cc index 260d76d..8072434 100644 --- a/natives/crop.cc +++ b/natives/crop.cc @@ -22,11 +22,11 @@ Napi::Value Crop(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); vector img; int finalHeight = 0; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; int frameWidth = img_frame.width(); diff --git a/natives/deepfry.cc b/natives/deepfry.cc index 5ea6db2..240f33b 100644 --- a/natives/deepfry.cc +++ b/natives/deepfry.cc @@ -27,14 +27,14 @@ Napi::Value Deepfry(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); int totalHeight = in.height(); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); VImage fried = (in * 1.3 - (255.0 * 1.3 - 255.0)) * 1.5; VImage final; if (totalHeight > 65500 && type == "gif") { vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = in.crop(0, i * pageHeight, width, pageHeight); void *jpgBuf; size_t jpgLength; diff --git a/natives/flag.cc b/natives/flag.cc index dd34eb1..4115f29 100644 --- a/natives/flag.cc +++ b/natives/flag.cc @@ -25,7 +25,7 @@ Napi::Value Flag(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); string assetPath = basePath + overlay; VImage overlayInput = VImage::new_from_file(assetPath.c_str()); @@ -41,7 +41,7 @@ Napi::Value Flag(const Napi::CallbackInfo &info) { } vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; VImage composited = diff --git a/natives/flip.cc b/natives/flip.cc index 7cffcb1..2426459 100644 --- a/natives/flip.cc +++ b/natives/flip.cc @@ -30,8 +30,8 @@ Napi::Value Flip(const Napi::CallbackInfo &info) { // libvips gif handling is both a blessing and a curse vector img; int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); - for (int i = 0; i < n_pages; i++) { + int nPages = vips_image_get_n_pages(in.get_image()); + for (int i = 0; i < nPages; i++) { VImage img_frame = in.crop(0, i * pageHeight, in.width(), pageHeight); VImage flipped = img_frame.flip(VIPS_DIRECTION_VERTICAL); img.push_back(flipped); diff --git a/natives/freeze.cc b/natives/freeze.cc index ac773bf..68e5cf4 100644 --- a/natives/freeze.cc +++ b/natives/freeze.cc @@ -59,8 +59,8 @@ Napi::Value Freeze(const Napi::CallbackInfo &info) { if (!in.has_alpha()) in = in.bandjoin(255); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); - int framePos = clamp(frame, 0, (int)n_pages); + int nPages = vips_image_get_n_pages(in.get_image()); + int framePos = clamp(frame, 0, (int)nPages); VImage out = in.crop(0, 0, in.width(), pageHeight * (framePos + 1)); out.set(VIPS_META_PAGE_HEIGHT, pageHeight); out.set("loop", loop ? 0 : 1); diff --git a/natives/gamexplain.cc b/natives/gamexplain.cc index 6f8d25a..d93ac25 100644 --- a/natives/gamexplain.cc +++ b/natives/gamexplain.cc @@ -27,10 +27,10 @@ Napi::Value Gamexplain(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; VImage resized = img_frame diff --git a/natives/globe.cc b/natives/globe.cc index 06fc9ad..69ab03b 100644 --- a/natives/globe.cc +++ b/natives/globe.cc @@ -26,7 +26,7 @@ Napi::Value Globe(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = type == "gif" ? vips_image_get_n_pages(in.get_image()) : 30; + int nPages = type == "gif" ? vips_image_get_n_pages(in.get_image()) : 30; double size = min(width, pageHeight); @@ -52,14 +52,14 @@ Napi::Value Globe(const Napi::CallbackInfo &info) { size; vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; VImage resized = img_frame.resize( size / (double)width, VImage::option()->set("vscale", size / (double)pageHeight)); VImage rolled = img_frame.wrap( - VImage::option()->set("x", width * i / n_pages)->set("y", 0)); + VImage::option()->set("x", width * i / nPages)->set("y", 0)); VImage extracted = rolled.extract_band(0, VImage::option()->set("n", 3)); VImage mapped = extracted.mapim(distort); VImage composited = mapped * diffuse + specular; diff --git a/natives/jpeg.cc b/natives/jpeg.cc index d3484d6..aa72034 100644 --- a/natives/jpeg.cc +++ b/natives/jpeg.cc @@ -30,13 +30,13 @@ Napi::Value Jpeg(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); int totalHeight = in.height(); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); VImage final; if (totalHeight > 65500) { vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = in.crop(0, i * pageHeight, width, pageHeight); void *jpgBuf; size_t jpgLength; diff --git a/natives/meme.cc b/natives/meme.cc index 606ca8d..b9b40f1 100644 --- a/natives/meme.cc +++ b/natives/meme.cc @@ -26,7 +26,7 @@ Napi::Value Meme(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); int size = width / 9; int dividedWidth = width / 1000; int rad = 1; @@ -104,7 +104,7 @@ Napi::Value Meme(const Napi::CallbackInfo &info) { } vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; if (top != "") { diff --git a/natives/mirror.cc b/natives/mirror.cc index a82b8f0..d2cd0be 100644 --- a/natives/mirror.cc +++ b/natives/mirror.cc @@ -33,9 +33,9 @@ Napi::Value Mirror(const Napi::CallbackInfo &info) { // once again, libvips gif handling is both a blessing and a curse vector img; int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); bool isOdd = pageHeight % 2; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { int x = (i * pageHeight) + (first ? 0 : (pageHeight / 2)); VImage cropped = in.crop(0, x, in.width(), pageHeight / 2); VImage flipped = cropped.flip(VIPS_DIRECTION_VERTICAL); diff --git a/natives/motivate.cc b/natives/motivate.cc index 388abd0..af506fc 100644 --- a/natives/motivate.cc +++ b/natives/motivate.cc @@ -27,7 +27,7 @@ Napi::Value Motivate(const Napi::CallbackInfo &info) { int width = in.width(); int size = width / 5; int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); int textWidth = width - ((width / 25) * 2); string font_string = font == "roboto" ? "Roboto Condensed" : font; @@ -59,7 +59,7 @@ Napi::Value Motivate(const Napi::CallbackInfo &info) { vector img; int height; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; diff --git a/natives/reddit.cc b/natives/reddit.cc index f319a5b..7f36322 100644 --- a/natives/reddit.cc +++ b/natives/reddit.cc @@ -27,7 +27,7 @@ Napi::Value Reddit(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); string captionText = "" + text + ""; @@ -45,7 +45,7 @@ Napi::Value Reddit(const Napi::CallbackInfo &info) { composited.resize((double)width / (double)composited.width()); vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; VImage frame = img_frame.join(watermark, VIPS_DIRECTION_VERTICAL, diff --git a/natives/resize.cc b/natives/resize.cc index 78716d9..291ae8e 100644 --- a/natives/resize.cc +++ b/natives/resize.cc @@ -28,6 +28,7 @@ Napi::Value Resize(const Napi::CallbackInfo &info) { VImage out; int width = in.width(); + int totalHeight = in.height(); int pageHeight = vips_image_get_page_height(in.get_image()); int finalHeight; @@ -40,8 +41,12 @@ Napi::Value Resize(const Napi::CallbackInfo &info) { out = in.resize(9.5, VImage::option()->set("vscale", 0.5)); finalHeight = pageHeight / 2; } else { - out = in.resize(0.1).resize( - 10, VImage::option()->set("kernel", VIPS_KERNEL_NEAREST)); + VImage small = in.resize(0.1); + out = + small.resize((double)width / small.width(), + VImage::option() + ->set("vscale", (double)totalHeight / small.height()) + ->set("kernel", VIPS_KERNEL_NEAREST)); finalHeight = pageHeight; } out.set(VIPS_META_PAGE_HEIGHT, finalHeight); diff --git a/natives/reverse.cc b/natives/reverse.cc index 05525d4..ad41db2 100644 --- a/natives/reverse.cc +++ b/natives/reverse.cc @@ -22,11 +22,11 @@ Napi::Value Reverse(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); vector split; // todo: find a better way of getting individual frames (or at least getting the frames in reverse order) - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = in.crop(0, i * pageHeight, width, pageHeight); split.push_back(img_frame); } diff --git a/natives/snapchat.cc b/natives/snapchat.cc index b0462df..c24c2fc 100644 --- a/natives/snapchat.cc +++ b/natives/snapchat.cc @@ -26,7 +26,7 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); int size = width / 20; int textWidth = width - ((width / 25) * 2); @@ -52,7 +52,7 @@ Napi::Value Snapchat(const Napi::CallbackInfo &info) { ->set("background", (vector){0, 0, 0, 178})); vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; img_frame = img_frame.composite2( diff --git a/natives/speed.cc b/natives/speed.cc index d751d4b..9aded07 100644 --- a/natives/speed.cc +++ b/natives/speed.cc @@ -23,10 +23,10 @@ void vipsRemove(Napi::Env *env, Napi::Object *result, Napi::Buffer data, int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); vector img; - for (int i = 0; i < n_pages; i += speed) { + for (int i = 0; i < nPages; i += speed) { VImage img_frame = in.crop(0, i * pageHeight, width, pageHeight); img.push_back(img_frame); } diff --git a/natives/uncaption.cc b/natives/uncaption.cc index b890081..d7bea0f 100644 --- a/natives/uncaption.cc +++ b/natives/uncaption.cc @@ -26,7 +26,7 @@ Napi::Value Uncaption(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); VImage first = in.crop(0, 0, 3, pageHeight).colourspace(VIPS_INTERPRETATION_B_W) > @@ -40,7 +40,7 @@ Napi::Value Uncaption(const Napi::CallbackInfo &info) { newHeight = pageHeight; top = 0; } - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = in.crop(0, (i * pageHeight) + top, width, newHeight); img.push_back(img_frame); diff --git a/natives/watermark.cc b/natives/watermark.cc index ab2f588..7431d67 100644 --- a/natives/watermark.cc +++ b/natives/watermark.cc @@ -41,7 +41,7 @@ Napi::Value Watermark(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); if (resize && append) { watermark = watermark.resize((double)width / (double)watermark.width()); @@ -89,7 +89,7 @@ Napi::Value Watermark(const Napi::CallbackInfo &info) { VImage frameAlpha; VImage bg; VImage frame; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; if (append) { diff --git a/natives/whisper.cc b/natives/whisper.cc index 54c0a9e..2925db0 100644 --- a/natives/whisper.cc +++ b/natives/whisper.cc @@ -24,7 +24,7 @@ Napi::Value Whisper(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); int size = width / 6; int dividedWidth = width / 175; int rad = 1; @@ -64,7 +64,7 @@ Napi::Value Whisper(const Napi::CallbackInfo &info) { VImage textImg = outline.composite2(textIn, VIPS_BLEND_MODE_OVER); vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; img_frame = img_frame.composite2( diff --git a/natives/zamn.cc b/natives/zamn.cc index 80c1940..9b05eb7 100644 --- a/natives/zamn.cc +++ b/natives/zamn.cc @@ -24,13 +24,13 @@ Napi::Value Zamn(const Napi::CallbackInfo &info) { int width = in.width(); int pageHeight = vips_image_get_page_height(in.get_image()); - int n_pages = vips_image_get_n_pages(in.get_image()); + int nPages = vips_image_get_n_pages(in.get_image()); string assetPath = basePath + "assets/images/zamn.png"; VImage tmpl = VImage::new_from_file(assetPath.c_str()); vector img; - for (int i = 0; i < n_pages; i++) { + for (int i = 0; i < nPages; i++) { VImage img_frame = type == "gif" ? in.crop(0, i * pageHeight, width, pageHeight) : in; VImage composited = tmpl.insert( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7d2456..2e6c5c2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,34 +2,34 @@ lockfileVersion: 5.4 specifiers: '@babel/core': ^7.18.5 - '@babel/eslint-parser': ^7.13.8 - '@babel/eslint-plugin': ^7.13.0 - '@babel/plugin-proposal-class-properties': ^7.13.0 - '@top-gg/sdk': ^3.1.1 - better-sqlite3: ^7.4.1 - bufferutil: ^4.0.1 - cmake-js: ^6.3.0 - dotenv: ^16.0.0 - emoji-regex: ^10.0.0 + '@babel/eslint-parser': ^7.18.2 + '@babel/eslint-plugin': ^7.17.7 + '@babel/plugin-proposal-class-properties': ^7.17.12 + '@top-gg/sdk': ^3.1.3 + better-sqlite3: ^7.5.3 + bufferutil: ^4.0.6 + cmake-js: ^6.3.2 + dotenv: ^16.0.1 + emoji-regex: ^10.1.0 eris: ^0.17.0 eris-fleet: ^1.0.2 erlpack: github:abalabahaha/erlpack - eslint: ^8.2.0 + eslint: ^8.18.0 eslint-plugin-unicorn: ^42.0.0 - file-type: ^17.1.1 + file-type: ^17.1.2 format-duration: ^2.0.0 - jsqr: ^1.3.1 + jsqr: ^1.4.0 node-addon-api: ^5.0.0 - node-emoji: ^1.10.0 - node-fetch: ^3.2.0 - pg: ^8.5.1 - qrcode: ^1.4.4 + node-emoji: ^1.11.0 + node-fetch: ^3.2.6 + pg: ^8.7.3 + qrcode: ^1.5.0 sharp: ^0.30.6 shoukaku: ^3.1.0 - uuid: ^8.3.1 - winston: ^3.3.3 - ws: ^8.2.3 - zlib-sync: ^0.1.6 + uuid: ^8.3.2 + winston: ^3.7.2 + ws: ^8.8.0 + zlib-sync: ^0.1.7 dependencies: '@top-gg/sdk': 3.1.3 @@ -60,11 +60,11 @@ optionalDependencies: devDependencies: '@babel/core': 7.18.5 - '@babel/eslint-parser': 7.18.2_mw7va3pzj4xh5zikainml3ydb4 - '@babel/eslint-plugin': 7.17.7_gjscxi3rpcxdza6jsnsobts4zu + '@babel/eslint-parser': 7.18.2_cz6e4qppzra6gosrrzcvbsxiom + '@babel/eslint-plugin': 7.17.7_a4sa3qzka4aqdiwldsemtyw33a '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.5 - eslint: 8.17.0 - eslint-plugin-unicorn: 42.0.0_eslint@8.17.0 + eslint: 8.18.0 + eslint-plugin-unicorn: 42.0.0_eslint@8.18.0 packages: @@ -111,7 +111,7 @@ packages: - supports-color dev: true - /@babel/eslint-parser/7.18.2_mw7va3pzj4xh5zikainml3ydb4: + /@babel/eslint-parser/7.18.2_cz6e4qppzra6gosrrzcvbsxiom: resolution: {integrity: sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: @@ -119,21 +119,21 @@ packages: eslint: ^7.5.0 || ^8.0.0 dependencies: '@babel/core': 7.18.5 - eslint: 8.17.0 + eslint: 8.18.0 eslint-scope: 5.1.1 eslint-visitor-keys: 2.1.0 semver: 6.3.0 dev: true - /@babel/eslint-plugin/7.17.7_gjscxi3rpcxdza6jsnsobts4zu: + /@babel/eslint-plugin/7.17.7_a4sa3qzka4aqdiwldsemtyw33a: resolution: {integrity: sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: '@babel/eslint-parser': '>=7.11.0' eslint: '>=7.5.0' dependencies: - '@babel/eslint-parser': 7.18.2_mw7va3pzj4xh5zikainml3ydb4 - eslint: 8.17.0 + '@babel/eslint-parser': 7.18.2_cz6e4qppzra6gosrrzcvbsxiom + eslint: 8.18.0 eslint-rule-composer: 0.3.0 dev: true @@ -162,7 +162,7 @@ packages: '@babel/compat-data': 7.18.5 '@babel/core': 7.18.5 '@babel/helper-validator-option': 7.16.7 - browserslist: 4.20.4 + browserslist: 4.21.0 semver: 6.3.0 dev: true @@ -588,16 +588,15 @@ packages: balanced-match: 1.0.2 concat-map: 0.0.1 - /browserslist/4.20.4: - resolution: {integrity: sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==} + /browserslist/4.21.0: + resolution: {integrity: sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001352 - electron-to-chromium: 1.4.154 - escalade: 3.1.1 + caniuse-lite: 1.0.30001358 + electron-to-chromium: 1.4.165 node-releases: 2.0.5 - picocolors: 1.0.0 + update-browserslist-db: 1.0.3_browserslist@4.21.0 dev: true /buffer-indexof-polyfill/1.0.2: @@ -660,8 +659,8 @@ packages: engines: {node: '>=6'} dev: false - /caniuse-lite/1.0.30001352: - resolution: {integrity: sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==} + /caniuse-lite/1.0.30001358: + resolution: {integrity: sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==} dev: true /chainsaw/0.1.0: @@ -691,8 +690,8 @@ packages: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} dev: false - /ci-info/3.3.1: - resolution: {integrity: sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==} + /ci-info/3.3.2: + resolution: {integrity: sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==} dev: true /clean-regexp/1.0.0: @@ -889,8 +888,8 @@ packages: readable-stream: 2.1.5 dev: false - /electron-to-chromium/1.4.154: - resolution: {integrity: sha512-GbV9djOkrnj6xmW+YYVVEI3VCQnJ0pnSTu7TW2JyjKd5cakoiSaG5R4RbEtfaD92GsY10DzbU3GYRe+IOA9kqA==} + /electron-to-chromium/1.4.165: + resolution: {integrity: sha512-DKQW1lqUSAYQvn9dnpK7mWaDpWbNOXQLXhfCi7Iwx0BKxdZOxkKcCyKw1l3ihWWW5iWSxKKbhEUoNRoHvl/hbA==} dev: true /emoji-regex/10.1.0: @@ -957,17 +956,17 @@ packages: engines: {node: '>=10'} dev: true - /eslint-plugin-unicorn/42.0.0_eslint@8.17.0: + /eslint-plugin-unicorn/42.0.0_eslint@8.18.0: resolution: {integrity: sha512-ixBsbhgWuxVaNlPTT8AyfJMlhyC5flCJFjyK3oKE8TRrwBnaHvUbuIkCM1lqg8ryYrFStL/T557zfKzX4GKSlg==} engines: {node: '>=12'} peerDependencies: eslint: '>=8.8.0' dependencies: '@babel/helper-validator-identifier': 7.16.7 - ci-info: 3.3.1 + ci-info: 3.3.2 clean-regexp: 1.0.0 - eslint: 8.17.0 - eslint-utils: 3.0.0_eslint@8.17.0 + eslint: 8.18.0 + eslint-utils: 3.0.0_eslint@8.18.0 esquery: 1.4.0 indent-string: 4.0.0 is-builtin-module: 3.1.0 @@ -1001,13 +1000,13 @@ packages: estraverse: 5.3.0 dev: true - /eslint-utils/3.0.0_eslint@8.17.0: + /eslint-utils/3.0.0_eslint@8.18.0: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.17.0 + eslint: 8.18.0 eslint-visitor-keys: 2.1.0 dev: true @@ -1021,8 +1020,8 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint/8.17.0: - resolution: {integrity: sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==} + /eslint/8.18.0: + resolution: {integrity: sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: @@ -1035,7 +1034,7 @@ packages: doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.1.1 - eslint-utils: 3.0.0_eslint@8.17.0 + eslint-utils: 3.0.0_eslint@8.18.0 eslint-visitor-keys: 3.3.0 espree: 9.3.2 esquery: 1.4.0 @@ -1545,8 +1544,8 @@ packages: /lodash/4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - /logform/2.4.0: - resolution: {integrity: sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==} + /logform/2.4.1: + resolution: {integrity: sha512-7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A==} dependencies: '@colors/colors': 1.5.0 fecha: 4.2.3 @@ -1686,7 +1685,7 @@ packages: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} dependencies: hosted-git-info: 2.8.9 - resolve: 1.22.0 + resolve: 1.22.1 semver: 5.7.1 validate-npm-package-license: 3.0.4 dev: true @@ -2076,8 +2075,8 @@ packages: engines: {node: '>=4'} dev: true - /resolve/1.22.0: - resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==} + /resolve/1.22.1: + resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==} hasBin: true dependencies: is-core-module: 2.9.0 @@ -2466,6 +2465,17 @@ packages: setimmediate: 1.0.5 dev: false + /update-browserslist-db/1.0.3_browserslist@4.21.0: + resolution: {integrity: sha512-ufSazemeh9Gty0qiWtoRpJ9F5Q5W3xdIPm1UZQqYQv/q0Nyb9EMHUB2lu+O9x1re9WsorpMAUu4Y6Lxcs5n+XQ==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + dependencies: + browserslist: 4.21.0 + escalade: 3.1.1 + picocolors: 1.0.0 + dev: true + /uri-js/4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: @@ -2543,7 +2553,7 @@ packages: resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==} engines: {node: '>= 6.4.0'} dependencies: - logform: 2.4.0 + logform: 2.4.1 readable-stream: 3.6.0 triple-beam: 1.3.0 dev: false @@ -2555,7 +2565,7 @@ packages: '@dabh/diagnostics': 2.0.3 async: 3.2.4 is-stream: 2.0.1 - logform: 2.4.0 + logform: 2.4.1 one-time: 1.0.0 readable-stream: 3.6.0 safe-stable-stringify: 2.3.1 diff --git a/servers.json b/servers.json index 80add57..cada2f4 100644 --- a/servers.json +++ b/servers.json @@ -6,6 +6,6 @@ { "server": "localhost", "auth": "verycoolpass100", "tls": false } ], "searx": [ - "https://searx.xyz" + "https://searx.projectlounge.pw" ] } \ No newline at end of file