PyPtt 2.3.14__tar.gz → 2.3.16__tar.gz

{pyptt-2.3.14 → pyptt-2.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.14
+Version: 2.3.16
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.14 → pyptt-2.3.16}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.3.14'
+__version__ = '2.3.16'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.3.14 → pyptt-2.3.16}/PyPtt/_api_get_board_info.py

@@ -95,8 +95,10 @@ def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -
             raise exceptions.ConnectionClosed()
 
     boardname = None
-    # 新版: '看板名稱: Test 板主名單: ...'；舊版: '《Test》看板設定'
-    r = re.search(r'看板名稱: (\S+)|《(.+)》看板設定', ori_screen)
+    # 2026-11-01 起: '名稱: Test  板主: ...'；2026-10: '看板名稱: Test 板主名單: ...'；
+    # 舊版: '《Test》看板設定'
+    r = re.search(r'^(?:看板)?名稱: (\S+)|《(.+)》看板設定', ori_screen, re.M)
+    new_layout = r is not None and r.group(1) is not None
     if r is not None:
         boardname = (r.group(1) or r.group(2)).strip()
 
@@ -119,20 +121,17 @@ def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -
     logger.debug('中文敘述', chinese_des)
 
     moderators = []
-    p = re.compile(r'板主名單: (.+)')
+    # 2026-11-01 起帳號板主以 '/' 串接，非帳號的板主稱號接在後面、以空白分隔:
+    #   '板主: ubcs/redDest 初音未來'
+    p = re.compile(r'板主(?:名單)?: (.+)')
     r = p.search(ori_screen)
     if r is not None:
-        moderator_line = r.group(0)[5:].strip()
-        if '(無)' in moderator_line:
-            moderators = []
-        else:
-            moderators = moderator_line.split('/')
-            for moderator in moderators.copy():
-                if moderator in ('徵求中', ''):
-                    moderators.remove(moderator)
+        moderator_line = r.group(1).strip()
+        if '(無)' not in moderator_line:
+            moderators = [m for m in re.split(r'[/\s]+', moderator_line) if m not in ('徵求中', '')]
     logger.debug('板主名單', moderators)
 
-    if '看板名稱:' in ori_screen:
+    if new_layout:
         # 新版畫面每項一列: '  9.   快速連推文章           限制 (間隔 5 秒)'。
         # 2026-10-19 起欄寬變寬；編輯模式另有熱鍵標示 ' 1. (b)中文敘述' 與
         # 權限註記 '開放 (限站長)'，兩者都去掉再比對。

{pyptt-2.3.14 → pyptt-2.3.16}/PyPtt/connect_core.py

@@ -179,6 +179,21 @@ class API(object):
             asyncio.set_event_loop(self._loop)
         return self._loop
 
+    def _websocket_endpoint(self) -> tuple[str, str]:
+        # PTT1 started answering wss://ws.ptt.cc/bbs/ (trailing slash) with HTTP 404 on
+        # 2026-11-06; term.ptt.cc connects to /bbs, so use the slash-less path everywhere
+        if self.config.host == data_type.HOST.PTT1:
+            return 'wss://ws.ptt.cc/bbs', 'https://term.ptt.cc'
+        if self.config.host == data_type.HOST.PTT2:
+            return 'wss://ws.ptt2.cc/bbs', 'https://term.ptt2.cc'
+        if self.config.host == data_type.HOST.LOCALHOST:
+            # ponytail: local pttbbs docker image (bbsdocker/imageptt) serves plain ws
+            # (no TLS) on 48763; config.port defaults to 23 (telnet default) so treat
+            # that as "not set" and fall back to imageptt's default port
+            port = self.config.port if self.config.port != 23 else 48763
+            return f'ws://localhost:{port}/bbs', 'http://localhost'
+        return f'wss://{self.config.host}', 'https://term.ptt.cc'
+
     def connect(self) -> None:
         def _wait():
             for i in range(self.config.retry_wait_time):
@@ -198,22 +213,7 @@ class API(object):
 
         self.current_encoding = 'big5uao'
 
-        if self.config.host == data_type.HOST.PTT1:
-            websocket_host = 'wss://ws.ptt.cc/bbs/'
-            websocket_origin = 'https://term.ptt.cc'
-        elif self.config.host == data_type.HOST.PTT2:
-            websocket_host = 'wss://ws.ptt2.cc/bbs/'
-            websocket_origin = 'https://term.ptt2.cc'
-        elif self.config.host == data_type.HOST.LOCALHOST:
-            # ponytail: local pttbbs docker image (bbsdocker/imageptt) serves plain ws
-            # (no TLS) on 48763; config.port defaults to 23 (telnet default) so treat
-            # that as "not set" and fall back to imageptt's default port
-            port = self.config.port if self.config.port != 23 else 48763
-            websocket_host = f'ws://localhost:{port}/bbs'
-            websocket_origin = 'http://localhost'
-        else:
-            websocket_host = f'wss://{self.config.host}'
-            websocket_origin = 'https://term.ptt.cc'
+        websocket_host, websocket_origin = self._websocket_endpoint()
 
         self._pending = []
         connect_success = False

{pyptt-2.3.14 → pyptt-2.3.16}/PyPtt/screens.py

@@ -250,8 +250,9 @@ class Target:
         '看板設定與管理  [唯讀檢視]',
         '(←)離開',
     ]
+    # 2026-11-01 起編輯模式頁首改為「[管理權限: 板主]」
     BoardSettingEdit = [
-        '編輯模式 (按 Ctrl-P 唯讀)',
+        ['編輯模式 (按 Ctrl-P 唯讀)', '看板設定與管理  [管理權限:'],
         '看板設定(編輯)',
     ]
     # 舊版 (本機 pttbbs): i → 設定頁 + 任意鍵提示，^P → 單行輸入「要改變的設定」

{pyptt-2.3.14 → pyptt-2.3.16}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.14
+Version: 2.3.16
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.14 → pyptt-2.3.16}/PyPtt.egg-info/SOURCES.txt

@@ -103,4 +103,5 @@ tests/test_set_board_title.py
 tests/test_set_signature_file.py
 tests/test_status_line.py
 tests/test_uao_codec.py
-tests/test_vt100_parser.py
+tests/test_vt100_parser.py
+tests/test_websocket_endpoint.py

{pyptt-2.3.14 → pyptt-2.3.16}/tests/test_board_setting_flow.py

@@ -232,6 +232,36 @@ class TestSetBoardTitleNewFlow:
         assert api.connect_core.keys == ['I', LEFT]
 
 
+# 2026-11-01 PTT1 改版: 編輯模式頁首改成 '[管理權限: 板主]'，頁尾 (w) 改叫禁言名單
+EDIT_20261101 = EDIT.replace('[編輯模式 (按 Ctrl-P 唯讀)]', '[管理權限: 板主]').replace(
+    '(w)水桶名單', '(w)禁言名單').replace('看板名稱: give 板主名單: SomeBM', '名稱: give  板主: SomeBM')
+EDIT_20261101_CURSOR16 = EDIT_CURSOR16.replace('[編輯模式 (按 Ctrl-P 唯讀)]', '[管理權限: 板主]')
+
+
+class TestEditHeader20261101:
+    def test_set_board_title(self, make_api):
+        assert '[管理權限: 板主]' in EDIT_20261101 and '編輯模式' not in EDIT_20261101
+        text = '[贈送] 新標題 test'
+        api = make_api([READONLY, EDIT_20261101, TITLE_PROMPT, _typed(text), EDIT_20261101, SAVED, ARTICLE_LIST])
+        _api_set_board_title.set_board_title(api, 'give', '新標題 test')
+        keys = api.connect_core.keys
+        assert keys[:3] == ['I', CTRL_P, ENTER]
+        assert keys[3].lstrip(command.backspace) == text
+        assert keys[4:] == [ENTER, LEFT, LEFT]
+
+    def test_bucket(self, make_api):
+        api = make_api([READONLY, EDIT_20261101, BAKUMAN, BAKUMAN_ID, BAKUMAN_PERIOD, BAKUMAN_REASON,
+                        BAKUMAN_CONFIRM, BAKUMAN_DONE, BAKUMAN, EDIT_20261101_CURSOR16, UNCHANGED, ARTICLE_LIST])
+        _api_bucket.bucket(api, 'give', 1, 'PyPtt test', 'CodingMan')
+        assert api.connect_core.keys == [
+            'i', CTRL_P, 'w', 'a' + ENTER, 'CodingMan' + ENTER, '1' + ENTER, 'PyPtt test' + ENTER, 'y' + ENTER,
+            LEFT, ENTER, LEFT, LEFT]
+
+    def test_exit_key_and_in_board_setting(self):
+        assert screens.in_board_setting(EDIT_20261101)
+        assert screens.board_setting_exit_key(EDIT_20261101) == LEFT
+
+
 class TestBucketNewFlow:
     def test_happy_path(self, make_api):
         api = make_api([READONLY, EDIT, BAKUMAN, BAKUMAN_ID, BAKUMAN_PERIOD, BAKUMAN_REASON, BAKUMAN_CONFIRM,

{pyptt-2.3.14 → pyptt-2.3.16}/tests/test_get_board_info_parser.py

@@ -312,3 +312,60 @@ def test_no_such_board_after_i_still_leaves_menu():
     with pytest.raises(exceptions.NoSuchBoard):
         _api_get_board_info.get_board_info(api, 'Test', get_post_kind=False, call_by_others=True)
     assert api.connect_core.keys[-1] == command.left
+
+
+# 2026-11-01 PTT1 改版: 標頭 '看板名稱: X 板主名單: ...' 改成 '名稱: X  板主: ...'；
+# 帳號板主以 '/' 串接，非帳號的板主稱號 (綠字) 以空白分隔接在後面
+_ROWS_20261101 = '\n'.join([
+    '>  1.    中文敘述                   [八卦] Ｘ教授　Ｒ．Ｉ．Ｐ',
+    '   2.    公開狀態 (是否隱形)        公開',
+    '   3.    隱板時進入十大排行榜       可以',
+    '   4.    非看板會員發文             開放',
+    '   5.    回應文章                   開放',
+    '   6.    自刪文章                   開放',
+    '   7.    推薦文章 (推文)            開放',
+    '   8.    噓文                       開放',
+    '   9.    快速連推文章               限制 (間隔 5 秒)',
+    '  10.    推文時記錄來源 IP          自動記錄',
+    '  11.    推文開頭自動對齊           不用對齊',
+    '  12.    板主刪除部份違規文字       可',
+    '  13.    轉錄文章自動記錄           會 (需發文權限)',
+    '  14.    冷靜模式                   未設定',
+    '  15.    未滿十八歲進入             禁止',
+    '  16.    [發文條件] 登入次數        無限制',
+    '  17.    [發文條件] 退文篇數        無限制',
+    '  18.    個人發文推文權限           具有發文與推文權限',
+    '  19.    預設連署限制 (登入/退文)   無特別限制',
+    '  20.    [名單] 設定禁言名單(水桶)  [唯讀檢視]',
+    '  21.    [名單] 可見會員名單        [唯讀檢視]',
+    ' 看板資訊  (PgUp)上頁 (PgDn)下頁 (1)跳號                      (←)離開 (h)說明',
+])
+
+
+def _info_20261101(header):
+    return ' 看板設定與管理  [唯讀檢視]\n' + header + '\n' + _ROWS_20261101
+
+
+@pytest.mark.parametrize('header, board, moderators', [
+    ('名稱: Gossiping  板主: ubcs/redDest 初音未來', 'Gossiping', ['ubcs', 'redDest', '初音未來']),
+    ('名稱: C_Chat  板主: daniel0527/arrenwu/motw1999', 'C_Chat', ['daniel0527', 'arrenwu', 'motw1999']),
+    ('名稱: SYSOP  板主: 站長', 'SYSOP', ['站長']),
+    ('名稱: Python  板主: (無)', 'Python', []),
+])
+def test_layout_20261101(header, board, moderators):
+    info = _info(board, _info_20261101(header))
+    assert info[BoardField.board] == board
+    assert info[BoardField.moderators] == moderators
+    assert info[BoardField.mandarin_des] == '[八卦] Ｘ教授　Ｒ．Ｉ．Ｐ'
+    assert info[BoardField.into_top_ten_when_hide] is True
+    assert info[BoardField.can_fast_push] is False
+    assert info[BoardField.min_interval_between_comments] == 5
+    assert info[BoardField.is_comment_record_ip] is True
+    assert info[BoardField.can_moderators_del_illegal_content] is True
+    assert info[BoardField.is_require18] is True
+    assert info[BoardField.require_login_time] == 0
+
+
+def test_layout_20261101_board_name_mismatch_raises_no_such_board():
+    with pytest.raises(exceptions.NoSuchBoard):
+        _info('Test', _info_20261101('名稱: Python  板主: (無)'))

pyptt-2.3.16/tests/test_websocket_endpoint.py

@@ -0,0 +1,39 @@
+"""No-network regression test for the WebSocket endpoint connect_core dials.
+
+On 2026-11-06 PTT1's gateway started answering wss://ws.ptt.cc/bbs/ (with a
+trailing slash) with HTTP 404, so login died with ConnectError before reaching
+any screen. term.ptt.cc connects to wss://ws.ptt.cc/bbs, which still works.
+"""
+import pytest
+
+from PyPtt import config, connect_core, data_type
+
+
+class FakeApi:
+    def __init__(self, host, port=23):
+        self.config = config.Config()
+        self.config.host = host
+        self.config.port = port
+
+
+def _endpoint(host, port=23):
+    return connect_core.API(FakeApi(host, port))._websocket_endpoint()
+
+
+@pytest.mark.parametrize('host, url, origin', [
+    (data_type.HOST.PTT1, 'wss://ws.ptt.cc/bbs', 'https://term.ptt.cc'),
+    (data_type.HOST.PTT2, 'wss://ws.ptt2.cc/bbs', 'https://term.ptt2.cc'),
+    (data_type.HOST.LOCALHOST, 'ws://localhost:48763/bbs', 'http://localhost'),
+])
+def test_known_hosts(host, url, origin):
+    assert _endpoint(host) == (url, origin)
+
+
+@pytest.mark.parametrize('host', [data_type.HOST.PTT1, data_type.HOST.PTT2, data_type.HOST.LOCALHOST])
+def test_no_trailing_slash(host):
+    url, _ = _endpoint(host)
+    assert not url.endswith('/')
+
+
+def test_localhost_custom_port():
+    assert _endpoint(data_type.HOST.LOCALHOST, port=12345)[0] == 'ws://localhost:12345/bbs'