Skip to content

Node.js based forum software built for the modern web

refactor(federation): move blocklist view modal to a dedicated partial

Julian Lam1f78b44535dd
diff --git a/public/src/admin/federation/safety.js b/public/src/admin/federation/safety.js
index 6dbd475f26..f0d4693b0d 100644
--- a/public/src/admin/federation/safety.js
+++ b/public/src/admin/federation/safety.js
@@ -55,7 +55,7 @@ async function renderList(blocklists) {
}
function throwModal() {
- render('admin/partials/activitypub/blocklists', {}).then(async function (html) {
+ render('admin/partials/activitypub/blocklists/add', {}).then(async function (html) {
const submit = function () {
const formEl = modal.find('form').get(0);
if (!formEl.reportValidity()) {
@@ -165,11 +165,10 @@ async function removeDomain(domain) {
async function view(url) {
try {
const { domains, count } = await get(`/admin/activitypub/blocklists/${encodeURIComponent(url)}`);
+ const message = await app.parseAndTranslate('admin/partials/activitypub/blocklists/view', { count, domains });
modals.dialog({
title: '[[admin/settings/activitypub:blocklists.view.title]]',
- message: `\
- <p>[[admin/settings/activitypub:blocklists.view.intro, ${count}]]</p> \
- <ul>` + domains.map(domain => `<li>${domain}</li>`).join('\n') + '</ul>',
+ message,
});
} catch (e) {
error(e);
diff --git a/src/views/admin/partials/activitypub/blocklists.tpl b/src/views/admin/partials/activitypub/blocklists/add.tpl
similarity index 97%
rename from src/views/admin/partials/activitypub/blocklists.tpl
rename to src/views/admin/partials/activitypub/blocklists/add.tpl
index dcafd803b3..c90eb60f8e 100644
--- a/src/views/admin/partials/activitypub/blocklists.tpl
+++ b/src/views/admin/partials/activitypub/blocklists/add.tpl
@@ -7,4 +7,4 @@
<label class="form-label" for="url">Blocklist URL</label>
<input type="url" id="url" name="url" title="Blocklist URL" class="form-control" placeholder="https://example.org/blocklist.csv" required>
</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/views/admin/partials/activitypub/blocklists/view.tpl b/src/views/admin/partials/activitypub/blocklists/view.tpl
new file mode 100644
index 0000000000..5fa87cd883
--- /dev/null
+++ b/src/views/admin/partials/activitypub/blocklists/view.tpl
@@ -0,0 +1,6 @@
+<p>{{tx("admin/settings/activitypub:blocklists.view.intro", count)}}</p>
+<ol>
+ {{{ each domains }}}
+ <li><code>{@value}</code></li>
+ {{{ end }}}
+</ol>