Node.js based forum software built for the modern web
feat(activitypub): add category selector to hashtag follow, fix actor assertion
Julian Lamfea80171d950
diff --git a/public/language/en-GB/admin/settings/activitypub.json b/public/language/en-GB/admin/settings/activitypub.jsonindex 5706852174..8e82031a9d 100644--- a/public/language/en-GB/admin/settings/activitypub.json+++ b/public/language/en-GB/admin/settings/activitypub.json@@ -121,6 +121,8 @@"hashtags.follow": "Follow Hashtag","hashtags.modal.tag": "Hashtag","hashtags.modal.tag-help": "Enter the hashtag name without the # symbol (e.g., nodebb).",+ "hashtags.modal.category": "Category",+ "hashtags.modal.category-help": "Select a category to auto-route matching content.","hashtags.state-pending": "Pending","hashtags.state-active": "Active","hashtags.state-error": "Error",diff --git a/public/src/admin/federation/hashtags.js b/public/src/admin/federation/hashtags.jsindex bed221721d..b4d4ea18a6 100644--- a/public/src/admin/federation/hashtags.js+++ b/public/src/admin/federation/hashtags.js@@ -3,6 +3,7 @@import { post, del, put } from 'api';import { error, success } from 'alerts';import { render } from 'benchpress';+import * as categorySelector from 'categorySelector';import * as modals from 'modals';export async function init() {@@ -93,6 +94,8 @@ function throwModal() {}modal.modal('hide');}).catch(error);++ return false;};const modal = await modals.dialog({@@ -110,6 +113,17 @@ function throwModal() {modal.on('shown.bs.modal', function () {modal.find('#hashtagTag').focus();});++ // category selector+ categorySelector.init(modal.find('[component="category-selector"]'), {+ onSelect: function (selectedCategory) {+ modal.find('[name="cid"]').val(selectedCategory.cid);+ },+ cacheList: false,+ showLinks: true,+ template: 'admin/partials/category/selector-dropdown-right',+ localOnly: true,+ });});}diff --git a/src/activitypub/hashtags.js b/src/activitypub/hashtags.jsindex a332a9d3b9..994fbc7f08 100644--- a/src/activitypub/hashtags.js+++ b/src/activitypub/hashtags.js@@ -1,5 +1,6 @@'use strict';+const nconf = require('nconf');const db = require('../database');const activitypub = module.parent.exports;@@ -15,7 +16,7 @@ const relayTemplates = {};Hashtags.getRelay = async () => {- return await db.get(RELAY_KEY);+ return await db.get(RELAY_KEY) || 'relay.fedi.buzz';};Hashtags.setRelay = async (host) => {@@ -46,12 +47,8 @@ Hashtags.resolveActor = (tag, relay) => {return template.replace('{tag}', encodeURIComponent(tag));};-Hashtags.follow = async (tag) => {+Hashtags.follow = async (tag, cid) => {const relay = await Hashtags.getRelay();- if (!relay) {- throw new Error('[[error:activitypub.hashtag.no-relay-configured]]');- }-const actor = Hashtags.resolveActor(tag, relay);// Check if already followed@@ -60,8 +57,20 @@ Hashtags.follow = async (tag) => {return existing;}- // Send Follow activity via instance actor- await activitypub.out.follow('uid', 0, actor);+ const now = Date.now();++ // Send Follow activity via instance actor (bypass actors.assert for hashtag actors)+ await activitypub.send('uid', 0, actor, {+ '@context': [+ 'https://www.w3.org/ns/activitystreams',+ 'https://pleroma.example/schemas/litepub-0.1.jsonld',+ ],+ id: `${nconf.get('url')}/actor#activity/follow/${encodeURIComponent(actor)}/${now}`,+ type: 'Follow',+ to: [actor],+ object: actor,+ state: 'pending',+ });// Store recordconst record = {@@ -69,10 +78,15 @@ Hashtags.follow = async (tag) => {relay,actor,state: 'pending',- createdAt: Date.now(),+ createdAt: now,};await db.setObject(`ap:hashtag:${tag}`, record);- await db.sortedSetAdd(FOLLOWED_KEY, Date.now(), tag);+ await db.sortedSetAdd(FOLLOWED_KEY, now, tag);++ // Create auto-categorization rule if category provided+ if (cid) {+ await activitypub.rules.upsert('hashtag', tag, cid, 0);+ }return record;};@@ -83,8 +97,38 @@ Hashtags.unfollow = async (tag) => {return false;}- // Undo Follow via instance actor- await activitypub.out.undo.follow('uid', 0, record.actor);+ const now = Date.now();++ // Undo Follow via instance actor (bypass actors.assert for hashtag actors)+ await activitypub.send('uid', 0, record.actor, {+ '@context': [+ 'https://www.w3.org/ns/activitystreams',+ 'https://pleroma.example/schemas/litepub-0.1.jsonld',+ ],+ id: `${nconf.get('url')}/actor#activity/undo:follow/${encodeURIComponent(record.actor)}/${now}`,+ type: 'Undo',+ to: [record.actor],+ published: new Date(now).toISOString(),+ object: {+ '@context': [+ 'https://www.w3.org/ns/activitystreams',+ 'https://pleroma.example/schemas/litepub-0.1.jsonld',+ ],+ id: `${nconf.get('url')}/actor#activity/follow/${encodeURIComponent(record.actor)}/${record.createdAt}`,+ type: 'Follow',+ actor: `${nconf.get('url')}/actor`,+ to: [record.actor],+ object: record.actor,+ state: 'cancelled',+ },+ });++ // Remove auto-categorization rule+ const rules = await activitypub.rules.list();+ const rule = rules.find(r => r.type === 'hashtag' && r.value === tag);+ if (rule) {+ await activitypub.rules.delete(rule.rid);+ }// Remove recordawait Promise.all([@@ -107,7 +151,7 @@ Hashtags.list = async () => {};Hashtags.get = async (tag) => {- const exists = await db.sortedSetMember(FOLLOWED_KEY, tag);+ const exists = await db.isSortedSetMember(FOLLOWED_KEY, tag);if (!exists) {return null;}diff --git a/src/controllers/write/admin.js b/src/controllers/write/admin.jsindex be3a47f660..14cd24d3e7 100644--- a/src/controllers/write/admin.js+++ b/src/controllers/write/admin.js@@ -246,14 +246,23 @@ Admin.activitypub.getHashtags = async (req, res) => {};Admin.activitypub.addHashtag = async (req, res) => {- let { tag } = req.body;+ let { tag, cid } = req.body;if (!tag || !tag.trim()) {return helpers.formatApiResponse(400, res);}tag = tag.trim().toLowerCase();- await activitypub.hashtags.follow(tag);+ if (cid) {+ cid = parseInt(cid, 10);+ const categories = require('../../categories');+ const exists = await categories.exists(cid);+ if (!exists) {+ return helpers.formatApiResponse(400, res);+ }+ }++ await activitypub.hashtags.follow(tag, cid);helpers.formatApiResponse(200, res, await activitypub.hashtags.list());};diff --git a/src/views/admin/partials/activitypub/hashtags.tpl b/src/views/admin/partials/activitypub/hashtags.tplindex 5461cf8706..f4db2a1a70 100644--- a/src/views/admin/partials/activitypub/hashtags.tpl+++ b/src/views/admin/partials/activitypub/hashtags.tpl@@ -4,4 +4,11 @@<input type="text" id="hashtagTag" name="tag" class="form-control" placeholder="nodebb" required /><div class="form-text">{{tx("admin/settings/activitypub:hashtags.modal.tag-help")}}</div></div>+ <div class="mb-3">+ <label class="form-label">{{tx("admin/settings/activitypub:hashtags.modal.category")}}</label>+ <div class="d-block">+ <!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->+ </div>+ <input type="hidden" name="cid" />+ </div></form>diff --git a/src/views/admin/partials/activitypub/hashtags/list.tpl b/src/views/admin/partials/activitypub/hashtags/list.tplindex a1ccdee2ae..f13b1ffcc8 100644--- a/src/views/admin/partials/activitypub/hashtags/list.tpl+++ b/src/views/admin/partials/activitypub/hashtags/list.tpl@@ -2,8 +2,8 @@<tr data-tag="{./tag}"><td><code>#{{./tag}}</code></td><td>- <span class="badge bg-{./stateClass}" title="{tx("admin/settings/activitypub:hashtags.state-{./state}")}">- {tx("admin/settings/activitypub:hashtags.state-{./state}")}+ <span class="badge bg-{./stateClass}" title="{{tx(concat("admin/settings/activitypub:hashtags.state-", ./state))}}">+ {{tx(concat("admin/settings/activitypub:hashtags.state-", ./state))}}</span></td><td><a href="#" data-action="hashtags.remove" data-tag="{./tag}"><i class="fa fa-trash link-danger"></i></a></td>