From 9fefd74e9ae2ec7be5e60acdce863fd76950af63 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Mon, 18 Feb 2019 06:03:41 +0000 Subject: [PATCH] everywhere: things other than images can be described, so use mediaDescriptions everywhere --- src/components/post_status_form/post_status_form.js | 6 +++--- src/components/post_status_form/post_status_form.vue | 2 +- src/services/api/api.service.js | 4 ++-- src/services/status_poster/status_poster.service.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 47618699..12041d10 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -67,7 +67,7 @@ const PostStatusForm = { status: statusText, nsfw: false, files: [], - imageDescriptions: {}, + mediaDescriptions: {}, visibility: scope }, caret: 0 @@ -243,7 +243,7 @@ const PostStatusForm = { visibility: newStatus.visibility, sensitive: newStatus.nsfw, media: newStatus.files, - imageDescriptions: newStatus.imageDescriptions || {}, + mediaDescriptions: newStatus.mediaDescriptions || {}, store: this.$store, inReplyToStatusId: this.replyTo, contentType: newStatus.contentType @@ -253,7 +253,7 @@ const PostStatusForm = { status: '', spoilerText: '', files: [], - imageDescriptions: {}, + mediaDescriptions: {}, visibility: newStatus.visibility, contentType: newStatus.contentType } diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 8d28289e..eee67f90 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -86,7 +86,7 @@ {{file.url}} - +
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 67cdfaaf..824713a0 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -424,7 +424,7 @@ const unretweet = ({ id, credentials }) => { }) } -const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks, imageDescriptions}) => { +const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks, mediaDescriptions}) => { const idsText = mediaIds.join(',') const form = new FormData() @@ -435,7 +435,7 @@ const postStatus = ({credentials, status, spoilerText, visibility, sensitive, me if (visibility) form.append('visibility', visibility) if (sensitive) form.append('sensitive', sensitive) if (contentType) form.append('content_type', contentType) - form.append('descriptions', JSON.stringify(imageDescriptions)) + form.append('descriptions', JSON.stringify(mediaDescriptions)) form.append('media_ids', idsText) if (inReplyToStatusId) { form.append('in_reply_to_status_id', inReplyToStatusId) diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js index d57f73dc..f3ca2c48 100644 --- a/src/services/status_poster/status_poster.service.js +++ b/src/services/status_poster/status_poster.service.js @@ -1,10 +1,10 @@ import { map } from 'lodash' import apiService from '../api/api.service.js' -const postStatus = ({ store, status, spoilerText, visibility, sensitive, media = [], inReplyToStatusId = undefined, contentType = 'text/plain', imageDescriptions = {} }) => { +const postStatus = ({ store, status, spoilerText, visibility, sensitive, media = [], inReplyToStatusId = undefined, contentType = 'text/plain', mediaDescriptions = {} }) => { const mediaIds = map(media, 'id') - return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks: store.state.instance.noAttachmentLinks, imageDescriptions}) + return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks: store.state.instance.noAttachmentLinks, mediaDescriptions}) .then((data) => { if (!data.error) { store.dispatch('addNewStatuses', {