logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: e3d602fdccb0dfe211fd3950210cdf8fda43bf95
parent c07c0b22604ac57f91f08ed330eee98ee82e214e
Author: Henry Jameson <me@hjkos.com>
Date:   Mon, 28 Feb 2022 17:45:07 +0200

revert changes related to streaming/firehose setting, reword it so it's
not confused with websocket streaming

Diffstat:

Msrc/components/settings_modal/tabs/general_tab.vue3+--
Msrc/i18n/en.json4++--
Msrc/modules/config.js2+-
3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue @@ -27,7 +27,7 @@ </BooleanSetting> </li> <li> - <BooleanSetting path="streaming" expert="1"> + <BooleanSetting path="streaming" > {{ $t('settings.streaming') }} </BooleanSetting> <ul @@ -38,7 +38,6 @@ <BooleanSetting path="pauseOnUnfocused" :disabled="!streaming" - expert="1" > {{ $t('settings.pause_on_unfocused') }} </BooleanSetting> diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -435,7 +435,7 @@ "valid_until": "Valid until", "revoke_token": "Revoke", "panelRadius": "Panels", - "pause_on_unfocused": "Pause streaming when tab is not focused", + "pause_on_unfocused": "Pause when tab is not focused", "presets": "Presets", "profile_background": "Profile background", "profile_banner": "Profile banner", @@ -473,7 +473,7 @@ "post_status_content_type": "Post status content type", "sensitive_by_default": "Mark posts as sensitive by default", "stop_gifs": "Pause animated images until you hover on them", - "streaming": "Enable automatic streaming of new posts when scrolled to the top", + "streaming": "Automatically show new posts when scrolled to the top", "user_mutes": "Users", "useStreamingApi": "Receive posts and notifications real-time", "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)", diff --git a/src/modules/config.js b/src/modules/config.js @@ -37,7 +37,7 @@ export const defaultState = { preloadImage: true, loopVideo: true, loopVideoSilentOnly: true, - streaming: true, + streaming: false, emojiReactionsOnTimeline: true, alwaysShowNewPostButton: false, autohideFloatingPostButton: false,