From 13855f46e2b3078fbe178ead89d459a74969cf20 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Thu, 27 Dec 2018 02:37:36 +0300 Subject: [PATCH 1/3] No attachment links --- src/services/api/api.service.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 182f912682..302c41f590 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -376,6 +376,7 @@ const postStatus = ({credentials, status, spoilerText, visibility, sensitive, me form.append('status', status) form.append('source', 'Pleroma FE') + form.append('no_attachment_links', true) if (spoilerText) form.append('spoiler_text', spoilerText) if (visibility) form.append('visibility', visibility) if (sensitive) form.append('sensitive', sensitive) From 85c487b93356327f0a50dc78a2849918f552fac5 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Thu, 27 Dec 2018 13:25:11 +0300 Subject: [PATCH 2/3] Make "noAttachmentLinks" configurable --- src/boot/after_store.js | 3 +++ src/services/api/api.service.js | 4 ++-- src/services/status_poster/status_poster.service.js | 2 +- static/config.json | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 5b9e5c960b..6e87d5f63e 100644 --- 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/services/api/api.service.js b/src/services/api/api.service.js index 302c41f590..4ee95bd10e 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -370,13 +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') - form.append('no_attachment_links', true) + 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 index 7f8b0fc07d..1e20d336e3 100644 --- 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 index f508eea1a0..9bdcb3b21b 100644 --- a/static/config.json +++ b/static/config.json @@ -17,5 +17,6 @@ "hidePostStats": false, "hideUserStats": false, "loginMethod": "password", - "webPushNotifications": false + "webPushNotifications": false, + "noAttachmentLinks": false } From 0f530de397f43744ef1d83f97b76869404f80218 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Thu, 27 Dec 2018 19:59:56 +0300 Subject: [PATCH 3/3] Add "noAttachmentLinks" to src/modules/instance.js --- src/modules/instance.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/instance.js b/src/modules/instance.js index 342bc9ace3..546d2cc49a 100644 --- 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,