Skip to content
Snippets Groups Projects

Fix links for downloading remote emoji packs

Merged Angelina Filippova requested to merge fix/download-emoji-pack-url into develop
2 files
+ 6
4
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -62,7 +62,7 @@
<el-form-item>
<el-link
v-if="pack.pack['can-download']"
:href="`//${host}/api/pleroma/emoji/packs/${name}/download_shared`"
:href="pack.pack['fallback-src']"
:underline="false"
type="primary"
target="_blank">
@@ -92,7 +92,7 @@
</p>
<div class="download-shared-pack">
<el-input v-model="downloadSharedAs" :placeholder=" $t('emoji.downloadAsOptional')"/>
<el-button type="primary" class="download-shared-pack-button" @click="downloadFromInstance">
<el-button type="primary" class="download-shared-pack-button" @click="downloadFromInstance(pack.pack['homepage'])">
{{ isDesktop ? $t('emoji.downloadSharedPack') : $t('emoji.downloadSharedPackMobile') }}
</el-button>
</div>
@@ -209,10 +209,11 @@ export default {
}
},
methods: {
downloadFromInstance() {
downloadFromInstance(url) {
const instanceAddress = `${new URL(url).protocol}//${new URL(url).hostname}`
this.$store.dispatch(
'DownloadFrom',
{ instanceAddress: this.host, packName: this.name, as: this.downloadSharedAs }
{ instanceAddress, packName: this.name, as: this.downloadSharedAs }
).then(() => this.$store.dispatch('ReloadEmoji'))
.then(() => this.$store.dispatch('SetLocalEmojiPacks'))
},
Loading