Skip to content

feat: set media player preference as enabled by default #3271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: set media player preference as enabled by default #3271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/status/StatusContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const hideAllMedia = computed(
return currentUser.value ? (getHideMediaByDefault(currentUser.value.account) && (!!status.mediaAttachments.length || !!status.card?.html)) : false
},
)
const embeddedMediaPreference = usePreferences('experimentalEmbeddedMedia')
const embeddedMediaPreference = usePreferences('showEmbeddedMediaPlayer')
const allowEmbeddedMedia = computed(() => status.card?.html && embeddedMediaPreference.value)
</script>

Expand Down
4 changes: 2 additions & 2 deletions composables/settings/definition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ export interface PreferencesSettings {
enablePinchToZoom: boolean
useStarFavoriteIcon: boolean
zenMode: boolean
showEmbeddedMediaPlayer: boolean
experimentalVirtualScroller: boolean
experimentalGitHubCards: boolean
experimentalUserPicker: boolean
experimentalEmbeddedMedia: boolean
}

export interface UserSettings {
Expand Down Expand Up @@ -86,10 +86,10 @@ export const DEFAULT__PREFERENCES_SETTINGS: PreferencesSettings = {
enablePinchToZoom: false,
useStarFavoriteIcon: false,
zenMode: false,
showEmbeddedMediaPlayer: true,
experimentalVirtualScroller: true,
experimentalGitHubCards: true,
experimentalUserPicker: true,
experimentalEmbeddedMedia: false,
}

export function getDefaultUserSettings(locales: string[]): UserSettings {
Expand Down
21 changes: 11 additions & 10 deletions pages/settings/preferences/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ const userSettings = useUserSettings()
>
{{ $t('settings.preferences.enable_autoplay') }}
</SettingsToggleItem>
<!-- Embedded Media -->
<SettingsToggleItem
:checked="getPreferences(userSettings, 'showEmbeddedMediaPlayer')"
@click="togglePreferences('showEmbeddedMediaPlayer')"
>
{{ $t('settings.preferences.embedded_media') }}
<template #description>
{{ $t('settings.preferences.embedded_media_description') }}
</template>
</SettingsToggleItem>
<SettingsToggleItem
:checked="getPreferences(userSettings, 'unmuteVideos')"
@click="togglePreferences('unmuteVideos')"
Expand Down Expand Up @@ -150,16 +160,7 @@ const userSettings = useUserSettings()
<span aria-hidden="true" block i-ri-flask-line />
{{ $t('settings.preferences.title') }}
</h2>
<!-- Embedded Media -->
<SettingsToggleItem
:checked="getPreferences(userSettings, 'experimentalEmbeddedMedia')"
@click="togglePreferences('experimentalEmbeddedMedia')"
>
{{ $t('settings.preferences.embedded_media') }}
<template #description>
{{ $t('settings.preferences.embedded_media_description') }}
</template>
</SettingsToggleItem>

<SettingsToggleItem
:checked="getPreferences(userSettings, 'experimentalVirtualScroller')"
@click="togglePreferences('experimentalVirtualScroller')"
Expand Down
Loading