From 91a5a0bffd819dbd6aae2ca7bf72a33e24011cde Mon Sep 17 00:00:00 2001
From: FoxxMD <FoxxMD@users.noreply.github.com>
Date: Thu, 20 Aug 2026 00:40:05 +0000
Subject: [PATCH] more ignore behavior fixes

---
 .../scrobblers/AbstractScrobbleClient.ts      |  8 +++----
 src/backend/server/api.ts                     | 10 ++++++++-
 src/backend/sources/AbstractSource.ts         |  7 ++++--
 src/client/components/ActivityTimeline.tsx    |  2 +-
 src/client/components/Badges.tsx              | 10 ++++-----
 .../msComponent/MSComponentDetailed.tsx       | 22 +++++++++----------
 src/core/Api.ts                               |  4 ++--
 7 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/backend/scrobblers/AbstractScrobbleClient.ts b/src/backend/scrobblers/AbstractScrobbleClient.ts
index b813671d..e4b48a42 100644
--- a/src/backend/scrobblers/AbstractScrobbleClient.ts
+++ b/src/backend/scrobblers/AbstractScrobbleClient.ts
@@ -467,12 +467,12 @@ export default abstract class AbstractScrobbleClient extends AbstractComponent i
     }
 
     public getRunningState(): ComponentState {
-        if(this.scrobbling) {
-            return COMPONENT_STATE.RUNNING;
-        }
-        if(this.scheduler.getAllJobs().length > 0) {
+        if(this.scrobbleQueuePromise === undefined) {
             return COMPONENT_STATE.IDLE;
         }
+        if(this.scrobbling && !this.isMonitoring()) {
+            return COMPONENT_STATE.IGNORED;
+        }
         return COMPONENT_STATE.RUNNING;
     }
 
diff --git a/src/backend/server/api.ts b/src/backend/server/api.ts
index 0dcc8e1f..a30b715f 100644
--- a/src/backend/server/api.ts
+++ b/src/backend/server/api.ts
@@ -354,8 +354,16 @@ export const setupApi = (app: Express, router: ReturnType<typeof createTypedRout
                     return res.status(500).json({ error: serializeError(e) });
                 }
                 break;
+            case 'ignore':
+                component.monitoringActivity = component.getSystemMonitoring() === false ? undefined : false;
+                component.emitComponentUpdate({state: component.getRunningState()});
+                break;
+            case 'monitor':
+                component.monitoringActivity = component.getSystemMonitoring() === true ? undefined : true;
+                component.emitComponentUpdate({state: component.getRunningState()});
+                break;
             default:
-                return res.status(400).json({ error: { message: `'state' type ${state} is not valid` } });
+                return res.status(400).json({ error: { message: `'state' type ${state} was not handled` } });
         }
         return res.sendStatus(200);
     });
diff --git a/src/backend/sources/AbstractSource.ts b/src/backend/sources/AbstractSource.ts
index 4e0aa48e..b7bcf02d 100644
--- a/src/backend/sources/AbstractSource.ts
+++ b/src/backend/sources/AbstractSource.ts
@@ -2,7 +2,7 @@ import { childLogger, type LogDataPretty, type LogLevel } from '@foxxmd/logging'
 import dayjs, { type Dayjs } from "dayjs";
 import type { EventEmitter } from "events";
 import type { FixedSizeList } from "fixed-size-list";
-import { INGRESS_QUEUE, PARSED_FROM, type PlayMatchResult, type PlayObject, SOURCE_SOT } from "../../core/Atomic.ts";
+import { INGRESS_QUEUE, PARSED_FROM, type PlayMatchResult, type PlayObject, QUEUE_STATUS_COMPLETED, SOURCE_SOT } from "../../core/Atomic.ts";
 import { buildTrackString, capitalize, truncateStringToLength } from "../../core/StringUtils.ts";
 import AbstractComponent from "../common/AbstractComponent.ts";
 import {
@@ -329,7 +329,7 @@ export default abstract class AbstractSource extends AbstractComponent implement
         const running = (this.canPoll && this.polling) || !this.canPoll;
 
         if(running && !this.isMonitoring()) {
-            return COMPONENT_STATE.MUTED;
+            return COMPONENT_STATE.IGNORED;
         }
         return running ? COMPONENT_STATE.RUNNING : COMPONENT_STATE.IDLE;
     }
@@ -987,6 +987,9 @@ export default abstract class AbstractSource extends AbstractComponent implement
                 this.logger.debug(`Not processing ${buildTrackString(currQueuedPlay.play)} because monitoring was disabled when Play was queued.`);
                 state = 'discarded';
                 events.push(stateChangeToPlayEvent({state, reason: 'Not processing because monitoring was disabled when Play was queued'}));
+                updatedQueueState.queueStatus = QUEUE_STATUS_COMPLETED;
+                events.push(queueStateToPlayEvent({...queueState, ...updatedQueueState}));
+                this.playRepo.updateById(currQueuedPlay.id, {state});
                 return;
             } 
 
diff --git a/src/client/components/ActivityTimeline.tsx b/src/client/components/ActivityTimeline.tsx
index 9e3e1bcf..24c6017b 100644
--- a/src/client/components/ActivityTimeline.tsx
+++ b/src/client/components/ActivityTimeline.tsx
@@ -382,7 +382,7 @@ const StateChangeItem = (props: {event: PlayEventPlayStateChange<string>, collap
         <Timeline.Title>
             {text}
         </Timeline.Title>
-        {reason !== undefined && reason !== null ? <Text my={2}>{reason}</Text> : null}
+        {reason !== undefined && reason !== null ? <Timeline.Description>{reason}</Timeline.Description> : null}
         </>);
     }
 
diff --git a/src/client/components/Badges.tsx b/src/client/components/Badges.tsx
index f6e489de..30141d24 100644
--- a/src/client/components/Badges.tsx
+++ b/src/client/components/Badges.tsx
@@ -28,10 +28,8 @@ export const PlayStateBadge = (props: PropsWithChildren<ComponentProps<typeof Ba
         badgeText = 'Dead Queued';
       }
       break;
-    case 'discarded':
-      badgeColor = 'grey';
-      break;
     case 'duped':
+    case 'discarded':
       badgeColor = 'orange';
       break;
   }
@@ -114,10 +112,10 @@ export const ComponentStateBadge = (props: ComponentProps<typeof Badge> & {
             badgeColor = 'red';
             break;
         case COMPONENT_STATE.IDLE:
-            badgeColor = 'orange';
+            badgeColor = 'yellow';
             break;
-        case COMPONENT_STATE.MUTED:
-            badgeColor = 'yellow';  
+        case COMPONENT_STATE.IGNORED:
+            badgeColor = 'orange';  
             break;
     }
 
diff --git a/src/client/components/msComponent/MSComponentDetailed.tsx b/src/client/components/msComponent/MSComponentDetailed.tsx
index 05050e92..8af9783c 100644
--- a/src/client/components/msComponent/MSComponentDetailed.tsx
+++ b/src/client/components/msComponent/MSComponentDetailed.tsx
@@ -162,16 +162,16 @@ const dialog = createOverlay<AuthDialogProps>((props) => {
   )
 })
 
-const stateIsStarted = (state: ComponentState): boolean => state <= COMPONENT_STATE.MUTED;
+const stateIsStarted = (state: ComponentState): boolean => state <= COMPONENT_STATE.IGNORED;
 
 const componentStateMenuItem = (Icon: IconType, value: string, name?: string) => (props: Pick<MenuItemProps, 'disabled'> = {}) => {
     return (<Menu.Item key={value} value={value} {...props}><Icon/><Box flex="1">{name ?? capitalize(value)}</Box></Menu.Item>);
 }
-const MenuItemRestart = componentStateMenuItem(RetryIcon, 'restart');
-const MenuItemStop = componentStateMenuItem(PowerOffIcon, 'stop');
-const MenuItemStart = componentStateMenuItem(PowerIcon, 'start');
-const MenuItemMute = componentStateMenuItem(EyeClosedIcon, 'mute', 'Ignore')
-const MenuItemUnmute = componentStateMenuItem(EyeIcon, 'unmute', 'Monitor');
+const MenuItemRestart = componentStateMenuItem(RetryIcon, 'Restart');
+const MenuItemStop = componentStateMenuItem(PowerOffIcon, 'Stop');
+const MenuItemStart = componentStateMenuItem(PowerIcon, 'Start');
+const MenuItemIgnore = componentStateMenuItem(EyeClosedIcon, 'ignore', 'Ignore')
+const MenuItemMonitor = componentStateMenuItem(EyeIcon, 'monitor', 'Monitor');
 const MenuItemAuth = componentStateMenuItem(UnlockIconRaw, 'auth', 'Auth');
 
 const primaryActionProps: ComponentProps<typeof PowerOffButton> = {
@@ -212,15 +212,15 @@ export const ComponentStateBadgeActionable = (props: Omit<ComponentProps<typeof
     switch(props.data.state) {
         case COMPONENT_STATE.RUNNING:
             primaryAction = <RetryButton onClick={() => mutate('restart')} disabled={isPending} {...primaryActionProps}/>
-            menuItems = [<MenuItemStop/>,<MenuItemMute disabled/>];
+            menuItems = [<MenuItemStop/>,<MenuItemIgnore/>];
             break;
         case COMPONENT_STATE.IDLE:
             primaryAction = <PowerButton onClick={() => mutate('start')} disabled={isPending} {...primaryActionProps}/>
-            menuItems = [<MenuItemStop/>,<MenuItemRestart/>,<MenuItemMute disabled/>];
+            menuItems = [<MenuItemStop/>,<MenuItemRestart/>,<MenuItemIgnore/>];
             break;
-        case COMPONENT_STATE.MUTED:
-            primaryAction = <EyeButton  disabled={isPending} {...primaryActionProps}/>;
-            menuItems = [<MenuItemStop/>,<MenuItemRestart/>,<MenuItemUnmute disabled/>];
+        case COMPONENT_STATE.IGNORED:
+            primaryAction = <EyeButton onClick={() => mutate('monitor')} disabled={isPending} {...primaryActionProps}/>;
+            menuItems = [<MenuItemStop/>,<MenuItemRestart/>,<MenuItemMonitor/>];
             break;
         case COMPONENT_STATE.STOPPED:
             primaryAction = <PowerButton onClick={() => mutate('start')} disabled={isPending} {...primaryActionProps}/>
diff --git a/src/core/Api.ts b/src/core/Api.ts
index 2bab8d94..f9df5fc9 100644
--- a/src/core/Api.ts
+++ b/src/core/Api.ts
@@ -48,7 +48,7 @@ export interface PlayApiCommonDetailed extends PlayApiCommon {
 export type ComponentState = 1 | 2 | 3 | 4 | 5 | 6 | 7;
 export const COMPONENT_STATE = {
     RUNNING: 1,
-    MUTED: 2,
+    IGNORED: 2,
     IDLE: 3,
     STOPPED: 4,
     INITIALIZING: 5,
@@ -216,7 +216,7 @@ export type CompareDateSingle<D extends DateLike = Dayjs> = {
 export type CacheClearType = 'external-api' | 'transforms';
 
 export const componentStateBodySchema = z.object({
-    state: z.enum(["stop","start","restart","mute","unmute"]),
+    state: z.enum(["stop","start","restart","ignore","monitor"]),
     reason: z.string().optional()
 });
 
-- 
2.51.2