PyPtt 2.1.7__tar.gz → 2.2.1__tar.gz

{pyptt-2.1.7 → pyptt-2.2.1}/PKG-INFO

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

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/PTT.py

@@ -21,6 +21,7 @@ from . import _api_get_user
 from . import _api_give_money
 from . import _api_loginout
 from . import _api_get_waterball
+from . import _api_lottery
 from . import _api_mail
 from . import _api_mark_post
 from . import _api_post
@@ -436,7 +437,8 @@ class API:
         return _api_get_newest_index.get_newest_index(
             self, index_type, board, search_type, search_condition, search_list)
 
-    def post(self, board: str, title_index: int, title: str, content: str, sign_file: [str | int] = 0) -> None:
+    def post(self, board: str, title_index: int, title: str, content: str, sign_file: [str | int] = 0,
+             anonymous: bool = False, display_id: Optional[str] = None) -> None:
         """
         發文。
 
@@ -446,6 +448,12 @@ class API:
             title (str): 文章標題。
             content (str): 文章內容。
             sign_file  (str | int): 編號或隨機簽名檔 (x)，預設為 0 (不選)。
+            anonymous (bool): 是否匿名發文，預設為 False。僅在該看板本身具有匿名 (BRD_ANONYMOUS)
+                屬性時才會生效，一般看板無法透過此參數強制匿名；PyPtt 只能在該提示出現時回覆它。
+            display_id (str): 匿名發文時欲顯示的自訂名稱；預設為 None，代表使用 pttbbs 預設值
+                (預設匿名板為 "Anonymous."，否則為原 ID)。pttbbs 會在暱名 (含預設的 "Anonymous")
+                後方加上一個 "."（例如 display_id='Fox' 會顯示為 "Fox."），此為 pttbbs 固定行為，
+                無法調整。僅能在 anonymous=True 時使用。
 
         Returns:
             None
@@ -455,6 +463,7 @@ class API:
             RequireLogin: 需要登入。
             NoSuchBoard: 看板不存在。
             NoPermission: 沒有發佈權限。
+            ParameterError: display_id 於 anonymous=False 時提供。
 
         範例::
 
@@ -464,13 +473,19 @@ class API:
             try:
                 # .. login ..
                 ptt_bot.post(board='Test', title_index=1, title='PyPtt 程式貼文測試', content='測試內容', sign_file=0)
+                # 匿名發文 (需看板本身具有匿名屬性)
+                ptt_bot.post(board='AnonBoard', title_index=1, title='匿名貼文測試', content='測試內容',
+                             sign_file=0, anonymous=True)
+                # 匿名發文並自訂顯示名稱
+                ptt_bot.post(board='AnonBoard', title_index=1, title='匿名貼文測試', content='測試內容',
+                             sign_file=0, anonymous=True, display_id='Fox')
                 # .. do something ..
             finally:
                 ptt_bot.logout()
 
         """
 
-        _api_post.post(self, board, title, content, title_index, sign_file)
+        _api_post.post(self, board, title, content, title_index, sign_file, anonymous, display_id)
 
     def comment(self, board: str, comment_type: data_type.CommentType, content: str, aid: Optional[str] = None,
                 index: int = 0) -> None:
@@ -587,6 +602,76 @@ class API:
 
         _api_give_money.give_money(self, ptt_id, money, red_bag_title, red_bag_content)
 
+    def get_lottery(self, board: str) -> Dict:
+
+        """
+        取得看板樂透（彩券）目前的開獎資訊，對應看板內按 `f` 鍵的功能。
+
+        Args:
+            board (str): 看板名稱。
+
+        Returns:
+            Dict: 樂透資訊，包含 price（每張價格）、total（已下注總額）、
+            options（下注選項清單，每個選項包含 index、name、sold）。
+
+        Raises:
+            RequireLogin: 需要登入。
+            NoSuchBoard: 看板不存在。
+            NoSuchLottery: 該看板目前並沒有舉辦樂透，或樂透已封盤/開獎。
+
+        範例::
+
+            import PyPtt
+
+            ptt_bot = PyPtt.API()
+            try:
+                # .. login ..
+                lottery = ptt_bot.get_lottery(board='Test')
+                # .. do something ..
+            finally:
+                ptt_bot.logout()
+
+        """
+
+        return _api_lottery.get_lottery(self, board)
+
+    def bet_lottery(self, board: str, item: int = 1, amount: int = 1) -> Dict:
+
+        """
+        在看板下注樂透（彩券），對應看板內按 `f` 鍵後購買彩券的功能。
+
+        Args:
+            board (str): 看板名稱。
+            item (int): 要購買的樂透選項編號，範圍 1~8（依看板實際選項數而定）。
+            amount (int): 購買張數，範圍 1~9999，並受限於帳戶內的 Ptt 幣餘額。
+
+        Returns:
+            Dict: 下注結果，包含 board、item、name（選項名稱）、amount、
+            cost（本次下注花費的 Ptt 幣總額）。
+
+        Raises:
+            RequireLogin: 需要登入。
+            UnregisteredUser: 未註冊使用者。
+            NoSuchBoard: 看板不存在。
+            NoSuchLottery: 該看板目前並沒有舉辦樂透，或樂透已封盤/開獎。
+            NoMoney: 餘額不足。
+
+        範例::
+
+            import PyPtt
+
+            ptt_bot = PyPtt.API()
+            try:
+                # .. login ..
+                result = ptt_bot.bet_lottery(board='Test', item=1, amount=10)
+                # .. do something ..
+            finally:
+                ptt_bot.logout()
+
+        """
+
+        return _api_lottery.bet_lottery(self, board, item, amount)
+
     def mail(self, ptt_id: str, title: str, content: str, sign_file: [int | str] = 0,
              backup: bool = True) -> None:
 

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/__init__.py

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

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/_api_get_board_list.py

@@ -106,7 +106,10 @@ def get_board_list(api) -> list:
             board_list.append(board_name)
 
             if api.config.log_level == log.INFO:
-                pb.update(no)
+                # ponytail: max_no is parsed from the last-page screen and can
+                # undercount by one on some board sets; the bar is cosmetic, so
+                # clamp instead of letting pb.update raise and abort get_all_boards.
+                pb.update(min(no, max_no))
 
         if no >= max_no:
             break

pyptt-2.2.1/PyPtt/_api_lottery.py

@@ -0,0 +1,164 @@
+import re
+from typing import Dict
+
+from . import _api_util
+from . import check_value
+from . import command
+from . import connect_core
+from . import exceptions
+from . import i18n
+from . import lib_util
+from . import log
+from . import screens
+from .data_type import LotteryBetField, LotteryField, LotteryOptionField
+
+_price_pattern = re.compile(r'每張要花 (\d+)')
+_total_pattern = re.compile(r'已下注總額: (\d+)')
+_option_pattern = re.compile(r'(\d+)\.(.+?): *(\d+)')
+
+# mbbsd/gamble.c: show_ticket_data()/join_gamble() vmsg() text for "no round
+# open to bet on", either because none was ever held (show_ticket_data can't
+# open ticket.items), or a running one's auto-close time already passed
+# (join_gamble's stop_gamble() check, before ticket() is even entered).
+_NO_LOTTERY_TEXTS = (
+    '目前並沒有舉辦樂透',
+    '目前未舉辦或樂透已開獎',
+)
+
+
+def _parse_lottery_screen(board: str, screen: str) -> Dict:
+    price = 0
+    r = _price_pattern.search(screen)
+    if r is not None:
+        price = int(r.group(1))
+
+    total = 0
+    r = _total_pattern.search(screen)
+    if r is not None:
+        total = int(r.group(1))
+
+    # Options are only printed between these two headers (mbbsd/gamble.c:
+    # show_ticket_data()); slicing avoids the 站規 rule text above it, which
+    # can otherwise be mistaken for "N.name: number" (e.g. "2:00 11:00").
+    options = []
+    if '目前下注狀況' in screen and '已下注總額' in screen:
+        start = screen.index('目前下注狀況')
+        end = screen.index('已下注總額')
+        for m in _option_pattern.finditer(screen[start:end]):
+            options.append({
+                LotteryOptionField.index: int(m.group(1)),
+                LotteryOptionField.name: m.group(2).strip(),
+                LotteryOptionField.sold: int(m.group(3)),
+            })
+
+    return {
+        LotteryField.board: board,
+        LotteryField.price: price,
+        LotteryField.total: total,
+        LotteryField.options: options,
+    }
+
+
+def _enter_ticket_screen(api, board: str) -> str:
+    _api_util.goto_board(api, board)
+
+    target_list = [
+        connect_core.TargetUnit(
+            _NO_LOTTERY_TEXTS[0], break_detect=True, exceptions_=exceptions.NoSuchLottery(board)),
+        connect_core.TargetUnit(
+            _NO_LOTTERY_TEXTS[1], break_detect=True, exceptions_=exceptions.NoSuchLottery(board)),
+        connect_core.TargetUnit('請選擇要購買的種類', break_detect=True),
+    ]
+    api.connect_core.send('f', target_list)
+
+    return api.connect_core.get_screen_queue()[-1]
+
+
+def _leave_ticket_screen(api) -> None:
+    target_list = [
+        connect_core.TargetUnit(screens.Target.InBoard, break_detect=True),
+    ]
+    api.connect_core.send('q', target_list)
+
+
+def get_lottery(api, board: str) -> Dict:
+    _api_util.one_thread(api)
+
+    if not api._is_login:
+        raise exceptions.RequireLogin(i18n.require_login)
+
+    check_value.check_type(board, str, 'board')
+
+    log.logger.info(i18n.replace(i18n.get_lottery, board))
+
+    ori_screen = _enter_ticket_screen(api, board)
+    result = _parse_lottery_screen(board, ori_screen)
+
+    _leave_ticket_screen(api)
+
+    log.logger.info(i18n.replace(i18n.get_lottery, board), '...', i18n.success)
+
+    return result
+
+
+def bet_lottery(api, board: str, item: int = 1, amount: int = 1) -> Dict:
+    _api_util.one_thread(api)
+
+    if not api._is_login:
+        raise exceptions.RequireLogin(i18n.require_login)
+
+    if not api.is_registered_user:
+        raise exceptions.UnregisteredUser(lib_util.get_current_func_name())
+
+    check_value.check_type(board, str, 'board')
+    check_value.check_type(item, int, 'item')
+    check_value.check_range(item, 1, 8, 'item')
+    check_value.check_type(amount, int, 'amount')
+    check_value.check_range(amount, 1, 9999, 'amount')
+
+    log.logger.info(i18n.replace(i18n.bet_lottery, board))
+
+    ori_screen = _enter_ticket_screen(api, board)
+    before = _parse_lottery_screen(board, ori_screen)
+
+    options = before[LotteryField.options]
+    if item > len(options):
+        _leave_ticket_screen(api)
+        raise exceptions.ParameterError(
+            f'item {item} error, board {board} only has {len(options)} lottery options')
+
+    name = options[item - 1][LotteryOptionField.name]
+    price = before[LotteryField.price]
+
+    target_list = [
+        # buy_ticket_ui()'s getdata_str() pre-fills this field with "1" and
+        # parks the cursor after it (mbbsd/vtuikit.c: vgetstring() copies
+        # defstr into buf then sets icurr = iend = strlen(buf)); typing
+        # digits without clearing first inserts after the "1" (e.g. "3"
+        # becomes "13"), so Ctrl-Y (clear-to-start) must come first.
+        connect_core.TargetUnit(
+            '要買多少份呢', response=command.ctrl_y + str(amount) + command.enter),
+        connect_core.TargetUnit('現金不夠', break_detect=True, exceptions_=exceptions.NoMoney()),
+        connect_core.TargetUnit(
+            '板主已經停止下注了', break_detect=True, exceptions_=exceptions.NoSuchLottery(board)),
+        connect_core.TargetUnit('按任意鍵繼續', break_detect=True),
+    ]
+    api.connect_core.send(str(item), target_list)
+
+    # dismiss the purchase-confirmation picture, back to the (refreshed) ticket screen
+    target_list = [
+        connect_core.TargetUnit('請選擇要購買的種類', break_detect=True),
+    ]
+    api.connect_core.send(command.space, target_list)
+
+    _leave_ticket_screen(api)
+
+    log.logger.info(i18n.replace(i18n.bet_lottery, board), '...', i18n.success)
+
+    return {
+        LotteryBetField.board: board,
+        LotteryBetField.item: item,
+        LotteryBetField.name: name,
+        LotteryBetField.amount: amount,
+        LotteryBetField.cost: price * amount,
+    }

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/_api_post.py

@@ -92,7 +92,49 @@ sign_file_list = [str(x) for x in range(0, 10)]
 sign_file_list.append('x')
 
 
-def post(api, board: str, title: str, content: str, title_index: int, sign_file: [str | int]) -> None:
+# --- post()'s `anonymous` / `display_id` params (issue #84) ---
+#
+# pttbbs only shows the "請輸入你想用的ID" / "確定[y/N]?" prompt pair when the
+# *board itself* carries BRD_ANONYMOUS server-side (mbbsd/edit.c write_header,
+# `if (currbrdattr & BRD_ANONYMOUS)`). On a normal board the two TargetUnits
+# below simply never match anything on screen -- there is no way for PyPtt to
+# force anonymity on a board that isn't flagged anonymous. See
+# scripts/mkboard.py / scripts/bootstrap_local_pttbbs.py's AnonTest board for
+# how to provision one locally.
+#
+# Response mapping, matching pttbbs' own rules for that prompt:
+#   anonymous=False              -> 'r' (real userid; safe default, and a
+#                                    no-op on non-anonymous boards)
+#   anonymous=True,  no display_id -> '' (Enter; "Anonymous." -- pttbbs
+#                                    appends the same trailing '.' as the
+#                                    display_id case below -- on a
+#                                    default-anonymous board, real userid
+#                                    otherwise -- pttbbs' own behavior)
+#   anonymous=True,  display_id  -> that string; pttbbs appends a trailing
+#                                    '.' to it (e.g. display_id='Fox' shows
+#                                    up as author 'Fox.') -- fixed pttbbs
+#                                    behavior, not adjustable by PyPtt.
+def _anonymous_response(anonymous: bool, display_id: [str | None]) -> str:
+    if display_id is not None:
+        check_value.check_type(display_id, str, 'display_id')
+        if not anonymous:
+            raise exceptions.ParameterError('display_id requires anonymous=True')
+        # pttbbs (mbbsd/edit.c) treats a leading '-' as "this is a deleted
+        # name" and re-shows the same prompt instead of accepting it, which
+        # would make PyPtt's TargetUnit answer it the same way forever.
+        if display_id.startswith('-'):
+            raise exceptions.ParameterError("display_id must not start with '-'")
+        for c in display_id:
+            if ord(c) < 0x20 or ord(c) == 0x7f:
+                raise exceptions.ParameterError(
+                    f'display_id must not contain control characters (found {c!r})')
+        return display_id
+
+    return '' if anonymous else 'r'
+
+
+def post(api, board: str, title: str, content: str, title_index: int, sign_file: [str | int],
+         anonymous: bool = False, display_id: [str | None] = None) -> None:
     _api_util.one_thread(api)
 
     if not api._is_login:
@@ -105,10 +147,13 @@ def post(api, board: str, title: str, content: str, title_index: int, sign_file:
     check_value.check_type(title_index, int, 'title_index')
     check_value.check_type(title, str, 'title')
     check_value.check_type(content, str, 'content')
+    check_value.check_type(anonymous, bool, 'anonymous')
 
     if str(sign_file).lower() not in sign_file_list:
         raise exceptions.ParameterError(f'wrong parameter sign_file: {sign_file}')
 
+    anonymous_response = _anonymous_response(anonymous, display_id)
+
     _api_util.check_board(api, board)
     _api_util.goto_board(api, board)
 
@@ -147,7 +192,17 @@ def post(api, board: str, title: str, content: str, title_index: int, sign_file:
 
     target_list = [
         connect_core.TargetUnit('任意鍵繼續', break_detect=True),
-        connect_core.TargetUnit('確定要儲存檔案嗎', response='s' + command.enter),
+        # max_match=1: pttbbs' "檔案處理" screen keeps every answered prompt's
+        # echoed text on screen as the flow proceeds through the next ones
+        # (confirmed live -- "確定要儲存檔案嗎？ s" stays visible through the
+        # anonymous-post prompts below). Without max_match=1 this target
+        # re-matches on every later screen in the same flow and re-sends
+        # 's' + Enter into whatever field currently has focus (e.g. the
+        # anonymous-ID or confirm prompt), corrupting the answer.
+        connect_core.TargetUnit('確定要儲存檔案嗎', response='s' + command.enter, max_match=1),
+        # Only shown on a BRD_ANONYMOUS board -- no-op on a normal board.
+        connect_core.TargetUnit('請輸入你想用的ID', response=anonymous_response + command.enter, max_match=1),
+        connect_core.TargetUnit('確定[y/N]', response='y' + command.enter, max_match=1),
         connect_core.TargetUnit('x=隨機', response=str(sign_file) + command.enter),
     ]
     api.connect_core.send(

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/data_type.py

@@ -219,6 +219,27 @@ class BoardField(AutoStrEnum):
     post_kind_list = auto()
 
 
+class LotteryField(AutoStrEnum):
+    board = auto()
+    price = auto()
+    total = auto()
+    options = auto()
+
+
+class LotteryOptionField(AutoStrEnum):
+    index = auto()
+    name = auto()
+    sold = auto()
+
+
+class LotteryBetField(AutoStrEnum):
+    board = auto()
+    item = auto()
+    name = auto()
+    amount = auto()
+    cost = auto()
+
+
 class Compare(AutoStrEnum):
     BIGGER = auto()
     SAME = auto()

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/exceptions.py

@@ -215,6 +215,14 @@ class NoSuchPost(Error):
         return self.message
 
 
+class NoSuchLottery(Error):
+    def __init__(self, board):
+        self.message = i18n.no_such_lottery + ': ' + board
+
+    def __str__(self):
+        return self.message
+
+
 class CanNotUseSearchPostCode(Error):
     """
     此狀態下無法使用搜尋文章代碼(AID)功能

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/lang_en_US.py

@@ -5,6 +5,7 @@ string_data = {
     "author": "Author",
     "bad_post": "bad post",
     "bad_post_not_recorded": "the post was deleted, but the bad-post record was not made",
+    "bet_lottery": "bet lottery _target0_",
     "board": "Board",
     "can_not_use_search_post_code_f": "This status can not use the search PostField code function",
     "catch_bottom_post": "Catch bottom post",
@@ -31,6 +32,7 @@ string_data = {
     "find_newest_index": "Find newest index",
     "get_board_info": "Get board info _target0_",
     "get_favourite_board_list": "Query favourite board list",
+    "get_lottery": "Get lottery info _target0_",
     "get_mail": "Get mail",
     "get_waterball": "Get waterball records",
     "give_money_to": "give _target0_ _target1_ P coins",
@@ -76,6 +78,7 @@ string_data = {
     "no_response": "This post has been closed and marked, no response",
     "no_search_result": "No Search Result",
     "no_such_board": "No such board",
+    "no_such_lottery": "No lottery is currently running, or betting is closed",
     "no_such_mail": "No such mail",
     "no_such_post": "In _target0_, the post code is not EXISTS _target1_",
     "no_such_user": "No such user",

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt/lang_zh_TW.py

@@ -5,6 +5,7 @@ string_data = {
     "author": "作者",
     "bad_post": "劣文",
     "bad_post_not_recorded": "文章已刪除，但退文（惡退）未成功記錄",
+    "bet_lottery": "下注樂透 _target0_",
     "board": "看板",
     "can_not_use_search_post_code_f": "此狀態下無法使用搜尋文章代碼(AID)功能",
     "catch_bottom_post": "取得置底文章",
@@ -31,6 +32,7 @@ string_data = {
     "find_newest_index": "找到最新編號",
     "get_board_info": "取得看板資訊 _target0_",
     "get_favourite_board_list": "取得我的最愛",
+    "get_lottery": "取得樂透資訊 _target0_",
     "get_mail": "取得信件",
     "get_waterball": "取得水球紀錄",
     "give_money_to": "給 _target0_ _target1_ P 幣",
@@ -76,6 +78,7 @@ string_data = {
     "no_response": "很抱歉, 此文章已結案並標記, 不得回應",
     "no_search_result": "沒有搜尋結果",
     "no_such_board": "無該看板",
+    "no_such_lottery": "目前並沒有舉辦樂透或已封盤",
     "no_such_mail": "無此信件",
     "no_such_post": "_target0_ 板找不到這個文章代碼 _target1_",
     "no_such_user": "無該使用者",

pyptt-2.2.1/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIPR5AEs3hlT87YJb3cVPOjlrwtoi3mpIs4SutZ7I/czsoAoGCCqGSM49
+AwEHoUQDQgAEYo0CaF+C4aiLepcNAH6B7LJjMmQ8kjzzr67E2IwniY9LTVYboifa
+EefOhnSQNLHpyvoBhuxIa4Icnfy/bPEb5g==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6TCCAY8CFHEfxTaKowfSEkiJOGonCzq3U3cJMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA3MTkxMjM0MDdaFw0zNjA3MTYxMjM0
+MDdaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABGKNAmhfguGoi3qXDQB+geyyYzJkPJI886+uxNiMJ4mPS01WG6In2hHn
+zoZ0kDSx6cr6AYbsSGuCHJ38v2zxG+YwCgYIKoZIzj0EAwIDSAAwRQIhAOCb0At1
+XW07h90zQWDcKcwK+Y7XPz3ajXeJey6F14xAAiBg4hiS77M5yR+AKndS4KB5Wo6j
+HlWPOa4KFzY1Y+iXzw==
+-----END CERTIFICATE-----
+"""

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt.egg-info/PKG-INFO

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

{pyptt-2.1.7 → pyptt-2.2.1}/PyPtt.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ PyPtt/_api_get_waterball.py
 PyPtt/_api_give_money.py
 PyPtt/_api_has_new_mail.py
 PyPtt/_api_loginout.py
+PyPtt/_api_lottery.py
 PyPtt/_api_mail.py
 PyPtt/_api_mark_post.py
 PyPtt/_api_post.py
@@ -76,10 +77,12 @@ tests/test_i18n.py
 tests/test_init.py
 tests/test_logger.py
 tests/test_login_logout.py
+tests/test_lottery.py
 tests/test_mail_send_and_del.py
 tests/test_mark_post.py
 tests/test_parse_query_post.py
 tests/test_post.py
+tests/test_post_anonymous.py
 tests/test_pyte_parity.py
 tests/test_reply_post.py
 tests/test_search_user.py

pyptt-2.2.1/tests/test_lottery.py

@@ -0,0 +1,92 @@
+"""Integration tests for the per-board lottery (issue #95): get_lottery /
+bet_lottery, driven against mbbsd/gamble.c's join_gamble()/ticket() flow (the
+'f' key inside a board).
+
+Round-driving tests need an actual open lottery round, which only the
+LOCALHOST bootstrap provisions (board `PyPttLottery`, seeded directly via
+`ticket.items` + a `ticket` marker file -- see
+scripts/bootstrap_local_pttbbs.py, step_lottery()); they're skipped on the
+real PTT hosts. item/amount range validation raises before any board
+navigation, so those run everywhere.
+"""
+import pytest
+
+import PyPtt
+from PyPtt import LotteryBetField, LotteryField, LotteryOptionField
+
+LOTTERY_BOARD = 'PyPttLottery'
+LOTTERY_PRICE = 10
+LOTTERY_ITEMS = ('Alpha', 'Bravo', 'Charlie')
+
+
+def test_get_lottery_seeded_round(ptt_bots):
+    """get_lottery reads back the seeded price + option names + sold counts."""
+    ptt1_bot, ptt2_bot = ptt_bots
+    if ptt1_bot.host != PyPtt.HOST.LOCALHOST:
+        pytest.skip('PyPttLottery is only provisioned by the LOCALHOST bootstrap')
+
+    lottery = ptt2_bot.get_lottery(board=LOTTERY_BOARD)
+
+    assert lottery[LotteryField.board] == LOTTERY_BOARD
+    assert lottery[LotteryField.price] == LOTTERY_PRICE
+
+    options = lottery[LotteryField.options]
+    assert len(options) == len(LOTTERY_ITEMS)
+    assert [o[LotteryOptionField.name] for o in options] == list(LOTTERY_ITEMS)
+    assert [o[LotteryOptionField.index] for o in options] == [1, 2, 3]
+    for option in options:
+        assert option[LotteryOptionField.sold] >= 0
+
+
+def test_bet_lottery_increments_sold_count(ptt_bots):
+    """Buying `amount` of an item bumps that item's sold count by exactly
+    `amount`, verified via a follow-up get_lottery -- pttbbs gives no
+    textual purchase receipt, so this is the ground truth."""
+    ptt1_bot, ptt2_bot = ptt_bots
+    if ptt1_bot.host != PyPtt.HOST.LOCALHOST:
+        pytest.skip('PyPttLottery is only provisioned by the LOCALHOST bootstrap')
+
+    item = 2
+    amount = 3
+
+    before = ptt2_bot.get_lottery(board=LOTTERY_BOARD)
+    sold_before = before[LotteryField.options][item - 1][LotteryOptionField.sold]
+
+    result = ptt2_bot.bet_lottery(board=LOTTERY_BOARD, item=item, amount=amount)
+    assert result[LotteryBetField.board] == LOTTERY_BOARD
+    assert result[LotteryBetField.item] == item
+    assert result[LotteryBetField.name] == LOTTERY_ITEMS[item - 1]
+    assert result[LotteryBetField.amount] == amount
+    assert result[LotteryBetField.cost] == LOTTERY_PRICE * amount
+
+    after = ptt2_bot.get_lottery(board=LOTTERY_BOARD)
+    sold_after = after[LotteryField.options][item - 1][LotteryOptionField.sold]
+
+    assert sold_after == sold_before + amount
+
+
+def test_get_lottery_no_round_raises(ptt_bots):
+    """A board that never had a lottery round raises NoSuchLottery."""
+    ptt1_bot, ptt2_bot = ptt_bots
+    if ptt1_bot.host != PyPtt.HOST.LOCALHOST:
+        pytest.skip('needs a board known to never have hosted a lottery round')
+
+    with pytest.raises(PyPtt.exceptions.NoSuchLottery):
+        ptt2_bot.get_lottery(board='Test')
+
+
+@pytest.mark.parametrize('item', [0, 9])
+def test_bet_lottery_invalid_item_raises(ptt_bots, item):
+    """item is 1..8; out-of-range raises before any board navigation."""
+    ptt1_bot, ptt2_bot = ptt_bots
+    with pytest.raises(PyPtt.exceptions.ParameterError):
+        ptt2_bot.bet_lottery(board='Test', item=item, amount=1)
+
+
+@pytest.mark.parametrize('amount', [0, 10000])
+def test_bet_lottery_invalid_amount_raises(ptt_bots, amount):
+    """amount is 1..9999 (pttbbs' getdata_str buffer is 4 digits); out-of-range
+    raises before any board navigation."""
+    ptt1_bot, ptt2_bot = ptt_bots
+    with pytest.raises(PyPtt.exceptions.ParameterError):
+        ptt2_bot.bet_lottery(board='Test', item=1, amount=amount)

pyptt-2.2.1/tests/test_post_anonymous.py

@@ -0,0 +1,96 @@
+"""Tests PyPtt issue #84 (匿名發文): post()'s anonymous/display_id params
+against a board that actually carries pttbbs' BRD_ANONYMOUS/BRD_DEFAULTANONYMOUS
+flags. Only pttbbs boards flagged this way ever show the anonymous prompt --
+PyPtt cannot force anonymity on a normal board (see PyPtt/_api_post.py). Only
+scripts/bootstrap_local_pttbbs.py's local container provisions such a board
+(AnonTest), so this file is LOCALHOST-only.
+"""
+import os
+import time
+import uuid
+
+import pytest
+
+import PyPtt
+from PyPtt import PostField, NewIndex
+
+if os.environ.get('PTT_HOST') != 'LOCALHOST':
+    pytest.skip(
+        'test_post_anonymous.py needs the AnonTest board, which only '
+        'scripts/bootstrap_local_pttbbs.py provisions. Set PTT_HOST=LOCALHOST to run.',
+        allow_module_level=True)
+
+ANON_BOARD = 'AnonTest'
+
+
+def _find_own_post(ptt_bot, title_marker):
+    """Scan back from the newest post on ANON_BOARD for the one whose title
+    contains title_marker, and return its parsed post dict."""
+    newest_index = ptt_bot.get_newest_index(index_type=NewIndex.BOARD, board=ANON_BOARD)
+    for i in range(10):
+        index = newest_index - i
+        if index <= 0:
+            break
+        post = ptt_bot.get_post(board=ANON_BOARD, index=index)
+        if title_marker in post[PostField.title]:
+            return post
+    raise AssertionError(f'could not find a post titled with marker {title_marker!r}')
+
+
+def test_post_anonymous(ptt_bots):
+    """anonymous=True, display_id=None -> pttbbs masks the author as
+    'Anonymous.' (AnonTest is bootstrapped BRD_DEFAULTANONYMOUS, so an empty
+    response to the anon prompt means 'Anonymous', not the real id; pttbbs
+    appends a trailing '.' the same way it does for a custom display_id)."""
+    ptt_bot = ptt_bots[0]
+    marker = uuid.uuid4().hex[:12]
+    title = f'PyPtt anon test {marker}'
+
+    ptt_bot.post(board=ANON_BOARD, title_index=1, title=title,
+                 content='PyPtt anonymous post test content.\n', sign_file=0,
+                 anonymous=True)
+
+    time.sleep(1)
+    post = _find_own_post(ptt_bot, marker)
+
+    author = post[PostField.author]
+    assert author.split(' ')[0] == 'Anonymous.', f'expected masked author "Anonymous.", got {author!r}'
+    assert ptt_bot.ptt_id not in author, f'real ptt_id leaked into author field: {author!r}'
+
+
+def test_post_anonymous_with_display_id(ptt_bots):
+    """anonymous=True, display_id='PyPttFox' -> pttbbs masks the author as
+    the custom name plus a trailing '.' (pttbbs behavior, not adjustable)."""
+    ptt_bot = ptt_bots[0]
+    marker = uuid.uuid4().hex[:12]
+    title = f'PyPtt anon custom id test {marker}'
+    display_id = 'PyPttFox'
+
+    ptt_bot.post(board=ANON_BOARD, title_index=1, title=title,
+                 content='PyPtt anonymous post (custom display id) test content.\n', sign_file=0,
+                 anonymous=True, display_id=display_id)
+
+    time.sleep(1)
+    post = _find_own_post(ptt_bot, marker)
+
+    author = post[PostField.author]
+    assert author.split(' ')[0] == f'{display_id}.', f'expected masked author "{display_id}.", got {author!r}'
+    assert ptt_bot.ptt_id not in author, f'real ptt_id leaked into author field: {author!r}'
+
+
+def test_post_not_anonymous_shows_real_id(ptt_bots):
+    """anonymous=False (default) -> even on an anonymous-capable board, the
+    real ptt_id is used (safe default, backward compatible with pre-#84
+    callers of post())."""
+    ptt_bot = ptt_bots[0]
+    marker = uuid.uuid4().hex[:12]
+    title = f'PyPtt non-anon test {marker}'
+
+    ptt_bot.post(board=ANON_BOARD, title_index=1, title=title,
+                 content='PyPtt non-anonymous post test content.\n', sign_file=0)
+
+    time.sleep(1)
+    post = _find_own_post(ptt_bot, marker)
+
+    author = post[PostField.author]
+    assert author.split(' ')[0] == ptt_bot.ptt_id, f'expected real author {ptt_bot.ptt_id!r}, got {author!r}'

pyptt-2.1.7/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBl6n84gGhyoI6rh8jsDM6+MvbtX++1SctY8mkfAU/PqoAoGCCqGSM49
-AwEHoUQDQgAEKrKMWokWd4Y6dFHFFr4pg9h340NKkekdCrYbxv1l2SUBUDkXUx28
-fGqtXxYCuOsEQTeQrm0OmCq6U+aRXMvwaQ==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6DCCAY8CFEXMlgDToWo6s00YgTOitW0BgNCdMAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA3MTgwNDE0NTZaFw0zNjA3MTUwNDE0
-NTZaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABCqyjFqJFneGOnRRxRa+KYPYd+NDSpHpHQq2G8b9ZdklAVA5F1MdvHxq
-rV8WArjrBEE3kK5tDpgqulPmkVzL8GkwCgYIKoZIzj0EAwIDRwAwRAIgcfQdHGfL
-m1j+zvm23ToVfbfGdlvcR4hXBQkWMQslAkICIEccC2jqieHYgaLRUgzoUVI/twm3
-5uAjX0ZWPxTPuNvA
------END CERTIFICATE-----
-"""