diff --git a/public/src/admin/federation/relays.js b/public/src/admin/federation/relays.js index 1b76100930..3b4a2d4c31 100644 --- a/public/src/admin/federation/relays.js +++ b/public/src/admin/federation/relays.js @@ -120,7 +120,7 @@ async function updateCharts() { const hostFilterEl = document.getElementById('hostFilter'); const termEl = document.getElementById('term'); console.log(hostFilterEl.value, termEl.value); - const data = await get(`/api${ajaxify.data.url}?host=${hostFilterEl.value}&term=${termEl.value}`); + const data = await get(`/api${ajaxify.data.url}?relay=${hostFilterEl.value}&term=${termEl.value}`); chart.data.labels = labels.get(termEl.value || 'hourly'); chart.data.datasets[0].data = data.data.in; diff --git a/src/activitypub/analytics.js b/src/activitypub/analytics.js index c8f3643200..f5600abfd7 100644 --- a/src/activitypub/analytics.js +++ b/src/activitypub/analytics.js @@ -62,11 +62,9 @@ Analytics.receiptError = async (body, error) => { Analytics.relays = {}; Analytics.relays.in = (relay) => { - const { hostname } = new URL(relay); - analytics.increment(['ap.relayIn', `ap.relayIn:byHost:${hostname}`]); + analytics.increment(['ap.relayIn', `ap.relayIn:byRelay:${relay}`]); }; Analytics.relays.out = (relay) => { - const { hostname } = new URL(relay); - analytics.increment(['ap.relayOut', `ap.relayOut:byHost:${hostname}`]); + analytics.increment(['ap.relayOut', `ap.relayOut:byRelay:${relay}`]); }; \ No newline at end of file diff --git a/src/controllers/admin/federation.js b/src/controllers/admin/federation.js index f2289f6f12..7c3d8e8815 100644 --- a/src/controllers/admin/federation.js +++ b/src/controllers/admin/federation.js @@ -34,9 +34,9 @@ federationController.relays = async function (req, res) { const relays = await activitypub.relays.list(); const urls = relays.map(({ url }) => url); - let { host, term } = req.query; - if (!urls.includes(host)) { - host = undefined; + let { relay, term } = req.query; + if (!urls.includes(relay)) { + relay = undefined; } let method = 'getHourlyStatsForSet'; let count = 24; @@ -44,8 +44,8 @@ federationController.relays = async function (req, res) { method = 'getDailyStatsForSet'; count = 30; } - const inSet = host ? `ap.relayIn:byHost:${host}` : 'ap.relayIn'; - const outSet = host ? `ap.relayOut:byHost:${host}` : 'ap.relayOut'; + const inSet = relay ? `ap.relayIn:byRelay:${relay}` : 'ap.relayIn'; + const outSet = relay ? `ap.relayOut:byRelay:${relay}` : 'ap.relayOut'; const incoming = await analytics[method](inSet, Date.now(), count); const out = await analytics[method](outSet, Date.now(), count);