telepost-bot 2.84.3__tar.gz → 2.84.4__tar.gz

{telepost_bot-2.84.3 → telepost_bot-2.84.4}/CHANGELOG.md

@@ -8,6 +8,15 @@
 > 发布说明面向普通用户：写「对用户有什么改变」，不写内部实现细节（模块名、函数名、配置键）；
 > 技术细节放进代码注释或 `docs/`。每个 Release 的正文由本文件对应版本段自动生成。
 
+## [2.84.4](https://github.com/redtidev1918/TelePost/compare/v2.84.3...v2.84.4) (2026-10-24)
+
+
+### Bug Fixes
+
+* drop chain asset refs that belong to a different work ([f277843](https://github.com/redtidev1918/TelePost/commit/f2778430929694219321c49864ec10e6bd31e16e))
+* keep staged media kind when chain assets downgrade to photo ([d6ae2d1](https://github.com/redtidev1918/TelePost/commit/d6ae2d1c3c316278c2364d98966802ebac841b39))
+* plan replacement publications with the real staged media type ([59f0af9](https://github.com/redtidev1918/TelePost/commit/59f0af92b76c959ea653111674933db3a603e94f))
+
 ## [2.84.3](https://github.com/redtidev1918/TelePost/compare/v2.84.2...v2.84.3) (2026-10-24)
 
 

{telepost_bot-2.84.3/telepost_bot.egg-info → telepost_bot-2.84.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: telepost-bot
-Version: 2.84.3
+Version: 2.84.4
 Summary: Telegram submission, review, and publication bot with a Mini App, HTTP API, and multi-bot supervisor.
 Author: redtidev1918
 License-Expression: MIT

{telepost_bot-2.84.3 → telepost_bot-2.84.4}/handlers/publish.py

@@ -745,7 +745,7 @@ async def publish_from_file_ids(bot, media, documents, *, tags="", title="",
     assets = [MediaAsset.coerce(a) for a in (media_assets or [])]
 
     if assets:
-        plan = plan_review_media(media, assets, documents=documents)
+        plan = plan_review_media(media, assets, documents=documents, work_id=pid)
         items = plan.to_media_items(spoiler=spoiler)
     else:
         items = _items_from_dicts([

{telepost_bot-2.84.3 → telepost_bot-2.84.4}/telepost/application/delivery_planner.py

@@ -111,6 +111,23 @@ def _asset_kind_to_media_kind(asset_kind: str) -> str:
     return str(asset_kind).strip().lower()
 
 
+def _asset_belongs_to_other_work(asset_id: str, work_id: str) -> bool:
+    """True only for a ``pixiv:<work_id>:...`` ref whose work is NOT this one.
+
+    Unparseable / non-pixiv asset ids stay (conservative): filtering them would
+    silently drop legitimate uploads. A chain's refs are replaced per
+    submission, but a refetch replacement that arrives without its own asset
+    manifest leaves the SUPERSEDED work's refs on the chain — publishing must
+    never ship another work's pictures as this submission's content (review
+    208: a 4-page illustration refetch-replaced by a ugoira).
+    """
+    parts = str(asset_id or "").split(":")
+    if len(parts) < 3 or parts[0] != "pixiv":
+        return False
+    ref_work = parts[1].strip()
+    return bool(ref_work) and bool(work_id) and ref_work != work_id
+
+
 def _overall_strategy(entries: List[MediaPlanEntry]) -> str:
     if not entries:
         return "empty"
@@ -126,7 +143,8 @@ def _overall_strategy(entries: List[MediaPlanEntry]) -> str:
 
 def plan_review_media(media: List[Dict[str, Any]],
                       media_assets: List[Dict[str, Any]],
-                      *, documents: Optional[List[Dict[str, Any]]] = None) -> MediaDeliveryPlan:
+                      *, documents: Optional[List[Dict[str, Any]]] = None,
+                      work_id: str = "") -> MediaDeliveryPlan:
     """Build a delivery plan from a review's local media + canonical asset refs.
 
     ``media`` / ``documents`` mirror the raw ``pending_reviews`` JSON arrays
@@ -137,8 +155,14 @@ def plan_review_media(media: List[Dict[str, Any]],
     Positional pairing (same index) is used because PixivFlow manifests are
     ordered and match the Telegram file list order; a mismatch can ONLY fall
     back to ``remote_url`` and never produces a bogus file_id.
+
+    ``work_id`` drops chain refs that provably belong to a DIFFERENT pixiv
+    work (a refetch replacement may leave the superseded work's refs behind).
     """
     assets = [MediaAsset.coerce(a) for a in (media_assets or [])]
+    if work_id:
+        assets = [a for a in assets
+                  if not _asset_belongs_to_other_work(a.asset_id, work_id)]
     media_items = list(media or [])
     document_items = list(documents or [])
     local_items = media_items + document_items
@@ -182,8 +206,10 @@ def plan_review_media(media: List[Dict[str, Any]],
         else:
             local = local_items[index] if index < len(local_items) else None
         # The indexed local item is authoritative for presentation: a Telegram
-        # TXT document must never be sent as a photo, even though the matching
-        # canonical asset ref is kind=image (novel covers + TXT document case).
+        # TXT document must never be sent as a photo, and a staged animation /
+        # video / audio file_id must keep its real Telegram type even when the
+        # canonical asset ref (or a stale refetch-chain ref) says kind=image
+        # (review 208: sendPhoto on an animation file_id is a certain reject).
         local_kind = (
             str(local.get("type") or local.get("kind") or "")
             .strip().lower().replace("-", "_")
@@ -198,6 +224,8 @@ def plan_review_media(media: List[Dict[str, Any]],
         )
         if is_document:
             kind = MediaKind.DOCUMENT.value
+        elif local_kind:
+            kind = _asset_kind_to_media_kind(local_kind)
         else:
             kind = MediaKind.PHOTO.value
         local_file_id = (str(local.get("file_id") or "").strip()

{telepost_bot-2.84.3 → telepost_bot-2.84.4}/telepost/build_info.py

@@ -8,7 +8,7 @@ to the entry points; when present it overrides these committed defaults.
 # Bumped automatically by release-please (extra-files in
 # release-please-config.json). Release bundles and images override it at build
 # time with the exact version/commit; this constant is the local-dev fallback.
-RELEASE_VERSION = "2.84.3"  # x-release-please-version
+RELEASE_VERSION = "2.84.4"  # x-release-please-version
 RELEASE_COMMIT = "dev"
 BUILD_DATE = "dev"
 SERVICE = "telepost"

{telepost_bot-2.84.3 → telepost_bot-2.84.4/telepost_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: telepost-bot
-Version: 2.84.3
+Version: 2.84.4
 Summary: Telegram submission, review, and publication bot with a Mini App, HTTP API, and multi-bot supervisor.
 Author: redtidev1918
 License-Expression: MIT

telepost_bot-2.84.4/tests/test_delivery_planner.py

@@ -0,0 +1,210 @@
+"""Step 11 DeliveryPlanner: TelePost decides how to deliver review media."""
+import pytest
+
+from telepost.application.delivery_planner import (
+    STRATEGY_FILE_ID,
+    STRATEGY_REMOTE_URL,
+    plan_review_media,
+)
+
+
+class TestPlanReviewMedia:
+    def test_no_assets_uses_local_file_ids(self):
+        plan = plan_review_media(
+            [{"type": "photo", "file_id": "AAA"}],
+            [],
+        )
+        assert plan.strategy == STRATEGY_FILE_ID
+        assert len(plan.entries) == 1
+        assert plan.entries[0].strategy == STRATEGY_FILE_ID
+        assert plan.entries[0].file_id == "AAA"
+
+    def test_asset_with_file_id_prefers_zero_reupload(self):
+        plan = plan_review_media(
+            [{"type": "photo", "file_id": "AAA"}],
+            [{"asset_id": "pixiv-1", "kind": "image",
+              "source_url": "https://i.pximg.net/1.jpg"}],
+        )
+        assert plan.strategy == STRATEGY_FILE_ID
+        assert plan.entries[0].strategy == STRATEGY_FILE_ID
+        assert plan.entries[0].asset_id == "pixiv-1"
+
+    def test_asset_without_file_id_falls_back_to_remote_url(self):
+        plan = plan_review_media(
+            [],
+            [{"asset_id": "pixiv-1", "kind": "image",
+              "source_url": "https://proxy.example/pixiv/1.jpg"}],
+        )
+        assert plan.strategy == STRATEGY_REMOTE_URL
+        assert plan.entries[0].strategy == STRATEGY_REMOTE_URL
+        assert plan.entries[0].source_url == "https://proxy.example/pixiv/1.jpg"
+
+    def test_mixed_plan(self):
+        plan = plan_review_media(
+            [{"type": "photo", "file_id": "AAA"}],
+            [
+                {"asset_id": "a1", "kind": "image", "source_url": "https://x/a"},
+                {"asset_id": "a2", "kind": "image", "source_url": "https://x/b"},
+            ],
+        )
+        assert plan.strategy == "mixed"
+        strategies = [e.strategy for e in plan.entries]
+        assert strategies == [STRATEGY_FILE_ID, STRATEGY_REMOTE_URL]
+
+    def test_stale_chain_asset_never_downgrades_local_animation_to_photo(self):
+        """Regression (review 208): a refetch replacement staged an animation
+        file_id while the chain's media_asset_refs still declared the OLD
+        multi-page work as kind=image. The indexed local item is authoritative:
+        sendPhoto on an animation file_id is a certain Telegram reject."""
+        plan = plan_review_media(
+            [{"type": "animation", "file_id": "UGOIRA_FID"}],
+            [
+                {"asset_id": "pixiv:1:illust:page-1", "kind": "image",
+                 "source_url": "https://x/1"},
+                {"asset_id": "pixiv:1:illust:page-2", "kind": "image",
+                 "source_url": "https://x/2"},
+            ],
+        )
+        assert plan.entries[0].kind == "animation"
+        assert plan.entries[0].strategy == STRATEGY_FILE_ID
+        assert plan.entries[0].file_id == "UGOIRA_FID"
+        # The asset-only tail keeps the documented remote fallback.
+        assert plan.entries[1].kind == "photo"
+        assert plan.entries[1].strategy == STRATEGY_REMOTE_URL
+
+    def test_local_video_and_audio_keep_their_kind_with_image_assets(self):
+        plan = plan_review_media(
+            [
+                {"type": "video", "file_id": "VID"},
+                {"type": "audio", "file_id": "AUD"},
+            ],
+            [
+                {"asset_id": "a1", "kind": "image", "source_url": "https://x/1"},
+                {"asset_id": "a2", "kind": "image", "source_url": "https://x/2"},
+            ],
+        )
+        assert [e.kind for e in plan.entries] == ["video", "audio"]
+        assert all(e.file_id for e in plan.entries)
+
+    def test_foreign_work_refs_are_dropped_from_the_plan(self):
+        """Regression (review 208): a ugoira refetch-replaced a 4-page
+        illustration; the chain kept the OLD work's pixiv refs. With work_id
+        the plan must contain ONLY this work's staged animation — never the
+        superseded work's pages as remote photos."""
+        plan = plan_review_media(
+            [{"type": "animation", "file_id": "UGOIRA_FID"}],
+            [
+                {"asset_id": "pixiv:151182115:illust:page-1", "kind": "image",
+                 "source_url": "https://x/1"},
+                {"asset_id": "pixiv:151182115:illust:page-2", "kind": "image",
+                 "source_url": "https://x/2"},
+                {"asset_id": "pixiv:151182115:illust:page-3", "kind": "image",
+                 "source_url": "https://x/3"},
+                {"asset_id": "pixiv:151182115:illust:page-4", "kind": "image",
+                 "source_url": "https://x/4"},
+            ],
+            work_id="151190970",
+        )
+        assert len(plan.entries) == 1
+        entry = plan.entries[0]
+        assert entry.kind == "animation"
+        assert entry.strategy == STRATEGY_FILE_ID
+        assert entry.file_id == "UGOIRA_FID"
+
+    def test_same_work_and_non_pixiv_refs_survive_the_filter(self):
+        plan = plan_review_media(
+            [{"type": "document", "file_id": "TXT"}],
+            [
+                {"asset_id": "pixiv:29430449:novelcover", "kind": "image",
+                 "source_url": "https://x/cover"},
+                {"asset_id": "uploadedimage:abc", "kind": "image",
+                 "source_url": "https://x/up"},
+                {"asset_id": "pixiv:29430449:illust:page-1", "kind": "image",
+                 "source_url": "https://x/1"},
+            ],
+            work_id="29430449",
+        )
+        kinds = [e.kind for e in plan.entries]
+        # same-work cover + upload pair first, TXT document keeps its slot.
+        assert "photo" in kinds and "document" in kinds
+        assert not any(e.asset_id and e.asset_id.startswith("pixiv:999") for e in plan.entries)
+
+    def test_no_work_id_keeps_legacy_unfiltered_behavior(self):
+        plan = plan_review_media(
+            [{"type": "animation", "file_id": "UGOIRA_FID"}],
+            [
+                {"asset_id": "pixiv:151182115:illust:page-1", "kind": "image",
+                 "source_url": "https://x/1"},
+                {"asset_id": "pixiv:151182115:illust:page-2", "kind": "image",
+                 "source_url": "https://x/2"},
+            ],
+        )
+        assert [e.kind for e in plan.entries] == ["animation", "photo"]
+        assert plan.entries[1].strategy == STRATEGY_REMOTE_URL
+
+    def test_local_photo_stays_photo_with_image_asset(self):
+        plan = plan_review_media(
+            [{"type": "photo", "file_id": "AAA"}],
+            [{"asset_id": "a1", "kind": "image", "source_url": "https://x/a"}],
+        )
+        assert plan.entries[0].kind == "photo"
+
+    def test_indexed_document_is_not_photo(self):
+        """Regression: novel cover assets + indexed TXT file_id."""
+        plan = plan_review_media(
+            [],
+            [
+                {"asset_id": "a1", "kind": "image",
+                 "source_url": "https://x/a"},
+                {"asset_id": "txt", "kind": "image",
+                 "source_url": "https://x/txt"},
+            ],
+            documents=[{"file_id": "DDD", "filename": "novel.txt"}],
+        )
+        assert [e.kind for e in plan.entries] == ["photo", "document"]
+        assert plan.strategy == "mixed"
+        items = plan.to_media_items()
+        assert items[0].kind.value == "photo"
+        assert items[1].kind.value == "document"
+        assert items[1].telegram_file_id == "DDD"
+
+    def test_single_cover_asset_pairs_with_indexed_txt_document(self):
+        """Regression: a novel with one cover asset and one TXT must not plan
+        the TXT as a photo; that made novel_images_preview_only remove every
+        item and the publication failed with "delivery returned no messages"."""
+        plan = plan_review_media(
+            [],
+            [{"asset_id": "cover", "kind": "image",
+              "source_url": "https://i.pximg.net/cover.png"}],
+            documents=[{"file_id": "TXT_FILE_ID", "filename": "novel.txt"}],
+        )
+        assert [e.kind for e in plan.entries] == ["document"]
+        assert [e.strategy for e in plan.entries] == [STRATEGY_FILE_ID]
+        assert plan.entries[0].file_id == "TXT_FILE_ID"
+        assert plan.entries[0].filename == "novel.txt"
+
+    def test_leftover_document_keeps_file_id(self):
+        plan = plan_review_media(
+            [{"type": "photo", "file_id": "AAA"}],
+            [{"asset_id": "a1", "kind": "image", "source_url": "https://x/a"}],
+            documents=[{"file_id": "DDD", "filename": "novel.txt"}],
+        )
+        assert [e.kind for e in plan.entries] == ["photo", "document"]
+        assert [e.strategy for e in plan.entries] == [STRATEGY_FILE_ID, STRATEGY_FILE_ID]
+        assert plan.entries[1].file_id == "DDD"
+
+    def test_empty_plan(self):
+        plan = plan_review_media([], [])
+        assert plan.strategy == "empty"
+        assert plan.to_media_items() == []
+
+    def test_to_media_items(self):
+        plan = plan_review_media(
+            [],
+            [{"asset_id": "a1", "kind": "image",
+              "source_url": "https://proxy.example/pixiv/1.jpg"}],
+        )
+        items = plan.to_media_items()
+        assert len(items) == 1
+        assert items[0].source.url == "https://proxy.example/pixiv/1.jpg"
+        assert items[0].telegram_file_id is None

telepost_bot-2.84.3/tests/test_delivery_planner.py

@@ -1,112 +0,0 @@
-"""Step 11 DeliveryPlanner: TelePost decides how to deliver review media."""
-import pytest
-
-from telepost.application.delivery_planner import (
-    STRATEGY_FILE_ID,
-    STRATEGY_REMOTE_URL,
-    plan_review_media,
-)
-
-
-class TestPlanReviewMedia:
-    def test_no_assets_uses_local_file_ids(self):
-        plan = plan_review_media(
-            [{"type": "photo", "file_id": "AAA"}],
-            [],
-        )
-        assert plan.strategy == STRATEGY_FILE_ID
-        assert len(plan.entries) == 1
-        assert plan.entries[0].strategy == STRATEGY_FILE_ID
-        assert plan.entries[0].file_id == "AAA"
-
-    def test_asset_with_file_id_prefers_zero_reupload(self):
-        plan = plan_review_media(
-            [{"type": "photo", "file_id": "AAA"}],
-            [{"asset_id": "pixiv-1", "kind": "image",
-              "source_url": "https://i.pximg.net/1.jpg"}],
-        )
-        assert plan.strategy == STRATEGY_FILE_ID
-        assert plan.entries[0].strategy == STRATEGY_FILE_ID
-        assert plan.entries[0].asset_id == "pixiv-1"
-
-    def test_asset_without_file_id_falls_back_to_remote_url(self):
-        plan = plan_review_media(
-            [],
-            [{"asset_id": "pixiv-1", "kind": "image",
-              "source_url": "https://proxy.example/pixiv/1.jpg"}],
-        )
-        assert plan.strategy == STRATEGY_REMOTE_URL
-        assert plan.entries[0].strategy == STRATEGY_REMOTE_URL
-        assert plan.entries[0].source_url == "https://proxy.example/pixiv/1.jpg"
-
-    def test_mixed_plan(self):
-        plan = plan_review_media(
-            [{"type": "photo", "file_id": "AAA"}],
-            [
-                {"asset_id": "a1", "kind": "image", "source_url": "https://x/a"},
-                {"asset_id": "a2", "kind": "image", "source_url": "https://x/b"},
-            ],
-        )
-        assert plan.strategy == "mixed"
-        strategies = [e.strategy for e in plan.entries]
-        assert strategies == [STRATEGY_FILE_ID, STRATEGY_REMOTE_URL]
-
-    def test_indexed_document_is_not_photo(self):
-        """Regression: novel cover assets + indexed TXT file_id."""
-        plan = plan_review_media(
-            [],
-            [
-                {"asset_id": "a1", "kind": "image",
-                 "source_url": "https://x/a"},
-                {"asset_id": "txt", "kind": "image",
-                 "source_url": "https://x/txt"},
-            ],
-            documents=[{"file_id": "DDD", "filename": "novel.txt"}],
-        )
-        assert [e.kind for e in plan.entries] == ["photo", "document"]
-        assert plan.strategy == "mixed"
-        items = plan.to_media_items()
-        assert items[0].kind.value == "photo"
-        assert items[1].kind.value == "document"
-        assert items[1].telegram_file_id == "DDD"
-
-    def test_single_cover_asset_pairs_with_indexed_txt_document(self):
-        """Regression: a novel with one cover asset and one TXT must not plan
-        the TXT as a photo; that made novel_images_preview_only remove every
-        item and the publication failed with "delivery returned no messages"."""
-        plan = plan_review_media(
-            [],
-            [{"asset_id": "cover", "kind": "image",
-              "source_url": "https://i.pximg.net/cover.png"}],
-            documents=[{"file_id": "TXT_FILE_ID", "filename": "novel.txt"}],
-        )
-        assert [e.kind for e in plan.entries] == ["document"]
-        assert [e.strategy for e in plan.entries] == [STRATEGY_FILE_ID]
-        assert plan.entries[0].file_id == "TXT_FILE_ID"
-        assert plan.entries[0].filename == "novel.txt"
-
-    def test_leftover_document_keeps_file_id(self):
-        plan = plan_review_media(
-            [{"type": "photo", "file_id": "AAA"}],
-            [{"asset_id": "a1", "kind": "image", "source_url": "https://x/a"}],
-            documents=[{"file_id": "DDD", "filename": "novel.txt"}],
-        )
-        assert [e.kind for e in plan.entries] == ["photo", "document"]
-        assert [e.strategy for e in plan.entries] == [STRATEGY_FILE_ID, STRATEGY_FILE_ID]
-        assert plan.entries[1].file_id == "DDD"
-
-    def test_empty_plan(self):
-        plan = plan_review_media([], [])
-        assert plan.strategy == "empty"
-        assert plan.to_media_items() == []
-
-    def test_to_media_items(self):
-        plan = plan_review_media(
-            [],
-            [{"asset_id": "a1", "kind": "image",
-              "source_url": "https://proxy.example/pixiv/1.jpg"}],
-        )
-        items = plan.to_media_items()
-        assert len(items) == 1
-        assert items[0].source.url == "https://proxy.example/pixiv/1.jpg"
-        assert items[0].telegram_file_id is None