Mastodon
/
Pinafore-Web-Client-Frontend
mirror of https://github.com/nolanlawson/pinafore
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: use url over id as media upload cache key (#1437)

This commit is contained in:
Nolan Lawson 2019-08-25 22:24:37 -07:00 committed by GitHub
parent e2c137b2ef
commit b46f76fbf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/_actions/media.js
View File

@ -13,7 +13,7 @@ export async function doMediaUpload (realm, file) {
if (composeMedia.length === 4) {
throw new Error('Only 4 media max are allowed')
}
mediaUploadFileCache.set(response.id, file)
mediaUploadFileCache.set(response.url, file)
composeMedia.push({
data: response,
file: { name: file.name },

7
src/routes/_components/dialog/components/MediaAltEditor.html
View File

@ -120,8 +120,7 @@
computed: {
length: ({ rawText }) => length(rawText || ''),
overLimit: ({ mediaAltCharLimit, length }) => length > mediaAltCharLimit,
url: ({ media, index }) => get(media, [index, 'data', 'url']),
mediaId: ({ media, index }) => get(media, [index, 'data', 'id'])
url: ({ media, index }) => get(media, [index, 'data', 'url'])
},
methods: {
observe,
@ -167,8 +166,8 @@
async onClick () {
this.set({ extracting: true })
try {
const { url, mediaId } = this.get()
const file = mediaUploadFileCache.get(mediaId)
const { url } = this.get()
const file = mediaUploadFileCache.get(url)
let text
if (file) { // Avoid downloading from the network a file that the user *just* uploaded
const fileUrl = URL.createObjectURL(file)