diff --git a/public/language/en-GB/admin/settings/activitypub.json b/public/language/en-GB/admin/settings/activitypub.json index cb47982f7d..df2f7423af 100644 --- a/public/language/en-GB/admin/settings/activitypub.json +++ b/public/language/en-GB/admin/settings/activitypub.json @@ -67,6 +67,6 @@ "analytics.intro": "From this page you can view the state of your instance's federation with other servers", "analytics.by-hostname": "Filter by Hostname", - "analytics.activities": "Received Activities", + "analytics.received": "Received Activities", "analytics.sent": "Sent Activites" } \ No newline at end of file diff --git a/public/src/admin/federation/analytics.js b/public/src/admin/federation/analytics.js index 86a7f8047e..dfbd811110 100644 --- a/public/src/admin/federation/analytics.js +++ b/public/src/admin/federation/analytics.js @@ -29,7 +29,7 @@ export function init() { hostFilterEl.addEventListener('change', async function () { const data = await get(`/api${ajaxify.data.url}?host=${this.value}`); - ['activities', 'sent'].forEach((name) => { + ['received', 'sent'].forEach((name) => { const chart = charts.get(name); chart.data.datasets[0].data = data[name]; chart.update(); @@ -39,7 +39,7 @@ export function init() { } function initializeCharts() { - const activitiesCanvas = document.getElementById('activities'); + const receivedCanvas = document.getElementById('received'); const sentCanvas = document.getElementById('sent'); // const topicsCanvas = document.getElementById('topics:daily'); // const postsCanvas = document.getElementById('posts:daily'); @@ -63,7 +63,7 @@ function initializeCharts() { }; const data = { - 'activities': { + 'received': { labels: hourlyLabels, datasets: [ { @@ -72,7 +72,7 @@ function initializeCharts() { borderColor: 'rgba(186,139,175,1)', pointBackgroundColor: 'rgba(186,139,175,1)', pointHoverBorderColor: 'rgba(186,139,175,1)', - data: ajaxify.data.activities, + data: ajaxify.data.received, }, ], }, @@ -117,7 +117,7 @@ function initializeCharts() { // }, }; - activitiesCanvas.width = $(activitiesCanvas).parent().width(); + receivedCanvas.width = $(receivedCanvas).parent().width(); sentCanvas.width = $(sentCanvas).parent().width(); // topicsCanvas.width = $(topicsCanvas).parent().width(); // postsCanvas.width = $(postsCanvas).parent().width(); @@ -133,9 +133,9 @@ function initializeCharts() { }; return new Map([ - ['activities', new Chart(activitiesCanvas.getContext('2d'), { + ['received', new Chart(receivedCanvas.getContext('2d'), { type: 'line', - data: data.activities, + data: data.received, options: chartOpts, })], ['sent', new Chart(sentCanvas.getContext('2d'), { diff --git a/src/controllers/admin/federation.js b/src/controllers/admin/federation.js index c2fe092a9d..8975de5dc8 100644 --- a/src/controllers/admin/federation.js +++ b/src/controllers/admin/federation.js @@ -62,13 +62,13 @@ federationController.analytics = async function (req, res) { } const set = host ? `activities:byHost:${host}` : 'activities'; const sentSet = host ? `ap.out:byHost:${host}` : 'ap:out'; - const activities = await analytics.getHourlyStatsForSet(set, Date.now(), 24); + const received = await analytics.getHourlyStatsForSet(set, Date.now(), 24); const sent = await analytics.getHourlyStatsForSet(sentSet, Date.now(), 24); res.render('admin/federation/analytics', { title: '[[admin/menu:federation/analytics]]', instances, - activities, + received, sent, }); }; diff --git a/src/views/admin/federation/analytics.tpl b/src/views/admin/federation/analytics.tpl index 82373f46db..77c07215b8 100644 --- a/src/views/admin/federation/analytics.tpl +++ b/src/views/admin/federation/analytics.tpl @@ -21,10 +21,10 @@