From 84cab03a1d2643481bdb686d839a95973788ae02 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Thu, 9 Nov 2023 08:27:58 +0100
Subject: [PATCH] Extract backend repository from nodeinfo

Also removes extractCommit, could be kept when the forge is git.pleroma.social

Partial fix of https://git.pleroma.social/pleroma/pleroma-fe/-/issues/1283
---
 changelog.d/backend-repo-url.skip                     |  0
 src/boot/after_store.js                               |  3 ++-
 src/components/settings_modal/tabs/version_tab.js     |  7 +------
 src/components/settings_modal/tabs/version_tab.vue    |  2 +-
 src/modules/instance.js                               |  1 +
 src/services/version/version.service.js               |  6 ------
 .../specs/services/version/version.service.spec.js    | 11 -----------
 7 files changed, 5 insertions(+), 25 deletions(-)
 create mode 100644 changelog.d/backend-repo-url.skip
 delete mode 100644 src/services/version/version.service.js
 delete mode 100644 test/unit/specs/services/version/version.service.spec.js

diff --git a/changelog.d/backend-repo-url.skip b/changelog.d/backend-repo-url.skip
new file mode 100644
index 00000000..e69de29b
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 395d4834..aa204f53 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -242,7 +242,7 @@ const resolveStaffAccounts = ({ store, accounts }) => {
 
 const getNodeInfo = async ({ store }) => {
   try {
-    const res = await preloadFetch('/nodeinfo/2.0.json')
+    const res = await preloadFetch('/nodeinfo/2.1.json')
     if (res.ok) {
       const data = await res.json()
       const metadata = data.metadata
@@ -277,6 +277,7 @@ const getNodeInfo = async ({ store }) => {
 
       const software = data.software
       store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
+      store.dispatch('setInstanceOption', { name: 'backendRepository', value: software.repository })
       store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: software.name === 'pleroma' })
 
       const priv = metadata.private
diff --git a/src/components/settings_modal/tabs/version_tab.js b/src/components/settings_modal/tabs/version_tab.js
index 616bdadf..20a67173 100644
--- a/src/components/settings_modal/tabs/version_tab.js
+++ b/src/components/settings_modal/tabs/version_tab.js
@@ -1,22 +1,17 @@
-import { extractCommit } from 'src/services/version/version.service'
-
 const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
-const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
 
 const VersionTab = {
   data () {
     const instance = this.$store.state.instance
     return {
       backendVersion: instance.backendVersion,
+      backendRepository: instance.backendRepository,
       frontendVersion: instance.frontendVersion
     }
   },
   computed: {
     frontendVersionLink () {
       return pleromaFeCommitUrl + this.frontendVersion
-    },
-    backendVersionLink () {
-      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/version_tab.vue b/src/components/settings_modal/tabs/version_tab.vue
index 0330d49f..917a618e 100644
--- a/src/components/settings_modal/tabs/version_tab.vue
+++ b/src/components/settings_modal/tabs/version_tab.vue
@@ -7,7 +7,7 @@
           <ul class="option-list">
             <li>
               <a
-                :href="backendVersionLink"
+                :href="backendRepository"
                 target="_blank"
               >{{ backendVersion }}</a>
             </li>
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 034348ff..f908f16c 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -141,6 +141,7 @@ const defaultState = {
 
   // Version Information
   backendVersion: '',
+  backendRepository: '',
   frontendVersion: '',
 
   pollsAvailable: false,
diff --git a/src/services/version/version.service.js b/src/services/version/version.service.js
deleted file mode 100644
index 2e11bf3a..00000000
--- a/src/services/version/version.service.js
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export const extractCommit = versionString => {
-  const regex = /-g(\w+)/i
-  const matches = versionString.match(regex)
-  return matches ? matches[1] : ''
-}
diff --git a/test/unit/specs/services/version/version.service.spec.js b/test/unit/specs/services/version/version.service.spec.js
deleted file mode 100644
index 519145ee..00000000
--- a/test/unit/specs/services/version/version.service.spec.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { extractCommit } from 'src/services/version/version.service.js'
-
-describe('extractCommit', () => {
-  it('return short commit hash following "-g" characters', () => {
-    expect(extractCommit('1.0.0-45-g5e7aeebc')).to.eql('5e7aeebc')
-  })
-
-  it('return short commit hash without branch name', () => {
-    expect(extractCommit('1.0.0-45-g5e7aeebc-branch')).to.eql('5e7aeebc')
-  })
-})