Skip to content

Node.js based forum software built for the modern web

fix(activitypub): add stateClass to Hashtags.list() for API consumers

Julian Lam1ad70560e4ae
diff --git a/public/src/admin/federation/hashtags.js b/public/src/admin/federation/hashtags.js
index b4d4ea18a6..4f30eb5fa9 100644
--- a/public/src/admin/federation/hashtags.js
+++ b/public/src/admin/federation/hashtags.js
@@ -34,7 +34,8 @@ function setupHashtags() {
case 'hashtags.remove': {
const tag = subselector.getAttribute('data-tag');
del(`/admin/activitypub/hashtags/${encodeURIComponent(tag)}`).then(async (data) => {
- const html = await app.parseAndTranslate('admin/partials/activitypub/hashtags/list', {}, {
+ console.log(data);
+ const html = await app.parseAndTranslate('admin/partials/activitypub/hashtags/list', { hashtags: data }, {
hashtags: data.map(h => ({
...h,
stateClass: getStateClass(h.state),
@@ -82,7 +83,7 @@ function throwModal() {
const payload = Object.fromEntries(new FormData(formEl));
post('/admin/activitypub/hashtags', payload).then(async (data) => {
- const html = await app.parseAndTranslate('admin/partials/activitypub/hashtags/list', {}, {
+ const html = await app.parseAndTranslate('admin/partials/activitypub/hashtags/list', { hashtags: data }, {
hashtags: data.map(h => ({
...h,
stateClass: getStateClass(h.state),
diff --git a/src/activitypub/hashtags.js b/src/activitypub/hashtags.js
index 0f97b3f935..c74dcc87cf 100644
--- a/src/activitypub/hashtags.js
+++ b/src/activitypub/hashtags.js
@@ -113,6 +113,7 @@ Hashtags.list = async () => {
return records.filter(Boolean).map((record) => {
record.createdAt = parseInt(record.createdAt, 10);
+ record.stateClass = record.state === 'pending' ? 'warning' : (record.state === 'active' ? 'success' : 'danger');
return record;
});
};
diff --git a/src/controllers/admin/federation.js b/src/controllers/admin/federation.js
index eafe67267d..163b8ccedc 100644
--- a/src/controllers/admin/federation.js
+++ b/src/controllers/admin/federation.js
@@ -136,10 +136,6 @@ federationController.hashtags = async function (req, res) {
const relay = await activitypub.hashtags.getRelay();
const relayOptions = activitypub.hashtags.getRelayOptions();
- hashtags.forEach((h) => {
- h.stateClass = h.state === 'pending' ? 'warning' : (h.state === 'active' ? 'success' : 'danger');
- });
-
res.render('admin/federation/hashtags', {
title: '[[admin/menu:federation/hashtags]]',
hashtags,