diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 4f6cee9c..4f4c6aca 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -24,8 +24,7 @@ const PostStatusForm = {
'replyTo',
'repliedUser',
'attentions',
- 'messageScope',
- 'parentSpoilerText'
+ 'messageScope'
],
components: {
MediaUpload
@@ -51,8 +50,7 @@ const PostStatusForm = {
newStatus: {
status: statusText,
files: [],
- visibility: this.messageScope || 'public',
- spoilerText: this.parentSpoilerText || null
+ visibility: this.messageScope || 'public'
},
caret: 0
}
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 40786d94..87ef90d8 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -28,8 +28,7 @@ const Status = {
userExpanded: false,
preview: null,
showPreview: false,
- showingTall: false,
- showingContentWarningContent: false
+ showingTall: false
}),
computed: {
muteWords () {
@@ -93,9 +92,6 @@ const Status = {
return 'small'
}
return 'normal'
- },
- clickThroughContentWarningsEnabled () {
- return this.$store.state.config.clickThroughContentWarningsEnabled
}
},
components: {
@@ -149,9 +145,6 @@ const Status = {
toggleShowTall () {
this.showingTall = !this.showingTall
},
- toggleContentWarningContent () {
- this.showingContentWarningContent = !this.showingContentWarningContent
- },
replyEnter (id, event) {
this.showPreview = true
const targetId = Number(id)
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 2e33999a..f88c810d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -73,22 +73,11 @@
Show more
-
-
-
-
-
-
-
-
-
-
Click to view this post. (has attachments)
-
-
+
Show less
-
@@ -505,17 +488,4 @@ a.unmute {
}
}
-.hiddenContent {
- margin: 8px;
- padding: 32px;
- background: var(--lightBg, $fallback--lightBg);
- border-radius: var(--panelRadius, $fallback--panelRadius);
-}
-.status-el_focused * .hiddenContent {
- background: var(--bg, $fallback--bg);
-}
-.contentWarnedContent {
- margin: 8px;
-}
-
diff --git a/src/main.js b/src/main.js
index 01ee7f75..bacd7f6d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -89,7 +89,7 @@ window.fetch('/api/statusnet/config.json')
window.fetch('/static/config.json')
.then((res) => res.json())
.then((data) => {
- const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled, clickThroughContentWarningsEnabled} = data
+ const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled} = data
store.dispatch('setOption', { name: 'theme', value: theme })
store.dispatch('setOption', { name: 'background', value: background })
store.dispatch('setOption', { name: 'logo', value: logo })
@@ -98,8 +98,6 @@ window.fetch('/static/config.json')
store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink })
store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
- store.dispatch('setOption', { name: 'clickThroughContentWarningsEnabled', value: clickThroughContentWarningsEnabled })
-
if (data['chatDisabled']) {
store.dispatch('disableChat')
}
diff --git a/static/config.json b/static/config.json
index 4fdddf29..4dacfebe 100644
--- a/static/config.json
+++ b/static/config.json
@@ -11,6 +11,5 @@
"whoToFollowLink": "https://vinayaka.distsn.org/?{{host}}+{{user}}",
"whoToFollowLinkDummy2": "https://followlink.osa-p.net/recommend.html",
"showInstanceSpecificPanel": false,
- "scopeOptionsEnabled": true,
- "clickThroughContentWarningsEnabled": true
+ "scopeOptionsEnabled": false
}