Skip to content
Snippets Groups Projects
Commit 9137362d authored by Angelina Filippova's avatar Angelina Filippova
Browse files

Fix downloading remote packs

parent dca1f2cc
No related branches found
No related tags found
No related merge requests found
......@@ -52,17 +52,15 @@ export async function deletePack(host, token, packName) {
})
}
export async function downloadFrom(host, instance, packName, as, token) {
if (as.trim() === '') {
as = null
}
export async function downloadFrom(instanceAddress, packName, as, host, token) {
return await request({
baseURL: baseName(host),
url: '/api/pleroma/emoji/packs/download',
method: 'post',
headers: authHeaders(token),
data: { url: baseName(instance), name: packName, as },
data: as.trim() === ''
? { url: baseName(instanceAddress), name: packName }
: { url: baseName(instanceAddress), name: packName, as },
timeout: 0
})
}
......
......@@ -116,7 +116,7 @@ const emojiPacks = {
await deletePack(getters.authHost, getters.token, name)
},
async DownloadFrom({ getters }, { instanceAddress, packName, as }) {
const result = await downloadFrom(getters.authHost, instanceAddress, packName, as, getters.token)
const result = await downloadFrom(instanceAddress, packName, as, getters.authHost, getters.token)
if (result.data === 'ok') {
Message({
......
......@@ -24,7 +24,7 @@
</el-form-item>
<el-form-item>
<el-link
v-if="pack.pack['can-download']"
v-if="pack.pack['can-download'] && pack.pack['fallback-src']"
:href="pack.pack['fallback-src']"
:underline="false"
type="primary"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment