@yrpri/api 9.0.220 → 9.0.221

package/agents/managers/subscriptionManager.js

@@ -322,7 +322,7 @@ export class SubscriptionManager {
                 return { freeSubscription: true };
             }
             const stripe = new Stripe(process.env.STRIPE_SECRET_KEY, {
-                apiVersion: "2025-04-30.basil",
+                apiVersion: "2026-03-25.dahlia",
             });
             // Create a PaymentIntent with Stripe
             const paymentIntent = await stripe.paymentIntents.create({
@@ -360,7 +360,7 @@ export class SubscriptionManager {
     async handleSuccessfulPayment(paymentIntentId) {
         try {
             const stripe = new Stripe(process.env.STRIPE_SECRET_KEY, {
-                apiVersion: "2025-04-30.basil",
+                apiVersion: "2026-03-25.dahlia",
             });
             const paymentIntent = await stripe.paymentIntents.retrieve(paymentIntentId);
             if (paymentIntent.status !== "succeeded") {

package/app.js

@@ -3,7 +3,7 @@ import session from "express-session";
 import path from "path";
 import bodyParser from "body-parser";
 import { RedisStore } from "connect-redis";
-import useragent from "express-useragent";
+import { express as useragentExpress } from "express-useragent";
 import requestIp from "request-ip";
 import compression from "compression";
 import { isbot } from "isbot";
@@ -306,17 +306,20 @@ export class YourPrioritiesApi {
                 redisUrl = redisUrl.replace("redis://h:", "redis://:");
             }
             this.redisClient = createClient({
-                legacyMode: false,
                 url: redisUrl,
                 pingInterval: 10000,
-                socket: {
-                    tls: redisUrl.startsWith("rediss://"),
-                    rejectUnauthorized: false,
-                },
+                ...(redisUrl.startsWith("rediss://")
+                    ? {
+                        socket: {
+                            tls: true,
+                            rejectUnauthorized: false,
+                        },
+                    }
+                    : {}),
             });
         }
         else {
-            this.redisClient = createClient({ legacyMode: false });
+            this.redisClient = createClient();
         }
         this.redisClient.on("error", (err) => {
             log.error("App Redis client error", err);
@@ -558,7 +561,7 @@ export class YourPrioritiesApi {
     }
     initializeMiddlewares() {
         this.app.use(this.setupExpresLogger);
-        this.app.use(useragent.express());
+        this.app.use(useragentExpress());
         this.app.use(requestIp.mw());
         this.app.use(bodyParser.json({ limit: "150mb", strict: false }));
         this.app.use(bodyParser.urlencoded({ limit: "150mb", extended: true }));

package/controllers/communities.cjs

@@ -667,7 +667,9 @@ const getCommunity = function (req, done) {
             }
         },
     ], function (error) {
-        log.error("getCommunity", { error: error });
+        if (error) {
+            log.error("getCommunity", { error: error });
+        }
         done(error, community);
     });
 };

package/controllers/groups.cjs

@@ -21,7 +21,7 @@ var sanitizeFilename = require("sanitize-filename");
 var queue = require("../services/workers/queue.cjs");
 const getAllModeratedItemsByGroup = require("../services/engine/moderation/get_moderation_items.cjs").getAllModeratedItemsByGroup;
 const performSingleModerationAction = require("../services/engine/moderation/process_moderation_items.cjs").performSingleModerationAction;
-const request = require("request");
+const request = require("../utils/requestCompat.cjs");
 const { updateAnswerTranslation, } = require("../services/utils/translation_helpers.cjs");
 const { updateSurveyTranslation, } = require("../services/utils/translation_helpers.cjs");
 const { plausibleStatsProxy, getPlausibleStats, } = require("../services/engine/analytics/plausible/manager.cjs");

package/controllers/images.cjs

@@ -7,7 +7,7 @@ var multerMultipartResolver = multer({ dest: "uploads/" }).single("file");
 var auth = require("../authorization.cjs");
 var log = require("../utils/logger.cjs");
 var toJson = require("../utils/to_json.cjs");
-const s3Storage = require("multer-sharp-s3");
+const s3Storage = require("../utils/multerSharpS3Compat.cjs");
 const crypto = require("crypto");
 var queue = require("../services/workers/queue.cjs");
 const aws = require("aws-sdk");
@@ -137,6 +137,9 @@ router.delete("/:groupId/:imageId/deleteImageFromGroup", auth.can("edit group"),
         imageId: req.params.imageId,
     });
 });
+router.delete("/:postId/:imageId/deleteImageFromPost", auth.can("edit post"), (req, res) => {
+    models.Image.removeImageFromCollection(req, res);
+});
 // TODO: Pagination
 router.get("/:imageId/comments", auth.can("view image"), function (req, res) {
     models.Point.findAll({
@@ -317,6 +320,14 @@ router.post("/", isAuthenticated, async function (req, res) {
             }
             catch (err) {
                 log.error("Error saving image record:", err);
+                if (req.file) {
+                    return storage._removeFile(req, req.file, (cleanupError) => {
+                        if (cleanupError) {
+                            log.error("Error cleaning up uploaded image variants:", cleanupError);
+                        }
+                        return res.status(500).json({ error: "Failed to save image record" });
+                    });
+                }
                 return res.status(500).json({ error: "Failed to save image record" });
             }
         });

package/models/domain.cjs

@@ -257,7 +257,7 @@ module.exports = (sequelize, DataTypes) => {
                     provider: "saml",
                     protocol: "saml",
                     strategyObject: "Strategy",
-                    strategyPackage: "passport-saml",
+                    strategyPackage: "@node-saml/passport-saml",
                     certInPemFormat: true,
                     audience: req.hostname,
                     issuer: domain.secret_api_keys.saml.issuer

package/models/image.cjs

@@ -1,5 +1,5 @@
 "use strict";
-const request = require("request").defaults({ encoding: null });
+const request = require("../utils/requestCompat.cjs").defaults({ encoding: null });
 const fs = require("fs");
 const randomstring = require("randomstring");
 const log = require("../utils/logger.cjs");
@@ -271,39 +271,66 @@ module.exports = (sequelize, DataTypes) => {
             else if (postId) {
                 const post = await sequelize.models.Post.findByPk(postId);
                 if (post) {
-                    const isImageInPost = await sequelize.models.Post.findOne({
+                    const postWithImage = await sequelize.models.Post.findOne({
                         where: { id: postId },
                         include: [
                             {
                                 as: "PostImages",
                                 model: sequelize.models.Image,
                                 where: { id: imageId },
-                                required: true,
+                                required: false,
+                            },
+                            {
+                                as: "PostHeaderImages",
+                                model: sequelize.models.Image,
+                                where: { id: imageId },
+                                required: false,
+                            },
+                            {
+                                as: "PostUserImages",
+                                model: sequelize.models.Image,
+                                where: { id: imageId },
+                                required: false,
                             },
                         ],
                     });
-                    if (isImageInPost) {
+                    if (postWithImage?.PostHeaderImages?.length) {
+                        await post.removePostHeaderImage(image);
+                        removed = true;
+                    }
+                    else if (postWithImage?.PostImages?.length) {
                         await post.removePostImage(image);
                         removed = true;
                     }
+                    else if (postWithImage?.PostUserImages?.length) {
+                        await post.removePostUserImage(image);
+                        removed = true;
+                    }
                 }
             }
             if (removed) {
                 image.deleted = true;
                 await image.save();
-                import("../services/llms/imageGeneration/collectionImageGenerator.js").then(async ({ CollectionImageGenerator }) => {
+                import("../services/llms/imageGeneration/s3Service.js").then(async ({ S3Service }) => {
                     try {
-                        const mediaManager = new CollectionImageGenerator();
+                        const mediaManager = new S3Service(process.env.CLOUDFLARE_API_KEY, process.env.CLOUDFLARE_ZONE_ID);
                         await mediaManager.deleteMediaFormatsUrls(image.formats ? JSON.parse(image.formats) : []);
-                        log.info("Deleted image", { imageId: image.id });
-                        res
-                            .status(200)
-                            .json({ message: "Image removed from collection" });
                     }
                     catch (error) {
-                        log.error("Could not delete image", { error });
-                        res.sendStatus(500);
+                        log.warn("Best-effort image cleanup failed", {
+                            imageId: image.id,
+                            error,
+                        });
                     }
+                    log.info("Deleted image", { imageId: image.id });
+                    res.status(200).json({ message: "Image removed from collection" });
+                }).catch((error) => {
+                    log.warn("Best-effort image cleanup import failed", {
+                        imageId: image.id,
+                        error,
+                    });
+                    log.info("Deleted image", { imageId: image.id });
+                    res.status(200).json({ message: "Image removed from collection" });
                 });
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.220",
+  "version": "9.0.221",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -17,126 +17,146 @@
   "type": "module",
   "dependencies": {
     "@airbrake/node": "^2.1.9",
-    "@aws-sdk/client-s3": "^3.803.0",
-    "@google-cloud/aiplatform": "^4.1.0",
-    "@google-cloud/speech": "^7.0.1",
-    "@google-cloud/storage": "^7.16.0",
-    "@google-cloud/translate": "^9.0.1",
+    "@aws-sdk/client-s3": "^3.1029.0",
+    "@google-cloud/aiplatform": "^6.5.0",
+    "@google-cloud/speech": "^7.3.0",
+    "@google-cloud/storage": "^7.19.0",
+    "@google-cloud/translate": "^9.3.0",
     "@google-cloud/vertexai": "^1.10.0",
-    "@google-cloud/vision": "^5.1.0",
-    "@node-saml/passport-saml": "^5.0.1",
-    "@policysynth/agents": "^1.3.172",
+    "@google-cloud/vision": "^5.3.5",
+    "@node-saml/passport-saml": "^5.1.0",
+    "@policysynth/agents": "^1.3.173",
     "async": "^3.2.6",
     "authorized": "^1.0.0",
-    "aws-sdk": "^2.1692.0",
+    "aws-sdk": "^2.1693.0",
     "axios": "^1.9.0",
-    "bcrypt": "^5.1.1",
-    "body-parser": "^2.2.0",
+    "bcrypt": "^6.0.0",
+    "body-parser": "^2.2.2",
     "bullmq": "^5.31.0",
     "bunyan": "^1.8.15",
     "bunyan-prettystream": "git+https://github.com/rbjarnason/node-bunyan-prettystream.git",
     "cheerio": "^1.0.0",
     "color-hash": "^2.0.2",
-    "compression": "^1.8.0",
+    "compression": "^1.8.1",
     "concat-stream": "^2.0.0",
-    "connect-redis": "^8.0.3",
-    "cors": "^2.8.5",
+    "connect-redis": "^9.0.0",
+    "cors": "^2.8.6",
     "deep-equal": "^2.2.3",
-    "docx": "^9.5.0",
+    "docx": "^9.6.1",
     "download-file": "^0.1.5",
-    "ejs": "^3.1.10",
+    "ejs": "^5.0.1",
     "exceljs": "^4.4.0",
-    "express": "^5.1.0",
-    "express-rate-limit": "^7.5.0",
+    "express": "^5.2.1",
+    "express-rate-limit": "^8.3.2",
     "express-session": "git+https://github.com/rbjarnason/session.git#upgrade-21",
-    "express-useragent": "^1.0.15",
+    "express-useragent": "^2.1.0",
     "farmhash": "4.0.1",
+    "form-data": "^4.0.4",
     "html-to-docx": "^1.8.0",
-    "i18next": "^25.1.1",
-    "i18next-fs-backend": "^2.6.0",
+    "i18next": "^26.0.4",
+    "i18next-fs-backend": "^2.6.3",
     "image-size": "^2.0.2",
-    "isbot": "^5.1.27",
+    "isbot": "^5.1.37",
     "iso-639-1": "^3.1.5",
     "jsonrepair": "^3.12.0",
     "knuth-shuffle-seeded": "^1.0.6",
-    "lodash": "^4.17.21",
-    "marked": "^15.0.11",
+    "lodash": "^4.18.1",
+    "marked": "^18.0.0",
     "moment": "^2.30.1",
-    "morgan": "~1.10.0",
-    "multer": "1.4.5-lts.2",
+    "morgan": "^1.10.1",
+    "multer": "^2.1.1",
     "multer-s3": "^3.0.1",
-    "multer-sharp-s3": "^0.2.5",
-    "newrelic": "^12.18.2",
-    "nodemailer": "^7.0.2",
-    "open-graph-scraper": "^6.10.0",
-    "openai": "^4.97.0",
-    "passport": "^0.6.0",
+    "newrelic": "^13.18.0",
+    "nodemailer": "^8.0.5",
+    "open-graph-scraper": "^6.11.0",
+    "openai": "^6.34.0",
+    "passport": "^0.7.0",
     "passport-facebook": "^3.0.0",
     "passport-github": "^1.1.0",
     "passport-google-oauth": "^2.0.0",
     "passport-local": "^1.0.0",
     "passport-openidconnect": "git+https://github.com/rbjarnason/passport-openidconnect.git",
-    "passport-saml": "git+https://github.com/rbjarnason/passport-saml.git#smarternj",
-    "passport-sso": "github:rbjarnason/passport-sso#47afa11ce3dc5a3ac7dbc7fb41946213b1100cee",
-    "pug": "^3.0.3",
+    "passport-sso": "github:rbjarnason/passport-sso#a3f8aa7523fd72eb2221db72eb72a81bf1a7c148",
+    "pug": "^3.0.4",
     "randomstring": "^1.3.1",
-    "rate-limit-redis": "^4.2.0",
-    "redis": "^4.7.0",
-    "replicate": "^1.0.1",
-    "request": "^2.88.2",
+    "rate-limit-redis": "^4.3.1",
+    "redis": "^5.11.0",
+    "replicate": "^1.4.0",
     "request-ip": "^3.3.0",
-    "sanitize-filename": "^1.6.3",
+    "sanitize-filename": "^1.6.4",
     "sequelize": "^6.37.7",
-    "sharp": "^0.34.1",
-    "sitemap": "^8.0.0",
-    "stripe": "^18.1.0",
+    "sharp": "^0.34.5",
+    "sitemap": "^9.0.1",
+    "stripe": "^22.0.1",
     "striptags": "^3.2.0",
-    "uuid": "^11.1.0",
+    "uuid": "^13.0.0",
     "ws": "^8.18.2"
   },
   "devDependencies": {
-    "@maxmind/geoip2-node": "^6.1.0",
-    "@tsconfig/node22": "^22.0.1",
-    "@types/bcrypt": "^5.0.2",
+    "@maxmind/geoip2-node": "^6.3.4",
+    "@tsconfig/node22": "^22.0.5",
+    "@types/bcrypt": "^6.0.0",
     "@types/bunyan": "^1.8.11",
     "@types/bunyan-prettystream": "^0.1.35",
-    "@types/compression": "^1.7.5",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^5.0.1",
-    "@types/express-session": "^1.18.1",
+    "@types/compression": "^1.8.1",
+    "@types/cors": "^2.8.19",
+    "@types/express": "^5.0.6",
+    "@types/express-session": "^1.18.2",
     "@types/express-useragent": "^1.0.5",
-    "@types/lodash": "^4.17.16",
-    "@types/marked": "^6.0.0",
-    "@types/morgan": "^1.9.9",
-    "@types/node": "^22.15.12",
+    "@types/lodash": "^4.17.24",
+    "@types/morgan": "^1.9.10",
+    "@types/node": "^22.19.17",
     "@types/passport": "^1.0.17",
     "@types/request-ip": "^0.0.41",
-    "@types/sharp": "^0.32.0",
     "@types/uuid": "^10.0.0",
     "@types/ws": "^8.18.1",
     "axios": "^1.9.0",
     "copyfiles": "^2.4.1",
-    "csv-parse": "^5.6.0",
+    "csv-parse": "^6.2.1",
     "diacritics": "^1.3.0",
-    "jshint": "^2.13.6",
     "jslint": "^0.12.1",
     "ncp": "^2.0.0",
-    "nodemon": "^3.1.10",
+    "nodemon": "^3.1.14",
     "random-words": "^2.0.1",
-    "sequelize-cli": "^6.6.3",
+    "tar": "^7.5.13",
     "temp": "^0.9.4",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.3",
-    "uuid": "^11.1.0",
+    "typescript": "^5.9.3",
     "wordwrap": "^1.0.0",
     "ws": "^8.18.2",
     "yamljs": "^0.3.0"
   },
+  "overrides": {
+    "basic-ftp": "^5.2.2",
+    "@xmldom/xmldom": "0.8.12",
+    "validator": "13.15.35",
+    "path-to-regexp": "8.4.2",
+    "picomatch": "2.3.2",
+    "copyfiles": {
+      "minimatch": "3.1.4"
+    },
+    "readdir-glob": {
+      "minimatch": "5.1.9"
+    },
+    "@types/request": {
+      "form-data": "2.5.4"
+    },
+    "graphql-request": {
+      "form-data": "3.0.4"
+    },
+    "prebuild-install": {
+      "tar-fs": "2.1.4"
+    },
+    "prebuildify": {
+      "tar-fs": "2.1.4"
+    }
+  },
   "scripts": {
     "copyInLocalAgents": "cp -R ../../policy-synth/agents/ts-out/* ./node_modules/@policysynth/agents/;cp ../../policy-synth/agents/src/*.d.ts ./node_modules/@policysynth/agents/;",
     "publish_live_with_copy": "npm run build:dev;copyfiles './src/utils/**/*.d.ts' './src/controllers/**/*.d.ts' './src/agents/**/*.d.ts' './src/models/**/*.d.ts' './src/services/controllers/**/*.d.ts' './src/services/models/**/*.d.ts' 'ts-out/';npm pack && node repack && node publish.js https://registry.npmjs.org/",
     "publish_live": "npm run build:dev;npm pack && node repack && node publish.js https://registry.npmjs.org/",
     "publish_local": "npm run build;npm pack && node repack && node publish.js http://localhost:4873",
+    "test": "node --test ./src/tests/*.test.cjs",
     "start": "nodemon -e ts ts-out/server.js",
     "watch-start": "DEBUG=router:* tsc --outDir ./ts-out -w & nodemon -q ./ts-out/server.js",
     "dev": "nodemon --config nodemon.json ./ts-out/server.js",

package/scripts/cloning/clearUsersForCommunitiesFromUrl.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const type = process.argv[3];

package/scripts/cloning/cloneFromUrlScript.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const copyCommunityWithEverything = require('../../utils/copy_utils').copyCommunityWithEverything;
 const communityId = process.argv[2];
 const domainId = process.argv[3];

package/scripts/cloning/cloneWBFromUrlScriptAndCreateLinks.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const copyCommunityWithEverything = require('../../utils/copy_utils').copyCommunityWithEverything;
 const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 const domainId = process.argv[2];

package/scripts/cloning/cloneWBFromUrlScriptNoUsersOrPoints.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const copyCommunityNoUsersNoEndorsementsNoPoints = require('../../utils/copy_utils').copyCommunityNoUsersNoEndorsementsNoPoints;
 const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 const domainId = process.argv[2];

package/scripts/cloning/cloneWBSerbianFromUrlScriptAndCreateLinks.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const copyCommunityWithEverything = require('../../utils/copy_utils').copyCommunityWithEverything;
 const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 const domainId = process.argv[2];

package/scripts/cloning/copyCommunityConfigAndTranslationsFromURL.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const type = process.argv[3];

package/scripts/cloning/copyGroupConfigAndTranslationsFromURL.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const type = process.argv[3];

package/scripts/cloning/copyPostVideosFromURL.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const urlToConfig = process.argv[3];

package/scripts/cloning/deepCloneSerbianWBFromUrlScriptAndCreateLinks.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const deepCopyCommunityOnlyStructureWithAdminsAndPosts = require('../../utils/copy_utils').deepCopyCommunityOnlyStructureWithAdminsAndPosts;
 const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 let domainId = process.argv[2];

package/scripts/cloning/deepCloneWBFromUrlScriptAndCreateLinks.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const deepCopyCommunityOnlyStructureWithAdminsAndPosts = require('../../utils/copy_utils').deepCopyCommunityOnlyStructureWithAdminsAndPosts;
 const updateTranslation = require('../../services/utils/translation_helpers').updateTranslation;
 let domainId = process.argv[2];

package/scripts/cloning/setAdminsFromURL.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const urlToConfig = process.argv[3];

package/scripts/cloning/setExternalIdsFromURL.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const cloneTranslationForConfig = require('../../services/utils/translation_cloning').cloneTranslationForConfig;
 const userId = process.argv[2];
 const urlToConfig = process.argv[3];

package/scripts/endorsementFraudDetection/bulkDeleteDuplicateEndorsmentsFromUrl.js

@@ -2,7 +2,7 @@ const models = require('../../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../../utils/requestCompat.cjs");
 const recountCommunity = require('../../utils/recount_utils.cjs').recountCommunity;
 const recountPost = require('../../utils/recount_utils.cjs').recountPost;
 const communityId = process.argv[2];

package/scripts/landUseGame/export3Ddata.js

@@ -1,4 +1,4 @@
-const { post } = require("request");
+const { post } = require("../../utils/requestCompat.cjs");
 const queue = require("../../services/workers/queue.cjs");
 const models = require("../../models/index.cjs");
 const fs = require("fs");

package/scripts/movePostsToGroupsRecountGroupFromUrl.js

@@ -2,7 +2,7 @@ const models = require('../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../utils/requestCompat.cjs");
 /*
 const urlToConfig = "https://yrpri-eu-direct-assets.s3-eu-west-1.amazonaws.com/WBMoveIdeas160221.csv"//process.argv[1];
 const urlToAddAddFront = "https://kyrgyz-aris.yrpri.org/"; // process.argv[2];

package/scripts/recountALLCommunityGroupCounts.js

@@ -2,7 +2,7 @@ const models = require('../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../utils/requestCompat.cjs");
 models.Community.findAll({
     attributes: ['id', 'counter_groups']
 }).then(allCommunities => {

package/scripts/recountCommunitesFromUrl.js

@@ -2,7 +2,7 @@ const models = require('../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../utils/requestCompat.cjs");
 const recountCommunity = require('../utils/recount_utils.cjs').recountCommunity;
 /*
 const urlToConfig = "https://yrpri-eu-direct-assets.s3-eu-west-1.amazonaws.com/WBMoveIdeas160221.csv"//process.argv[1];

package/scripts/recountCommunity.js

@@ -2,7 +2,7 @@ const models = require('../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../utils/requestCompat.cjs");
 const recountCommunity = require('../utils/recount_utils.cjs').recountCommunity;
 /*
 const urlToConfig = "https://yrpri-eu-direct-assets.s3-eu-west-1.amazonaws.com/WBMoveIdeas160221.csv"//process.argv[1];

package/scripts/setLanguageOnGroupCommunitesFromUrl.js

@@ -2,7 +2,7 @@ const models = require('../models/index.cjs');
 const async = require('async');
 const _ = require('lodash');
 const fs = require('fs');
-const request = require('request');
+const request = require("../utils/requestCompat.cjs");
 /*
 const urlToConfig = "https://yrpri-eu-direct-assets.s3-eu-west-1.amazonaws.com/WB_ResetLanguageOnCommuntiesList_16_02_21.csv"//process.argv[1];
 const toLanguage = "ru"; // process.argv[2];