tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use upstream's settings for CW auto-expand and column swiping (#1770)

Browse Source 
* Use Mastodon server-side settings for automatically expanding toots with CWs

* Add modal warning about settings changes

* Use Mastodon server-side settings for disabling swiping
This commit is contained in:
Claire
2022-05-15 17:30:40 +02:00
committed by GitHub
parent aa08399e6f
commit dc350be6f5
20 changed files with 396 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/flavours/glitch/util/backend_links.js
View File

@ -7,3 +7,12 @@ export const statusAdminLink = (account_id, status_id) => `/admin/accounts/${acc
export const filterEditLink = (id) => `/filters/${id}/edit`;
export const relationshipsLink = '/relationships';
export const securityLink = '/auth/edit';
export const preferenceLink = (setting_name) => {
switch (setting_name) {
case 'user_setting_expand_spoilers':
case 'user_setting_disable_swiping':
return `/settings/preferences/appearance#${setting_name}`;
default:
return preferencesLink;
}
};

4
app/javascript/flavours/glitch/util/content_warning.js
View File

@ -1,5 +1,7 @@
import { expandSpoilers } from 'flavours/glitch/util/initial_state';
export function autoUnfoldCW (settings, status) {
if (!settings.getIn(['content_warnings', 'auto_unfold'])) {
if (!expandSpoilers) {
return false;
}

3
app/javascript/flavours/glitch/util/initial_state.js
View File

@ -13,8 +13,8 @@ const getMeta = (prop) => initialState && initialState.meta && initialState.meta
export const reduceMotion = getMeta('reduce_motion');
export const autoPlayGif = getMeta('auto_play_gif');
export const displaySensitiveMedia = getMeta('display_sensitive_media');
export const displayMedia = getMeta('display_media') || (getMeta('display_sensitive_media') ? 'show_all' : 'default');
export const expandSpoilers = getMeta('expand_spoilers');
export const unfollowModal = getMeta('unfollow_modal');
export const boostModal = getMeta('boost_modal');
export const favouriteModal = getMeta('favourite_modal');
@ -37,5 +37,6 @@ export const useBlurhash = getMeta('use_blurhash');
export const usePendingItems = getMeta('use_pending_items');
export const useSystemEmojiFont = getMeta('system_emoji_font');
export const showTrends = getMeta('trends');
export const disableSwiping = getMeta('disable_swiping');
export default initialState;