From 42c458a736d88bf4b0f18fa23c08273ddf9c7ca5 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Fri, 5 Jul 2024 14:24:53 +0200
Subject: [PATCH] feat: simplify playPopSound setting check

---
 frontend/src/components/tasks/partials/KanbanCard.vue    | 3 +--
 frontend/src/components/tasks/partials/RelatedTasks.vue  | 3 +--
 .../components/tasks/partials/SingleTaskInProject.vue    | 3 +--
 frontend/src/helpers/playPop.ts                          | 9 +++++++--
 frontend/src/views/tasks/TaskDetailView.vue              | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/tasks/partials/KanbanCard.vue b/frontend/src/components/tasks/partials/KanbanCard.vue
index a5334b826..1b33c5446 100644
--- a/frontend/src/components/tasks/partials/KanbanCard.vue
+++ b/frontend/src/components/tasks/partials/KanbanCard.vue
@@ -111,7 +111,6 @@ import {formatDateLong, formatISO, formatDateSince} from '@/helpers/time/formatD
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 import {useTaskStore} from '@/stores/tasks'
 import AssigneeList from '@/components/tasks/partials/AssigneeList.vue'
-import {useAuthStore} from '@/stores/auth'
 import {playPopSound} from '@/helpers/playPop'
 import {isEditorContentEmpty} from '@/helpers/editorContentEmpty'
 
@@ -137,7 +136,7 @@ async function toggleTaskDone(task: ITask) {
 			done: !task.done,
 		})
 
-		if (updatedTask.done && useAuthStore().settings.frontendSettings.playSoundWhenDone) {
+		if (updatedTask.done) {
 			playPopSound()
 		}
 	} finally {
diff --git a/frontend/src/components/tasks/partials/RelatedTasks.vue b/frontend/src/components/tasks/partials/RelatedTasks.vue
index bfbf932a3..34c140db8 100644
--- a/frontend/src/components/tasks/partials/RelatedTasks.vue
+++ b/frontend/src/components/tasks/partials/RelatedTasks.vue
@@ -204,7 +204,6 @@ import FancyCheckbox from '@/components/input/FancyCheckbox.vue'
 import {error, success} from '@/message'
 import {useTaskStore} from '@/stores/tasks'
 import {useProjectStore} from '@/stores/projects'
-import {useAuthStore} from '@/stores/auth'
 import {playPopSound} from '@/helpers/playPop'
 
 const props = defineProps({
@@ -380,7 +379,7 @@ async function createAndRelateTask(title: string) {
 async function toggleTaskDone(task: ITask) {
 	await taskStore.update(task)
 	
-	if (task.done && useAuthStore().settings.frontendSettings.playSoundWhenDone) {
+	if (task.done) {
 		playPopSound()
 	}
 	
diff --git a/frontend/src/components/tasks/partials/SingleTaskInProject.vue b/frontend/src/components/tasks/partials/SingleTaskInProject.vue
index 5d0597111..b98814861 100644
--- a/frontend/src/components/tasks/partials/SingleTaskInProject.vue
+++ b/frontend/src/components/tasks/partials/SingleTaskInProject.vue
@@ -205,7 +205,6 @@ import {useTaskStore} from '@/stores/tasks'
 import AssigneeList from '@/components/tasks/partials/AssigneeList.vue'
 import {useIntervalFn} from '@vueuse/core'
 import {playPopSound} from '@/helpers/playPop'
-import {useAuthStore} from '@/stores/auth'
 import {isEditorContentEmpty} from '@/helpers/editorContentEmpty'
 import {TASK_REPEAT_MODES} from '@/types/IRepeatMode'
 
@@ -311,7 +310,7 @@ async function markAsDone(checked: boolean, wasReverted: boolean = false) {
 			return
 		}
 
-		if (checked && useAuthStore().settings.frontendSettings.playSoundWhenDone) {
+		if (checked) {
 			playPopSound()
 		}
 		emit('taskUpdated', newTask)
diff --git a/frontend/src/helpers/playPop.ts b/frontend/src/helpers/playPop.ts
index b16cf68bb..2d25e6826 100644
--- a/frontend/src/helpers/playPop.ts
+++ b/frontend/src/helpers/playPop.ts
@@ -1,8 +1,13 @@
+import {useAuthStore} from '@/stores/auth'
+
 import popSoundFile from '@/assets/audio/pop.mp3'
 
-export const playSoundWhenDoneKey = 'playSoundWhenTaskDone'
-
 export function playPopSound() {
+	const playSoundWhenDone = useAuthStore().settings.frontendSettings.playSoundWhenDone
+
+	if (!playSoundWhenDone)
+		return
+
 	try {
 		const popSound = new Audio(popSoundFile)
 		popSound.play()
diff --git a/frontend/src/views/tasks/TaskDetailView.vue b/frontend/src/views/tasks/TaskDetailView.vue
index 573e01674..749bb1d1d 100644
--- a/frontend/src/views/tasks/TaskDetailView.vue
+++ b/frontend/src/views/tasks/TaskDetailView.vue
@@ -879,7 +879,7 @@ function toggleTaskDone() {
 		done: !task.value.done,
 	}
 
-	if (newTask.done && authStore.settings.frontendSettings.playSoundWhenDone) {
+	if (newTask.done) {
 		playPopSound()
 	}