thth 3.18.1__tar.gz → 3.18.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thth
-Version: 3.18.1
+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.1 → thth-3.18.2}/tests/test_v214_x_adapter.py

@@ -229,7 +229,8 @@ def test_after_an_unknown_the_next_send_refuses_without_touching_the_provider(
      '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"}', 'x_publish_http_403'),
+    (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'),
 ])
@@ -244,4 +245,3 @@ def test_403_body_becomes_a_static_code_without_provider_text(env, wire, monkeyp
     monkeypatch.setattr(x_adapter, 'request', request)
     result = text_post(env)
     assert result.failure == 'publish_definite' and result.error == expected
-    assert 'something new' not in result.error

thth-3.18.2/thth/VERSION

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

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

@@ -127,7 +127,13 @@ MAX_ERROR_BYTES = 4096
 
 
 def publish_refusal(error) -> str | None:
-    """4xx の本文（`detail`・`title`・`errors[].message`）を 1 回だけ読み、知っている形なら符丁。"""
+    """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):
@@ -138,17 +144,31 @@ def publish_refusal(error) -> str | None:
         body = json.loads(raw)
     except (ValueError, UnicodeError):
         return None
-    texts = []
-    if isinstance(body, dict):
-        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')]
+    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
-    return None
+    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,

thth-3.18.1/thth/VERSION

@@ -1 +0,0 @@
-3.18.1