pleroma-fe

commit: a86b80b0544ca93a1b59ff521fd9b1e8bbc3f8c9
parent: 754cb23f354369d57dbe3f36e530709850ae7028
Author: HJ <spam@hjkos.com>
Date:   Thu, 27 Dec 2018 17:13:17 +0000

Merge branch 'feature/no-attachment-links' into 'develop'

No attachment links

Closes #175

See merge request pleroma/pleroma-fe!442
Diffstat:
M
src/boot/after_store.js
3
+++
M
src/modules/instance.js
1
+
M
src/services/api/api.service.js
3
++-
M
src/services/status_poster/status_poster.service.js
2
+-
M
static/config.json
3
++-

5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
@@ -72,6 +72,7 @@ const afterStoreSetup = ({ store, i18n }) => {
           var scopeCopy = (config.scopeCopy)
           var subjectLineBehavior = (config.subjectLineBehavior)
           var alwaysShowSubjectInput = (config.alwaysShowSubjectInput)
+          var noAttachmentLinks = (config.noAttachmentLinks)
 
           store.dispatch('setInstanceOption', { name: 'theme', value: theme })
           store.dispatch('setInstanceOption', { name: 'background', value: background })
@@ -90,6 +91,8 @@ const afterStoreSetup = ({ store, i18n }) => {
           store.dispatch('setInstanceOption', { name: 'scopeCopy', value: scopeCopy })
           store.dispatch('setInstanceOption', { name: 'subjectLineBehavior', value: subjectLineBehavior })
           store.dispatch('setInstanceOption', { name: 'alwaysShowSubjectInput', value: alwaysShowSubjectInput })
+          store.dispatch('setInstanceOption', { name: 'noAttachmentLinks', value: noAttachmentLinks })
+
           if (chatDisabled) {
             store.dispatch('disableChat')
           }
diff --git a/src/modules/instance.js b/src/modules/instance.js
@@ -27,6 +27,7 @@ const defaultState = {
   loginMethod: 'password',
   nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
+  noAttachmentLinks: false,
 
   // Nasty stuff
   pleromaBackend: true,
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
@@ -370,12 +370,13 @@ const unretweet = ({ id, credentials }) => {
   })
 }
 
-const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType}) => {
+const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks}) => {
   const idsText = mediaIds.join(',')
   const form = new FormData()
 
   form.append('status', status)
   form.append('source', 'Pleroma FE')
+  if (noAttachmentLinks) form.append('no_attachment_links', noAttachmentLinks)
   if (spoilerText) form.append('spoiler_text', spoilerText)
   if (visibility) form.append('visibility', visibility)
   if (sensitive) form.append('sensitive', sensitive)
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
@@ -4,7 +4,7 @@ import apiService from '../api/api.service.js'
 const postStatus = ({ store, status, spoilerText, visibility, sensitive, media = [], inReplyToStatusId = undefined, contentType = 'text/plain' }) => {
   const mediaIds = map(media, 'id')
 
-  return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType})
+  return apiService.postStatus({credentials: store.state.users.currentUser.credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks: store.state.instance.noAttachmentLinks})
     .then((data) => data.json())
     .then((data) => {
       if (!data.error) {
diff --git a/static/config.json b/static/config.json
@@ -17,5 +17,6 @@
   "hidePostStats": false,
   "hideUserStats": false,
   "loginMethod": "password",
-  "webPushNotifications": false
+  "webPushNotifications": false,
+  "noAttachmentLinks": false
 }