AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

Allow using custom source URLs #421

Open
Oneric wants to merge 1 commit from Oneric/akkoma-fe:custom-source into develop
pull from: Oneric/akkoma-fe:custom-source
merge into: AkkomaGang:develop
Conversation 2 Commits 1 Files changed 3 +15 -4
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/boot/after_store.js
View file

@ -183,6 +183,12 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
copyInstanceOption('renderMisskeyMarkdown') copyInstanceOption('renderMisskeyMarkdown')
copyInstanceOption('sidebarRight') copyInstanceOption('sidebarRight')
if (config.backendCommitUrl)
copyInstanceOption('backendCommitUrl')
if (config.frontendCommitUrl)
copyInstanceOption('frontendCommitUrl')
return store.dispatch('setTheme', config['theme']) return store.dispatch('setTheme', config['theme'])
} }

11
src/components/settings_modal/tabs/version_tab.js
View file

@ -1,22 +1,25 @@
import { extractCommit } from 'src/services/version/version.service' import { extractCommit } from 'src/services/version/version.service'
const pleromaFeCommitUrl = 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/' function joinURL(base, subpath) {
const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/' return URL.parse(subpath, base)?.href || "invalid base URL"
}
const VersionTab = { const VersionTab = {
data () { data () {
const instance = this.$store.state.instance const instance = this.$store.state.instance
return { return {
backendCommitUrl: instance.backendCommitUrl,
backendVersion: instance.backendVersion, backendVersion: instance.backendVersion,
frontendCommitUrl: instance.frontendCommitUrl,
frontendVersion: instance.frontendVersion frontendVersion: instance.frontendVersion
} }
}, },
computed: { computed: {
frontendVersionLink () { frontendVersionLink () {
return pleromaFeCommitUrl + this.frontendVersion return joinURL(this.frontendCommitUrl, this.frontendVersion)
Oneric marked this conversation as resolved Outdated
floatingghost commented 2024-10-26 03:45:18 +00:00
Outdated
Review
Copy link

we might want to consider using some for of urljoin function, because this makes it 100% mandatory to have the trailing slash in the config

we might want to consider using some for of `urljoin` function, because this makes it 100% mandatory to have the trailing slash in the config
Oneric commented 2024-10-26 14:35:35 +00:00
Review
Copy link

done with URL.parse() which won't throw exceptions itself, and since i wasn’t sure if a null might lead to exceptions later it gets stubbed out for an invalid config

done with `URL.parse()` which won't throw exceptions itself, and since i wasn’t sure if a `null` might lead to exceptions later it gets stubbed out for an invalid config
}, },
backendVersionLink () { backendVersionLink () {
return pleromaBeCommitUrl + extractCommit(this.backendVersion) return joinURL(this.backendCommitUrl, extractCommit(this.backendVersion))
} }
} }
} }

2
src/modules/instance.js
View file

@ -73,6 +73,8 @@ const defaultState = {
conversationOtherRepliesButton: 'below', conversationOtherRepliesButton: 'below',
conversationTreeFadeAncestors: false, conversationTreeFadeAncestors: false,
maxDepthInThread: 6, maxDepthInThread: 6,
backendCommitUrl: 'https://akkoma.dev/AkkomaGang/akkoma/commit/',
frontendCommitUrl: 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/',
// Nasty stuff // Nasty stuff
customEmoji: [], customEmoji: [],