@yrpri/api 9.0.179 → 9.0.181

package/controllers/groups.cjs

@@ -995,9 +995,7 @@ router.post("/:groupId/sendEmailInvitesForAnons", auth.can("edit group"), async
             });
             return;
         }
-        const emailArray = emails
-            .split("\n")
-            .map((email) => email.trim());
+        const emailArray = emails.split("\n").map((email) => email.trim());
         // Validate each email
         const validEmails = emailArray.filter((email) => {
             // Basic email validation regex
@@ -2518,7 +2516,9 @@ router.post("/:id/clone", auth.can("edit group"), function (req, res) {
                     res.send({ id: newGroup.id });
                 }
                 else {
-                    log.error("Group Cloned succeeded but newGroup is missing", { groupId: req.params.id });
+                    log.error("Group Cloned succeeded but newGroup is missing", {
+                        groupId: req.params.id,
+                    });
                     res.sendStatus(500);
                 }
             });
@@ -2531,72 +2531,95 @@ router.post("/:id/clone", auth.can("edit group"), function (req, res) {
         sendGroupOrError(res, null, "delete", req.user, error);
     });
 });
-router.post("/:id/cloneToCommunity/:communityId", auth.can("edit group"), auth.can("edit community"), function (req, res) {
-    models.Group.findOne({
+router.post("/:id/cloneToCommunity/:communityId", auth.can("edit group"), function (req, res) {
+    models.Community.findOne({
         attributes: ["id"],
-        where: { id: req.params.id },
+        where: { id: req.params.communityId },
     })
-        .then(function (group) {
-        if (group) {
-            models.Community.findOne({
-                where: { id: req.params.communityId },
-                attributes: ["id", "domain_id"],
-                include: [
-                    {
-                        model: models.Domain,
-                        attributes: ["id"],
-                    },
-                ],
-            })
-                .then(function (community) {
-                if (community) {
-                    community.hasCommunityAdmins(req.user).then(function (isAdmin) {
-                        if (isAdmin) {
-                            copyGroup(group.id, community, community.domain_id, { skipUsers: true, skipActivities: true }, (error, newGroup) => {
-                                if (error) {
-                                    log.error("Group Clone To Community Failed", {
-                                        error,
-                                        groupId: req.params.id,
-                                        communityId: req.params.communityId,
-                                    });
-                                    res.sendStatus(500);
-                                }
-                                else if (newGroup) {
-                                    log.info("Group Cloned To Community", {
-                                        groupId: req.params.id,
-                                        newGroupId: newGroup.id,
-                                        communityId: req.params.communityId,
-                                    });
-                                    res.send({ id: newGroup.id });
-                                }
-                                else {
-                                    log.error("Group Clone To Community succeeded but newGroup is missing", {
-                                        groupId: req.params.id,
-                                        communityId: req.params.communityId,
-                                    });
-                                    res.sendStatus(500);
-                                }
-                            });
-                        }
-                        else {
-                            sendGroupOrError(res, null, "cloneToCommunity", req.user, "Not community admin", 401);
-                        }
-                    });
-                }
-                else {
-                    sendGroupOrError(res, req.params.communityId, "cloneToCommunity", req.user, "Not found", 404);
-                }
-            })
-                .catch(function (error) {
-                sendGroupOrError(res, null, "cloneToCommunity", req.user, error);
-            });
-        }
-        else {
-            sendGroupOrError(res, req.params.id, "cloneToCommunity", req.user, "Not found", 404);
-        }
+        .then(function (community) {
+        community
+            .hasCommunityAdmins(req.user)
+            .then(function (isAdmin) {
+            if (isAdmin) {
+                models.Group.findOne({
+                    attributes: ["id"],
+                    where: { id: req.params.id },
+                })
+                    .then(function (group) {
+                    if (group) {
+                        models.Community.findOne({
+                            where: { id: req.params.communityId },
+                            attributes: ["id", "domain_id"],
+                            include: [
+                                {
+                                    model: models.Domain,
+                                    attributes: ["id"],
+                                },
+                            ],
+                        })
+                            .then(function (community) {
+                            if (community) {
+                                community
+                                    .hasCommunityAdmins(req.user)
+                                    .then(function (isAdmin) {
+                                    if (isAdmin) {
+                                        copyGroup(group.id, community, community.domain_id, { skipUsers: true, skipActivities: true }, (error, newGroup) => {
+                                            if (error) {
+                                                log.error("Group Clone To Community Failed", {
+                                                    error,
+                                                    groupId: req.params.id,
+                                                    communityId: req.params.communityId,
+                                                });
+                                                res.sendStatus(500);
+                                            }
+                                            else if (newGroup) {
+                                                log.info("Group Cloned To Community", {
+                                                    groupId: req.params.id,
+                                                    newGroupId: newGroup.id,
+                                                    communityId: req.params.communityId,
+                                                });
+                                                res.send({ id: newGroup.id });
+                                            }
+                                            else {
+                                                log.error("Group Clone To Community succeeded but newGroup is missing", {
+                                                    groupId: req.params.id,
+                                                    communityId: req.params.communityId,
+                                                });
+                                                res.sendStatus(500);
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        sendGroupOrError(res, null, "cloneToCommunity", req.user, "Not community admin", 401);
+                                    }
+                                });
+                            }
+                            else {
+                                sendGroupOrError(res, req.params.communityId, "cloneToCommunity", req.user, "Not found", 404);
+                            }
+                        })
+                            .catch(function (error) {
+                            sendGroupOrError(res, null, "cloneToCommunity", req.user, error);
+                        });
+                    }
+                    else {
+                        sendGroupOrError(res, req.params.id, "cloneToCommunity", req.user, "Not found", 404);
+                    }
+                })
+                    .catch(function (error) {
+                    sendGroupOrError(res, null, "cloneToCommunity", req.user, error);
+                });
+            }
+            else {
+                sendGroupOrError(res, null, "delete", req.user, "Not authorized");
+            }
+        })
+            .catch(function (error) {
+            sendGroupOrError(res, null, "delete", req.user, error);
+        });
     })
         .catch(function (error) {
-        sendGroupOrError(res, null, "cloneToCommunity", req.user, error);
+        sendGroupOrError(res, null, "delete", req.user, error);
     });
 });
 router.get("/:id/checkNonOpenPosts", auth.can("view group"), (req, res) => {
@@ -4164,10 +4187,10 @@ router.get("/:domainId/getTemplates", auth.can("view domain"), async (req, res)
                             // public templates
                             { access: models.Group.ACCESS_PUBLIC },
                             // templates where user is an admin
-                            literal(`"GroupAdmins"."id" IS NOT NULL`)
-                        ]
-                    }
-                ]
+                            literal(`"GroupAdmins"."id" IS NOT NULL`),
+                        ],
+                    },
+                ],
             },
             include: [
                 {
@@ -4188,14 +4211,14 @@ router.get("/:domainId/getTemplates", auth.can("view domain"), async (req, res)
                             model: models.Domain,
                             attributes: ["id", "name"],
                             required: true,
-                            where: { id: domainId }
+                            where: { id: domainId },
                         },
                     ],
-                }
+                },
             ],
             attributes: ["id", "name"],
             distinct: true,
-            order: [["name", "ASC"]]
+            order: [["name", "ASC"]],
         });
         res.send(templateGroups || []);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.179",
+  "version": "9.0.181",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -25,7 +25,7 @@
     "@google-cloud/vertexai": "^1.10.0",
     "@google-cloud/vision": "^5.1.0",
     "@node-saml/passport-saml": "^5.0.1",
-    "@policysynth/agents": "^1.3.147",
+    "@policysynth/agents": "^1.3.149",
     "async": "^3.2.6",
     "authorized": "^1.0.0",
     "aws-sdk": "^2.1692.0",

package/services/engine/moderation/fraud/FraudScannerNotifier.cjs

@@ -258,7 +258,7 @@ i18n
     // this is the defaults
     backend: {
         // path where resources get loaded from
-        loadPath: i18n.buildLoadPath,
+        loadPath: localesPath + '/{{lng}}/translation.json',
         // path to post missing resources
         addPath: localesPath + '/{{lng}}/translation.missing.json',
         // jsonIndent to use when storing json files

package/services/engine/notifications/process_delayed_notifications.cjs

@@ -456,7 +456,7 @@ i18n
     // this is the defaults
     backend: {
         // path where resources get loaded from
-        loadPath: i18n.buildLoadPath,
+        loadPath: localesPath + '/{{lng}}/translation.json',
         // path to post missing resources
         addPath: localesPath + '/{{lng}}/translation.missing.json',
         // jsonIndent to use when storing json files

package/services/workers/main.cjs

@@ -30,7 +30,7 @@ i18n
     // this is the defaults
     backend: {
         // path where resources get loaded from
-        loadPath: i18n.buildLoadPath,
+        loadPath: localesPath + '/{{lng}}/translation.json',
         // path to post missing resources
         addPath: localesPath + '/{{lng}}/translation.missing.json',
         // jsonIndent to use when storing json files

package/utils/i18n.cjs

@@ -1,29 +1,13 @@
 "use strict";
 var i18n = require('i18next');
 var Backend = require('i18next-fs-backend');
-var path = require('path');
-var fs = require('fs');
-function buildLoadPath(language, namespace) {
-    var localesDir = path.resolve(__dirname, '../services/locales');
-    var filePath = path.join(localesDir, language, 'translation.json');
-    if (!fs.existsSync(filePath)) {
-        var altLanguage = language.replace(/-/g, '_');
-        filePath = path.join(localesDir, altLanguage, 'translation.json');
-        if (!fs.existsSync(filePath)) {
-            filePath = path.join(localesDir, 'en', 'translation.json');
-        }
-    }
-    return filePath;
-}
 i18n
     .use(Backend)
     .init({
-    fallbackLng: 'en',
-    lowerCaseLng: true,
     // this is the defaults
     backend: {
         // path where resources get loaded from
-        loadPath: buildLoadPath,
+        loadPath: '../locales/{{lng}}/translation.json',
         // path to post missing resources
         addPath: '../locales/{{lng}}/translation.missing.json',
         // jsonIndent to use when storing json files
@@ -31,4 +15,3 @@ i18n
     }
 });
 module.exports = i18n;
-module.exports.buildLoadPath = buildLoadPath;