kryten-webqueue 0.14.0__tar.gz → 0.14.1__tar.gz

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
+## [0.14.1] — 2026-06-13
+
+### Fixed
+
+- **Cancel/refund PM notifications only fire for AFK owners.** A user who *leaves* the channel is no longer connected to CyTube and cannot receive a PM, so the leave path now skips the notification entirely (the refund + WS state update still happen). AFK owners — who are still present — are PM'd as before. `presence_refund.notify_user` now governs the AFK case only.
+- **`no_repeat` promo selection is now deterministic.** When a `no_repeat` random draw matched the previous clip it was retried up to 8 times and could still return a repeat (a flaky guarantee for small pools). It now draws from the pool excluding the last clip, so a consecutive repeat never occurs for pools of 2+.
+
 ## [0.14.0] — 2026-06-13
 
 ### Added

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryten-webqueue
-Version: 0.14.0
+Version: 0.14.1
 Summary: Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube
 Author: grobertson
 License-Expression: MIT

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/docs/PLAN_PRESENCE_AND_PROMOS.md

@@ -419,6 +419,10 @@ load-time. (FP and general promos stay purely poller-driven.)
   a notice.)
 
   **RESOLVED (v0.13.0):** a PM is now sent. On a presence-based cancel the owner
-  receives a PM ("… cancelled and refunded because you left the channel / you
-  went AFK"), gated by `presence_refund.notify_user` (default on) and best-effort
-  so a failed PM never blocks the refund.
+  receives a PM ("… cancelled and refunded because you went AFK"), gated by
+  `presence_refund.notify_user` (default on) and best-effort so a failed PM never
+  blocks the refund.
+
+  **AMENDED (v0.14.1):** the PM only fires for **AFK** owners. A user who *left*
+  the channel is no longer connected to CyTube and cannot receive a PM, so the
+  leave path skips the notice (refund + WS state update still happen).

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/kryten_webqueue/config.py

@@ -35,7 +35,8 @@ class PresenceRefundConfig(BaseModel):
     off if running against an older Robot whose ``meta.afk`` goes stale.
 
     ``notify_user`` PMs the owner when a pending paid item is cancelled & refunded
-    so the cancellation isn't silent.
+    so the cancellation isn't silent. This only applies to **AFK** owners — a
+    user who left the channel is no longer connected and cannot receive a PM.
     """
 
     enabled: bool = True
@@ -43,7 +44,7 @@ class PresenceRefundConfig(BaseModel):
     on_afk: bool = True               # needs Kryten-Robot >= 1.10.0 deployed
     grace_seconds: float = 60.0       # wait before acting; re-check after grace
     check_interval_seconds: float = 15.0  # how often to evaluate owners
-    notify_user: bool = True          # PM the owner on cancel/refund
+    notify_user: bool = True          # PM the AFK owner on cancel/refund
 
 
 class PromoTypeConfig(BaseModel):

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/kryten_webqueue/promos/director.py

@@ -221,10 +221,13 @@ class PromoDirector:
             clip = self._rng.choice(pool)
             if self._config.general.no_repeat and len(pool) > 1:
                 last = self._last_clip_token.get(promo_type)
-                attempts = 0
-                while clip.get("media_id") == last and attempts < 8:
-                    clip = self._rng.choice(pool)
-                    attempts += 1
+                if clip.get("media_id") == last:
+                    # Draw from the rest of the pool so the no-repeat guarantee
+                    # always holds (bounded random retries could otherwise give
+                    # up and return a repeat).
+                    alternatives = [c for c in pool if c.get("media_id") != last]
+                    if alternatives:
+                        clip = self._rng.choice(alternatives)
         self._last_clip_token[promo_type] = clip.get("media_id")
         return clip
 

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/kryten_webqueue/queue/presence.py

@@ -178,19 +178,24 @@ class PresenceRefundMonitor:
     async def _notify_owner(self, item: dict, reason: str):
         """PM the owner that their paid item was cancelled & refunded.
 
+        Only AFK owners are notified: a user who *left* the channel is no longer
+        connected to CyTube and cannot receive a PM, so there is no point trying.
+        AFK users are still present and will see the message.
+
         Best-effort: a failed PM never blocks the cancel/refund itself.
         """
         if not getattr(self._config, "notify_user", False):
             return
+        if reason != "owner_afk":
+            return  # owner left the channel — unreachable by PM
         owner = item.get("paid_by")
         if not owner:
             return
-        why = "you left the channel" if reason == "owner_left" else "you went AFK"
         title = item.get("title") or "your queued item"
         try:
             await self._api_gate.send_pm(
                 owner,
-                f"Your queued item \"{title}\" was cancelled and refunded because {why}.",
+                f"Your queued item \"{title}\" was cancelled and refunded because you went AFK.",
             )
         except Exception:
             logger.debug("Presence cancel: failed to PM %s", owner, exc_info=True)

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kryten-webqueue"
-version = "0.14.0"
+version = "0.14.1"
 description = "Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube"
 readme = "README.md"
 license = "MIT"

{kryten_webqueue-0.14.0 → kryten_webqueue-0.14.1}/tests/test_presence_refund.py

@@ -126,12 +126,13 @@ async def test_owner_offline_cancels_paid_keeps_free():
     assert ws.messages and ws.messages[-1]["type"] == "queue_state"
 
 
-async def test_cancel_pms_owner_when_notify_enabled():
+async def test_afk_cancel_pms_owner_when_notify_enabled():
+    # AFK owners are still connected and CAN be PM'd.
     shadow = _FakeShadow([_paid(11, "alice", title="Cool Video")], now_playing={"uid": 10})
-    api = _FakeApiGate({"alice": {"online": False}}, np={"uid": 10})
+    api = _FakeApiGate({"alice": {"online": True, "meta": {"afk": True}}}, np={"uid": 10})
     db = _FakeDb({11: {"request_id": "r11", "username": "alice"}})
     ws = _FakeWs()
-    mon = _monitor(api, shadow, db, ws, notify_user=True)
+    mon = _monitor(api, shadow, db, ws, notify_user=True, on_afk=True)
 
     await mon.check_once()                        # first sighting: starts grace
     await mon.check_once()                        # grace elapsed: acts
@@ -140,21 +141,36 @@ async def test_cancel_pms_owner_when_notify_enabled():
     user, msg = api.pms[0]
     assert user == "alice"
     assert "Cool Video" in msg
-    assert "left the channel" in msg
+    assert "AFK" in msg
 
 
-async def test_cancel_silent_when_notify_disabled():
+async def test_left_channel_cancel_does_not_pm():
+    # A user who LEFT the channel is unreachable by PM — no PM attempted.
     shadow = _FakeShadow([_paid(11, "alice")], now_playing={"uid": 10})
     api = _FakeApiGate({"alice": {"online": False}}, np={"uid": 10})
     db = _FakeDb({11: {"request_id": "r11", "username": "alice"}})
     ws = _FakeWs()
-    mon = _monitor(api, shadow, db, ws, notify_user=False)
+    mon = _monitor(api, shadow, db, ws, notify_user=True)
 
     await mon.check_once()
     await mon.check_once()
 
     assert api.refunds == [("alice", "r11", "owner_left")]
     assert api.pms == []
+
+
+async def test_cancel_silent_when_notify_disabled():
+    shadow = _FakeShadow([_paid(11, "alice")], now_playing={"uid": 10})
+    api = _FakeApiGate({"alice": {"online": True, "meta": {"afk": True}}}, np={"uid": 10})
+    db = _FakeDb({11: {"request_id": "r11", "username": "alice"}})
+    ws = _FakeWs()
+    mon = _monitor(api, shadow, db, ws, notify_user=False, on_afk=True)
+
+    await mon.check_once()
+    await mon.check_once()
+
+    assert api.refunds == [("alice", "r11", "owner_afk")]
+    assert api.pms == []
     shadow = _FakeShadow([_paid(11, "bob")], now_playing={"uid": 10})
     api = _FakeApiGate({"bob": {"meta": {"afk": True}}}, np={"uid": 10})
     db = _FakeDb({11: {"request_id": "r11", "username": "bob"}})