From 331be28efa479122a6eecbd97b094f567c2396b5 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Wed, 2 Nov 2022 22:02:09 +0000 Subject: [PATCH 1/2] Add software info on hover --- src/components/status/status.js | 7 +++++++ src/components/status/status.vue | 1 + .../entity_normalizer/entity_normalizer.service.js | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/components/status/status.js b/src/components/status/status.js index a794b284..cafd0b11 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -460,6 +460,13 @@ const Status = { return 'globe' } }, + faviconAlt (status) { + if (!status.user.instance) { + return '' + } + const software = ((status.user.instance) && (status.user.instance.nodeinfo) && (status.user.instance.nodeinfo.software)) || {} + return `${status.user.instance.name} (${software.name} ${software.version})` + }, showError (error) { this.error = error }, diff --git a/src/components/status/status.vue b/src/components/status/status.vue index a160d197..ceb66c21 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -177,6 +177,7 @@ v-if="!!(status.user && status.user.favicon)" class="status-favicon" :src="status.user.favicon" + :title="faviconAlt(status)" > diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index b1aded33..4a7c6024 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -88,6 +88,9 @@ export const parseUser = (data) => { output.friends_count = data.following_count output.bot = data.bot + if (data.akkoma) { + output.instance = data.akkoma.instance + } if (data.pleroma) { const relationship = data.pleroma.relationship -- 2.34.1 From 43b8d0fc7a56bf0ba7b8c2fc1413e65258bf32c2 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Sun, 6 Nov 2022 22:51:51 +0000 Subject: [PATCH 2/2] add fallback in case of no instance name --- src/components/status/status.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index cafd0b11..a35b5084 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -465,7 +465,10 @@ const Status = { return '' } const software = ((status.user.instance) && (status.user.instance.nodeinfo) && (status.user.instance.nodeinfo.software)) || {} - return `${status.user.instance.name} (${software.name} ${software.version})` + if (software.name) { + return `${status.user.instance.name} (${software.name || ''} ${software.version || ''})` + } + return '' }, showError (error) { this.error = error -- 2.34.1