Skip to content

Node.js based forum software built for the modern web

refactor(activitypub/rules): use upsert to prevent duplicate rules

Julian Lambb895ff99f35
diff --git a/src/activitypub/rules.js b/src/activitypub/rules.js
index 2ccedd7c67..bb1b0e1402 100644
--- a/src/activitypub/rules.js
+++ b/src/activitypub/rules.js
@@ -22,8 +22,9 @@ Rules.list = async () => {
return rules;
};
-Rules.add = async (type, value, cid) => {
- const uuid = utils.generateUUID();
+Rules.upsert = async (type, value, cid) => {
+ const rules = await Rules.list();
+ const existing = rules.find(rule => rule.type === type && rule.value === value);
// normalize user rule values into a uid
if (type === 'user' && value.indexOf('@') !== -1) {
@@ -34,10 +35,17 @@ Rules.add = async (type, value, cid) => {
value = await db.getObjectField('handle:uid', String(value).toLowerCase());
}
+ if (existing) {
+ await db.setObjectField(`rid:${existing.rid}`, 'cid', cid);
+ return existing.rid;
+ }
+
+ const uuid = utils.generateUUID();
await Promise.all([
db.setObject(`rid:${uuid}`, { type, value, cid }),
db.sortedSetAdd('categorization:rid', Date.now(), uuid),
]);
+ return uuid;
};
Rules.delete = async (rid) => {
diff --git a/src/controllers/write/admin.js b/src/controllers/write/admin.js
index 105b7f5247..3ef27a8977 100644
--- a/src/controllers/write/admin.js
+++ b/src/controllers/write/admin.js
@@ -94,7 +94,7 @@ Admin.activitypub.addRule = async (req, res) => {
return helpers.formatApiResponse(400, res);
}
- await activitypub.rules.add(type, value, cid);
+ await activitypub.rules.upsert(type, value, cid);
helpers.formatApiResponse(200, res, await activitypub.rules.list());
};