thth 3.18.0__tar.gz → 3.18.2__tar.gz

{thth-3.18.0 → thth-3.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thth
-Version: 3.18.0
+Version: 3.18.2
 Summary: 承認済みの投稿だけを投げる門（Threads・Bluesky・Mastodon）。人が承認し、記録は利用者の git に残る。
 Project-URL: Homepage, https://thth.me
 Project-URL: Source, https://github.com/aokings/thth

{thth-3.18.0 → thth-3.18.2}/tests/test_v214_x_adapter.py

@@ -218,3 +218,30 @@ def test_after_an_unknown_the_next_send_refuses_without_touching_the_provider(
     output = capsys.readouterr()
     assert 'inflight が残っています' in output.out + output.err
     assert wire['calls'] == [] and inflight.read(state) == before
+
+
+# ----- 403 の本文から静的な符丁（10/13 関東の返信の 403） --------------------
+
+@pytest.mark.parametrize('body,expected', [
+    (b'{"detail":"Reply to this conversation is not allowed because you have not been mentioned or otherwise engaged by the author of the post you are replying to.","title":"Forbidden","status":403}',
+     'x_publish_http_403: x_reply_not_engaged'),
+    (b'{"detail":"You are not permitted to perform this action.","title":"Forbidden","status":403}',
+     'x_publish_http_403: x_not_permitted'),
+    (b'{"errors":[{"message":"You are not allowed to create a Tweet with duplicate content."}]}',
+     'x_publish_http_403: x_duplicate_content'),
+    (b'{"detail":"something new","title":"Forbidden","type":"https://api.twitter.com/2/problems/not-authorized-for-resource"}',
+     'x_publish_http_403: x_unknown_refusal（type=not-authorized-for-resource / title=Forbidden / detail=something new）'),
+    (b'not json', 'x_publish_http_403'),
+    (b'{"detail":"' + b'x' * 5000 + b'"}', 'x_publish_http_403'),
+])
+def test_403_body_becomes_a_static_code_without_provider_text(env, wire, monkeypatch, body, expected):
+    original = x_adapter.request
+
+    def request(adapter, method, path, **kwargs):
+        if path == '/2/tweets':
+            raise urllib.error.HTTPError(adapter.base_url + path, 403, 'Forbidden', {},
+                                         io.BytesIO(body))
+        return original(adapter, method, path, **kwargs)
+    monkeypatch.setattr(x_adapter, 'request', request)
+    result = text_post(env)
+    assert result.failure == 'publish_definite' and result.error == expected

thth-3.18.2/thth/VERSION

@@ -0,0 +1 @@
+3.18.2

{thth-3.18.0 → thth-3.18.2}/thth/adapters/x.py

@@ -112,6 +112,65 @@ def rate_limit(error):
     return out
 
 
+# 投稿の 4xx の本文から**静的な符丁だけ**を引く（provider の文面は理由に混ぜない・
+# `rate_limit()` と同じ流儀）。10/13 関東の返信が `x_publish_http_403` だけを残し、
+# 「返信先の投稿者から関わりが無い」制限か、アカウントの制限かを見分けられなかった。
+# 文面は X の開発者フォーラムで報告されている形（一次資料には無い・L3）。
+PUBLISH_REFUSALS = (
+    ('not been mentioned or otherwise engaged', 'x_reply_not_engaged'),
+    ('reply to this conversation is not allowed', 'x_reply_not_engaged'),
+    ('duplicate content', 'x_duplicate_content'),
+    ('not permitted to perform this action', 'x_not_permitted'),
+    ('not permitted to access this feature', 'x_not_permitted'),
+)
+MAX_ERROR_BYTES = 4096
+
+
+def publish_refusal(error) -> str | None:
+    """4xx の本文（`detail`・`title`・`type`・`errors[].message`）を 1 回だけ読む。
+
+    知っている形なら静的な符丁。知らない形は **X の文面を短く残す**（3.18.2・10/13
+    関東の返信の 403 が知らない形で、何が断られたのか読めなかった。SageSpring の依頼）。
+    X の problem の文面は自分の要求への断りで、他人の投稿の本文は入らない。それでも
+    `redact` を通し、200 字で切る。
+    """
+    try:
+        raw = error.read(MAX_ERROR_BYTES + 1)
+    except (OSError, ValueError, AttributeError):
+        return None
+    if not raw or len(raw) > MAX_ERROR_BYTES:
+        return None
+    try:
+        body = json.loads(raw)
+    except (ValueError, UnicodeError):
+        return None
+    if not isinstance(body, dict):
+        return None
+    texts = [body.get('detail'), body.get('title')]
+    for item in body.get('errors') or []:
+        if isinstance(item, dict):
+            texts += [item.get('message'), item.get('detail')]
+    blob = ' '.join(t for t in texts if isinstance(t, str)).lower()
+    for needle, code in PUBLISH_REFUSALS:
+        if needle in blob:
+            return code
+    parts = []
+    kind = body.get('type')
+    if isinstance(kind, str) and kind.strip():
+        parts.append('type=' + kind.strip().rstrip('/').rsplit('/', 1)[-1][:60])
+    for key in ('title', 'detail'):
+        if isinstance(body.get(key), str) and body[key].strip():
+            parts.append(key + '=' + body[key].strip())
+    for item in body.get('errors') or []:
+        if isinstance(item, dict) and isinstance(item.get('message'), str):
+            parts.append('message=' + item['message'].strip())
+            break
+    if not parts:
+        return None
+    text = redact_mod.redact(' / '.join(parts).replace('\n', ' ')) or ''
+    return ('x_unknown_refusal（' + text[:200] + '）') if text else None
+
+
 def request(adapter, method, path, *, json_body=None, data=None, query=None,
             headers=None, timeout=None, socket_timeout=None):
     """1 回だけ投げて `(status, value)`。**urllib の例外はそのまま上げる**
@@ -312,6 +371,10 @@ class XAdapter(base.Adapter):
         except urllib.error.HTTPError as exc:
             reason = ('provider_rate_limited' if exc.code == 429
                       else 'x_publish_http_' + str(exc.code))
+            if 400 <= exc.code < 500 and exc.code != 429:
+                known = publish_refusal(exc)
+                if known:
+                    reason += ': ' + known
             failure = 'publish_definite' if 400 <= exc.code < 500 else 'publish_ambiguous'
             detail = rate_limit(exc) if exc.code == 429 else {}
             return base.PublishResult(None, None, ts, error=reason, failure=failure,

thth-3.18.0/thth/VERSION

@@ -1 +0,0 @@
-3.18.0