mirror of
https://github.com/h3poteto/whalebird-desktop
synced 2025-02-03 18:57:43 +01:00
Fix typos
NFSW -> NSFW (not safe for work) reuqest -> request assocication -> association
This commit is contained in:
parent
f37deb8212
commit
bc77377f64
@ -946,7 +946,7 @@
|
||||
### Added
|
||||
- [#836](https://github.com/h3poteto/whalebird-desktop/pull/836) Add option to hide all attachments
|
||||
- [#833](https://github.com/h3poteto/whalebird-desktop/pull/833) Add tests for Jump modal
|
||||
- [#827](https://github.com/h3poteto/whalebird-desktop/pull/827) Add option to ignore CW and NFSW
|
||||
- [#827](https://github.com/h3poteto/whalebird-desktop/pull/827) Add option to ignore CW and NSFW
|
||||
- [#824](https://github.com/h3poteto/whalebird-desktop/pull/824) Add unit/integration tests for TimelineSpace
|
||||
- [#823](https://github.com/h3poteto/whalebird-desktop/pull/823) Add unit tests for Home
|
||||
- [#820](https://github.com/h3poteto/whalebird-desktop/pull/820) Add intergation tests for Contents/Home
|
||||
|
@ -26,7 +26,7 @@ const state = () => {
|
||||
language: Language.en.key,
|
||||
defaultFonts: DefaultFonts,
|
||||
ignoreCW: false,
|
||||
ignoreNFSW: false,
|
||||
ignoreNSFW: false,
|
||||
hideAllAttachments: false
|
||||
}
|
||||
}
|
||||
@ -74,7 +74,7 @@ describe('App', () => {
|
||||
general: {
|
||||
timeline: {
|
||||
cw: true,
|
||||
nfsw: true
|
||||
nsfw: true
|
||||
}
|
||||
},
|
||||
language: {
|
||||
@ -102,7 +102,7 @@ describe('App', () => {
|
||||
expect(store.state.App.fontSize).toEqual(13)
|
||||
expect(store.state.App.theme).toEqual(DarkTheme)
|
||||
expect(store.state.App.ignoreCW).toEqual(true)
|
||||
expect(store.state.App.ignoreNFSW).toEqual(true)
|
||||
expect(store.state.App.ignoreNSFW).toEqual(true)
|
||||
ipcMain.removeHandler('get-preferences')
|
||||
})
|
||||
})
|
||||
|
@ -15,7 +15,7 @@ const state = (): GeneralState => {
|
||||
},
|
||||
timeline: {
|
||||
cw: false,
|
||||
nfsw: false,
|
||||
nsfw: false,
|
||||
hideAllAttachments: false
|
||||
},
|
||||
other: {
|
||||
@ -114,11 +114,11 @@ describe('Preferences/General', () => {
|
||||
it('should be updated', async () => {
|
||||
await store.dispatch('Preferences/updateTimeline', {
|
||||
cw: true,
|
||||
nfsw: true,
|
||||
nsfw: true,
|
||||
hideAllAttachments: true
|
||||
})
|
||||
expect(store.state.Preferences.general.timeline.cw).toEqual(true)
|
||||
expect(store.state.Preferences.general.timeline.nfsw).toEqual(true)
|
||||
expect(store.state.Preferences.general.timeline.nsfw).toEqual(true)
|
||||
expect(store.state.Preferences.general.timeline.hideAllAttachments).toEqual(true)
|
||||
expect(store.state.Preferences.loading).toEqual(false)
|
||||
})
|
||||
|
@ -11,7 +11,7 @@ describe('Preferences/General', () => {
|
||||
},
|
||||
timeline: {
|
||||
cw: false,
|
||||
nfsw: false,
|
||||
nsfw: false,
|
||||
hideAllAttachments: false
|
||||
},
|
||||
other: {
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Timeline",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -193,7 +193,7 @@
|
||||
"domain": "Domain",
|
||||
"association": "Association",
|
||||
"order": "Order",
|
||||
"remove_association": "Remove assocication",
|
||||
"remove_association": "Remove association",
|
||||
"remove_all_associations": "Remove all associations",
|
||||
"confirm": "Confirm",
|
||||
"cancel": "Cancel",
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Failed to fetch notification",
|
||||
"favourite_fetch_error": "Failed to fetch favorite",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "Failed to start streaming",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Could not attach the file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Zeitleiste",
|
||||
"description": "Passen Sie die Ansicht in Ihren Zeitleisten an.",
|
||||
"cw": "Ignoriere immer Content Warnungen",
|
||||
"nfsw": "Ignogiere immer NFSW Medien",
|
||||
"nsfw": "Ignogiere immer NSFW Medien",
|
||||
"hideAllAttachments": "Verstecke alle Medien"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Benachrichtigung konnte nicht abgerufen werden",
|
||||
"favourite_fetch_error": "Favorit konnte nicht abgerufen werden",
|
||||
"follow_request_accept_error": "Anfrage konnte nicht angenommen werden",
|
||||
"follow_reuqest_reject_error": "konnte die Anfrage nicht ablehnen",
|
||||
"follow_request_reject_error": "konnte die Anfrage nicht ablehnen",
|
||||
"start_streaming_error": "Streaming konnte nicht gestartet werden",
|
||||
"start_all_streamings_error": "Fehler beim Starten des Streamings von {{domain}}",
|
||||
"attach_error": "Kontte Datei nicht anhängen",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Timeline",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -193,7 +193,7 @@
|
||||
"domain": "Domain",
|
||||
"association": "Association",
|
||||
"order": "Order",
|
||||
"remove_association": "Remove assocication",
|
||||
"remove_association": "Remove association",
|
||||
"remove_all_associations": "Remove all associations",
|
||||
"confirm": "Confirm",
|
||||
"cancel": "Cancel",
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Failed to fetch notification",
|
||||
"favourite_fetch_error": "Failed to fetch favorite",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "Failed to start streaming",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Could not attach the file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Línea de tiempo",
|
||||
"description": "Personaliza la vista en tus líneas de tiempo.",
|
||||
"cw": "Ignorar siempre las advertencias de contenidos",
|
||||
"nfsw": "Ignorar siempre NFSW de medios",
|
||||
"nsfw": "Ignorar siempre NSFW de medios",
|
||||
"hideAllAttachments": "Ocultar todos los medios"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Error al obtener la notificación",
|
||||
"favourite_fetch_error": "No se ha podido obtener el favorecido",
|
||||
"follow_request_accept_error": "Error al aceptar la solicitud",
|
||||
"follow_reuqest_reject_error": "no se pudo rechazar la solicitud",
|
||||
"follow_request_reject_error": "no se pudo rechazar la solicitud",
|
||||
"start_streaming_error": "Error al iniciar la transmisión",
|
||||
"start_all_streamings_error": "Error al iniciar la transmisión de {{domain}}",
|
||||
"attach_error": "No se pudo adjuntar el archivo",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Fil d'actualité",
|
||||
"description": "Customisez l'apparence du fil d'actualité",
|
||||
"cw": "Toujours ignorer les avertissements relatifs au contenu",
|
||||
"nfsw": "Toujours ignorer le contenu NSFW",
|
||||
"nsfw": "Toujours ignorer le contenu NSFW",
|
||||
"hideAllAttachments": "Cacher tous les médias"
|
||||
},
|
||||
"other": {
|
||||
@ -193,7 +193,7 @@
|
||||
"domain": "Domaine",
|
||||
"association": "Association",
|
||||
"order": "Ordre",
|
||||
"remove_association": "Supprimer l'assocication",
|
||||
"remove_association": "Supprimer l'association",
|
||||
"remove_all_associations": "Supprimer toutes les associations",
|
||||
"confirm": "Confirmer",
|
||||
"cancel": "Annuler",
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Erreur au chargement des notifications",
|
||||
"favourite_fetch_error": "Erreur au chargement des favoris",
|
||||
"follow_request_accept_error": "Impossible d'accepter la demande",
|
||||
"follow_reuqest_reject_error": "Impossible de refuser la demande",
|
||||
"follow_request_reject_error": "Impossible de refuser la demande",
|
||||
"start_streaming_error": "Erreur au démarrage du flux",
|
||||
"start_all_streamings_error": "Impossible de démarrer la diffusion de {{domain}}",
|
||||
"attach_error": "Impossible de joindre le fichier",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Cronologia",
|
||||
"description": "Personalizza la visualizzazione nelle tue timeline.",
|
||||
"cw": "Ignora sempre gli avvisi sui contenuti",
|
||||
"nfsw": "Ignora sempre contenuti multimediali inappropriati",
|
||||
"nsfw": "Ignora sempre contenuti multimediali inappropriati",
|
||||
"hideAllAttachments": "Nascondi tutti i contenuti multimediali"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Impossibile recuperare le notifiche",
|
||||
"favourite_fetch_error": "Impossibile recuperare i preferiti",
|
||||
"follow_request_accept_error": "Impossibile accettare la richiesta",
|
||||
"follow_reuqest_reject_error": "Impossibile rifiutare la richiesta",
|
||||
"follow_request_reject_error": "Impossibile rifiutare la richiesta",
|
||||
"start_streaming_error": "Impossibile avviare lo streaming",
|
||||
"start_all_streamings_error": "Impossibile avviare lo streaming di {{domain}}",
|
||||
"attach_error": "Non è stato possibile allegare il file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "タイムライン",
|
||||
"description": "タイムラインをカスタマイズ",
|
||||
"cw": "常にCWを表示する",
|
||||
"nfsw": "常にNFSWを表示する",
|
||||
"nsfw": "常にNSFWを表示する",
|
||||
"hideAllAttachments": "すべてのメディアを非表示にする"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "通知の読み込みに失敗しました",
|
||||
"favourite_fetch_error": "お気に入りの読み込みに失敗しました",
|
||||
"follow_request_accept_error": "フォロー申請の承認に失敗しました",
|
||||
"follow_reuqest_reject_error": "フォロー申請の却下に失敗しました",
|
||||
"follow_request_reject_error": "フォロー申請の却下に失敗しました",
|
||||
"start_streaming_error": "ストリーミングを開始できませんでした",
|
||||
"start_all_streamings_error": "{{domain}} のストリーミングを開始できませんでした",
|
||||
"attach_error": "ファイルを添付できませんでした",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Timeline",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "알림을 가져올 수 없습니다",
|
||||
"favourite_fetch_error": "즐겨찾기를 가져올 수 없습니다",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "스트리밍을 시작할 수 없습니다",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "파일을 첨부할 수 없습니다",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Timeline",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -193,7 +193,7 @@
|
||||
"domain": "Domain",
|
||||
"association": "Association",
|
||||
"order": "Order",
|
||||
"remove_association": "Remove assocication",
|
||||
"remove_association": "Remove associations",
|
||||
"remove_all_associations": "Remove all associations",
|
||||
"confirm": "Confirm",
|
||||
"cancel": "Cancel",
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Failed to fetch notification",
|
||||
"favourite_fetch_error": "Failed to fetch favorite",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "Failed to start streaming",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Could not attach the file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Oś czasu",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Nie udało się załadować powiadomień",
|
||||
"favourite_fetch_error": "Nie udało się załadować ulubionych",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "Nie udało się rozpocząć strumieniowania",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Nie udało się załączyć pliku",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Timeline",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -193,7 +193,7 @@
|
||||
"domain": "Domain",
|
||||
"association": "Association",
|
||||
"order": "Order",
|
||||
"remove_association": "Remove assocication",
|
||||
"remove_association": "Remove association",
|
||||
"remove_all_associations": "Remove all associations",
|
||||
"confirm": "Confirm",
|
||||
"cancel": "Cancel",
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Failed to fetch notification",
|
||||
"favourite_fetch_error": "Failed to fetch favorite",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "Failed to start streaming",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Could not attach the file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Timeline",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -193,7 +193,7 @@
|
||||
"domain": "Domain",
|
||||
"association": "Association",
|
||||
"order": "Order",
|
||||
"remove_association": "Remove assocication",
|
||||
"remove_association": "Remove association",
|
||||
"remove_all_associations": "Remove all associations",
|
||||
"confirm": "Confirm",
|
||||
"cancel": "Cancel",
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Failed to fetch notification",
|
||||
"favourite_fetch_error": "Failed to fetch favorite",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "Failed to start streaming",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Could not attach the file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Timeline",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Always ignore NFSW of medias",
|
||||
"nsfw": "Always ignore NSFW of medias",
|
||||
"hideAllAttachments": "Hide all medias"
|
||||
},
|
||||
"other": {
|
||||
@ -193,7 +193,7 @@
|
||||
"domain": "Domain",
|
||||
"association": "Association",
|
||||
"order": "Order",
|
||||
"remove_association": "Remove assocication",
|
||||
"remove_association": "Remove association",
|
||||
"remove_all_associations": "Remove all associations",
|
||||
"confirm": "Confirm",
|
||||
"cancel": "Cancel",
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Failed to fetch notification",
|
||||
"favourite_fetch_error": "Failed to fetch favorite",
|
||||
"follow_request_accept_error": "Failed to accept the request",
|
||||
"follow_reuqest_reject_error": "failed to reject the request",
|
||||
"follow_request_reject_error": "failed to reject the request",
|
||||
"start_streaming_error": "Failed to start streaming",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Could not attach the file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "Ifili n uzmez",
|
||||
"description": "Customize view in your timelines.",
|
||||
"cw": "Always ignore contents warnings",
|
||||
"nfsw": "Nxxel abda tumayin n NFSW",
|
||||
"nsfw": "Nxxel abda tumayin n NSFW",
|
||||
"hideAllAttachments": "Ffer isneɣmisen maṛṛa"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "Failed to fetch notification",
|
||||
"favourite_fetch_error": "Failed to fetch favorite",
|
||||
"follow_request_accept_error": "Azgel n udggi n tutrawin",
|
||||
"follow_reuqest_reject_error": "azgel g waggeyn tutrawin",
|
||||
"follow_request_reject_error": "azgel g waggeyn tutrawin",
|
||||
"start_streaming_error": "Failed to start streaming",
|
||||
"start_all_streamings_error": "Failed to start streaming of {{domain}}",
|
||||
"attach_error": "Could not attach the file",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "时间线",
|
||||
"description": "设定查看时间线的方式。",
|
||||
"cw": "始终展开具有内容警告的嘟文",
|
||||
"nfsw": "总是显示被标记为敏感内容的媒体",
|
||||
"nsfw": "总是显示被标记为敏感内容的媒体",
|
||||
"hideAllAttachments": "总是隐藏所有媒体"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "获取通知失败",
|
||||
"favourite_fetch_error": "获取收藏失败",
|
||||
"follow_request_accept_error": "接受请求失败",
|
||||
"follow_reuqest_reject_error": "拒绝请求失败",
|
||||
"follow_request_reject_error": "拒绝请求失败",
|
||||
"start_streaming_error": "打开流媒体失败",
|
||||
"start_all_streamings_error": "打开 {{domain}} 的流媒体失败",
|
||||
"attach_error": "附加文件失败",
|
||||
|
@ -129,7 +129,7 @@
|
||||
"title": "時間軸",
|
||||
"description": "自訂時間軸外觀",
|
||||
"cw": "永遠忽略內容警告",
|
||||
"nfsw": "永遠忽略 NSFW 媒體標記",
|
||||
"nsfw": "永遠忽略 NSFW 媒體標記",
|
||||
"hideAllAttachments": "隱藏所有媒體"
|
||||
},
|
||||
"other": {
|
||||
@ -404,7 +404,7 @@
|
||||
"notification_fetch_error": "無法載入通知",
|
||||
"favourite_fetch_error": "無法載入最愛",
|
||||
"follow_request_accept_error": "無法接受請求",
|
||||
"follow_reuqest_reject_error": "無法拒絕請求",
|
||||
"follow_request_reject_error": "無法拒絕請求",
|
||||
"start_streaming_error": "無法開始串流",
|
||||
"start_all_streamings_error": "無法開始 {{domain}} 之串流",
|
||||
"attach_error": "無法附加檔案",
|
||||
|
@ -22,7 +22,7 @@ const sound: Sound = {
|
||||
|
||||
const timeline: Timeline = {
|
||||
cw: false,
|
||||
nfsw: false,
|
||||
nsfw: false,
|
||||
hideAllAttachments: false
|
||||
}
|
||||
|
||||
|
@ -17,8 +17,8 @@
|
||||
<el-form-item for="cw" :label="$t('preferences.general.timeline.cw')">
|
||||
<el-switch id="cw" v-model="timeline_cw" active-color="#13ce66"> </el-switch>
|
||||
</el-form-item>
|
||||
<el-form-item for="nfsw" :label="$t('preferences.general.timeline.nfsw')">
|
||||
<el-switch id="nfsw" v-model="timeline_nfsw" active-color="#13ce66"> </el-switch>
|
||||
<el-form-item for="nsfw" :label="$t('preferences.general.timeline.nsfw')">
|
||||
<el-switch id="nsfw" v-model="timeline_nsfw" active-color="#13ce66"> </el-switch>
|
||||
</el-form-item>
|
||||
<el-form-item for="hideAllAttachments" :label="$t('preferences.general.timeline.hideAllAttachments')">
|
||||
<el-switch id="hideAllAttachments" v-model="timeline_hide_attachments" active-color="#13ce66"> </el-switch>
|
||||
@ -76,13 +76,13 @@ export default {
|
||||
})
|
||||
}
|
||||
},
|
||||
timeline_nfsw: {
|
||||
timeline_nsfw: {
|
||||
get() {
|
||||
return this.$store.state.Preferences.General.general.timeline.nfsw
|
||||
return this.$store.state.Preferences.General.general.timeline.nsfw
|
||||
},
|
||||
set(value) {
|
||||
this.$store.dispatch('Preferences/General/updateTimeline', {
|
||||
nfsw: value
|
||||
nsfw: value
|
||||
})
|
||||
}
|
||||
},
|
||||
|
@ -285,7 +285,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
showContent: this.$store.state.App.ignoreCW,
|
||||
showAttachments: this.$store.state.App.ignoreNFSW,
|
||||
showAttachments: this.$store.state.App.ignoreNSFW,
|
||||
hideAllAttachments: this.$store.state.App.hideAllAttachments,
|
||||
now: Date.now(),
|
||||
openEmojiPicker: false,
|
||||
|
@ -23,7 +23,7 @@ export type AppState = {
|
||||
language: string
|
||||
defaultFonts: Array<string>
|
||||
ignoreCW: boolean
|
||||
ignoreNFSW: boolean
|
||||
ignoreNSFW: boolean
|
||||
hideAllAttachments: boolean
|
||||
tootPadding: number
|
||||
userAgent: string
|
||||
@ -46,7 +46,7 @@ const state = (): AppState => ({
|
||||
language: Language.en.key,
|
||||
defaultFonts: DefaultFonts,
|
||||
ignoreCW: false,
|
||||
ignoreNFSW: false,
|
||||
ignoreNSFW: false,
|
||||
hideAllAttachments: false,
|
||||
userAgent: 'Whalebird'
|
||||
})
|
||||
@ -61,7 +61,7 @@ const MUTATION_TYPES = {
|
||||
UPDATE_LANGUAGE: 'updateLanguage',
|
||||
ADD_FONT: 'addFont',
|
||||
UPDATE_IGNORE_CW: 'updateIgnoreCW',
|
||||
UPDATE_IGNORE_NFSW: 'updateIgnoreNFSW',
|
||||
UPDATE_IGNORE_NSFW: 'updateIgnoreNSFW',
|
||||
UPDATE_HIDE_ALL_ATTACHMENTS: 'updateHideAllAttachments'
|
||||
}
|
||||
|
||||
@ -94,8 +94,8 @@ const mutations: MutationTree<AppState> = {
|
||||
[MUTATION_TYPES.UPDATE_IGNORE_CW]: (state: AppState, cw: boolean) => {
|
||||
state.ignoreCW = cw
|
||||
},
|
||||
[MUTATION_TYPES.UPDATE_IGNORE_NFSW]: (state: AppState, nfsw: boolean) => {
|
||||
state.ignoreNFSW = nfsw
|
||||
[MUTATION_TYPES.UPDATE_IGNORE_NSFW]: (state: AppState, nsfw: boolean) => {
|
||||
state.ignoreNSFW = nsfw
|
||||
},
|
||||
[MUTATION_TYPES.UPDATE_HIDE_ALL_ATTACHMENTS]: (state: AppState, hideAllAttachments: boolean) => {
|
||||
state.hideAllAttachments = hideAllAttachments
|
||||
@ -122,7 +122,7 @@ const actions: ActionTree<AppState, RootState> = {
|
||||
commit(MUTATION_TYPES.UPDATE_TOOT_PADDING, conf.appearance.tootPadding)
|
||||
commit(MUTATION_TYPES.ADD_FONT, conf.appearance.font)
|
||||
commit(MUTATION_TYPES.UPDATE_IGNORE_CW, conf.general.timeline.cw)
|
||||
commit(MUTATION_TYPES.UPDATE_IGNORE_NFSW, conf.general.timeline.nfsw)
|
||||
commit(MUTATION_TYPES.UPDATE_IGNORE_NSFW, conf.general.timeline.nsfw)
|
||||
commit(MUTATION_TYPES.UPDATE_HIDE_ALL_ATTACHMENTS, conf.general.timeline.hideAllAttachments)
|
||||
return conf
|
||||
},
|
||||
|
@ -20,7 +20,7 @@ const state = (): GeneralState => ({
|
||||
},
|
||||
timeline: {
|
||||
cw: false,
|
||||
nfsw: false,
|
||||
nsfw: false,
|
||||
hideAllAttachments: false
|
||||
},
|
||||
other: {
|
||||
|
@ -1,5 +1,5 @@
|
||||
export type Timeline = {
|
||||
cw: boolean,
|
||||
nfsw: boolean,
|
||||
nsfw: boolean,
|
||||
hideAllAttachments: boolean
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user