PyPtt 2.3.10__tar.gz → 2.3.12__tar.gz

{pyptt-2.3.10 → pyptt-2.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.10
+Version: 2.3.12
 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.10 → pyptt-2.3.12}/PyPtt/PTT.py

@@ -586,6 +586,7 @@ class API:
             UnregisteredUser: 未註冊使用者。
             NoSuchUser: 使用者不存在。
             NoMoney: 餘額不足。
+            ParameterError: 金額過少，交易取消。
 
         範例::
 

{pyptt-2.3.10 → pyptt-2.3.12}/PyPtt/__init__.py

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

pyptt-2.3.12/PyPtt/_api_bucket.py

@@ -0,0 +1,80 @@
+import time
+
+from . import _api_set_board_title
+from . import _api_util
+from . import check_value
+from . import command
+from . import exceptions
+from . import i18n
+from . import lib_util
+from . import screens
+from ._api_set_board_title import step
+
+
+def _bucket_days_max() -> int:
+    # pttbbs mbbsd/acl.c:180-206: 期限輸入欄 getdata(..., datebuf, 8) 最多 7 位數，
+    # 到期時間用 time4_add_sec() 算，超過 0xFFFFFFFF (2106-02-07) 就回「日期過大」
+    # (include/cmsys.h:86-93)。所以上限是「現在到 2106-02-07」的整天數。
+    return min(9999999, (0xFFFFFFFF - int(time.time())) // 86400 - 1)
+
+
+def bucket(api, board: str, bucket_days: int, reason: str, ptt_id: str) -> None:
+    _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(bucket_days, int, 'bucket_days')
+    check_value.check_type(reason, str, 'reason')
+    check_value.check_type(ptt_id, str, 'ptt_id')
+    # bool 是 int 的子類別；期限要是正整數天，且不超過 PTT 能存的到期時間
+    max_days = _bucket_days_max()
+    if isinstance(bucket_days, bool) or not 0 < bucket_days <= max_days:
+        raise exceptions.ParameterError(f'bucket_days must be an int in 1..{max_days}, got {bucket_days!r}')
+    _api_util.check_no_control_chars(reason, 'reason')
+    _api_util.check_no_control_chars(ptt_id, 'ptt_id')
+
+    _api_util.check_user_exist(api, ptt_id)
+
+    _api_util.check_board(api, board, check_moderator=True)
+
+    _api_util.goto_board(api, board)
+
+    # 從這裡起進入看板設定；任何結束路徑都由 run_in_board_setting 退回文章列表
+    _api_util.run_in_board_setting(api, lambda: _bucket_in_board_setting(api, board, bucket_days, reason, ptt_id))
+
+
+def _bucket_in_board_setting(api, board: str, bucket_days: int, reason: str, ptt_id: str) -> None:
+
+    # 新版編輯模式裡 w 直接打開 Bakuman (不能再補 Enter，Enter 會被當成 [Q]結束)；
+    # 舊版 w 是「請輸入要改變的設定」單行輸入，要 Enter 送出。
+    mode = _api_set_board_title.open_board_setting(api, board, 'i')
+    step(api, 'w' if mode == 'new' else 'w' + command.enter, [('bakuman', screens.Target.Bakuman)])
+
+    # Bakuman 新舊版相同，每一步都比對提示再送下一步
+    step(api, 'a' + command.enter, [('id', '請輸入使用者代號')])
+    result = step(api, ptt_id + command.enter, [
+        ('period', '請以數字跟單位(預設為天)輸入期限'),
+        ('banned', '◆ 使用者之前已被禁言'),
+    ])
+    if result == 'banned':
+        raise exceptions.UserHasPreviouslyBeenBanned()
+
+    step(api, str(bucket_days) + command.enter, [('reason', '請輸入理由')])
+    step(api, reason + command.enter, [('confirm', '確認以上資料全部正確嗎')])
+    step(api, 'y' + command.enter, [
+        ('done', '◆ 已將使用者加入禁言名單'),
+    ], screen_timeout=api.config.screen_long_timeout)
+
+    # [按任意鍵繼續] → 回到 [Q]結束? → Enter (空白 = Q) 離開 Bakuman
+    step(api, command.left, [('bakuman', screens.Target.Bakuman)])
+    if mode == 'new':
+        step(api, command.enter, [('edit', screens.Target.BoardSettingEdit)])
+    else:
+        step(api, command.enter, [('prompt', screens.Target.BoardSettingOldPrompt)])
+
+    _api_set_board_title.close_board_setting(api, mode)

pyptt-2.3.12/PyPtt/_api_get_board_info.py

@@ -0,0 +1,325 @@
+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 log
+from . import screens
+from .data_type import BoardField
+
+
+def get_board_info(api, board: str, get_post_kind: bool, call_by_others: bool) -> Dict:
+    logger = log.init(log.DEBUG if call_by_others else log.INFO)
+
+    _api_util.one_thread(api)
+
+    if not api._is_login:
+        raise exceptions.RequireLogin(i18n.require_login)
+
+    check_value.check_type(board, str, 'board')
+
+    logger.info(
+        i18n.replace(i18n.get_board_info, board))
+
+    _api_util.goto_board(api, board, refresh=True)
+
+    # last_timeout_was_silent is only meaningful right after a send(), and
+    # goto_board()'s last action is one. Nothing below sends until the 'i'
+    # further down, so the flag stays valid for the whole parse block: a
+    # totally silent timeout means goto_board never redrew and we are about
+    # to parse a stale screen -- a half-dead connection, not a missing board.
+    ori_screen = api.connect_core.get_screen_queue()[-1]
+    # print(ori_screen)
+
+    online_user_line = None
+    for line in ori_screen.split('\n'):
+        if '作  者' not in line:
+            continue
+        if '日 期' not in line:
+            continue
+
+        online_user_line = line
+        break
+
+    if online_user_line is None:
+        if api.connect_core.last_timeout_was_silent:
+            raise exceptions.ConnectionClosed()
+        raise exceptions.NoSuchBoard(api.config, board)
+
+    if '[靜]' in online_user_line:
+        online_user = 0
+    else:
+        if '日 期' not in online_user_line or '作  者' not in online_user_line:
+            if api.connect_core.last_timeout_was_silent:
+                raise exceptions.ConnectionClosed()
+            raise exceptions.NoSuchBoard(api.config, board)
+        pattern = re.compile(r'[\d]+')
+        r = pattern.search(online_user_line)
+        if r is None:
+            if api.connect_core.last_timeout_was_silent:
+                raise exceptions.ConnectionClosed()
+            raise exceptions.NoSuchBoard(api.config, board)
+        # 減一是把自己本身拿掉
+        online_user = int(r.group(0)) - 1
+
+    logger.debug('人氣', online_user)
+
+    target_list = [
+        # 新版「看板設定與管理」畫面沒有任意鍵提示；等頁尾畫完再解析
+        connect_core.TargetUnit('(PgUp)上頁 (PgDn)下頁', log_level=log.DEBUG if call_by_others else log.INFO,
+                                break_detect=True),
+        connect_core.TargetUnit('任意鍵繼續', log_level=log.DEBUG if call_by_others else log.INFO,
+                                break_detect=True),
+    ]
+
+    api.connect_core.send(
+        'i',
+        target_list)
+
+    # Same flag window as above: the 'i' send() right before is the last one
+    # until the get_post_kind block, so the flag still describes it here.
+    ori_screen = api.connect_core.get_screen_queue()[-1]
+    # print(ori_screen)
+
+    # 新版「看板設定與管理」沒有任意鍵提示，會一直停在選單上 (之後 API 開頭的 Space
+    # 會落在選單裡)。畫面已存下來，先用一個 ← 退回文章列表再解析；確認不了就斷線。
+    if screens.in_board_setting(ori_screen):
+        api.connect_core.send(command.left, [
+            connect_core.TargetUnit(screens.Target.InBoard, log_level=log.DEBUG, break_detect=True)])
+        if not _api_util.is_article_list(api, api.connect_core.get_screen_queue()[-1]):
+            _api_util.close_session(api)
+            raise exceptions.ConnectionClosed()
+
+    boardname = None
+    # 新版: '看板名稱: Test 板主名單: ...'；舊版: '《Test》看板設定'
+    r = re.search(r'看板名稱: (\S+)|《(.+)》看板設定', ori_screen)
+    if r is not None:
+        boardname = (r.group(1) or r.group(2)).strip()
+
+    if boardname is None:
+        if api.connect_core.last_timeout_was_silent:
+            raise exceptions.ConnectionClosed()
+        raise exceptions.NoSuchBoard(api.config, board)
+    logger.debug('看板名稱', boardname, board)
+
+    if boardname.lower() != board.lower():
+        if api.connect_core.last_timeout_was_silent:
+            raise exceptions.ConnectionClosed()
+        raise exceptions.NoSuchBoard(api.config, board)
+
+    chinese_des = ''
+    p = re.compile(r'中文敘述: (.+)')
+    r = p.search(ori_screen)
+    if r is not None:
+        chinese_des = r.group(0)[5:].strip()
+    logger.debug('中文敘述', chinese_des)
+
+    moderators = []
+    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)
+    logger.debug('板主名單', moderators)
+
+    if '看板名稱:' in ori_screen:
+        # 新版畫面每項一列: '  9.   快速連推文章           限制 (間隔 5 秒)'。
+        # 2026-10-19 起欄寬變寬；編輯模式另有熱鍵標示 ' 1. (b)中文敘述' 與
+        # 權限註記 '開放 (限站長)'，兩者都去掉再比對。
+        # 值要整串比對：'開放' 是 '不開放' 的子字串，'對齊' 是 '不用對齊' 的子字串。
+        def value(label: str) -> str:
+            m = re.search(r'^[> ]*\d+\. +(?:\(\w\))?' + re.escape(label) + r' +(.+?) *$', ori_screen, re.M)
+            return re.sub(r' *\(限[^)]*\)$', '', m.group(1)) if m else ''
+
+        chinese_des = value('中文敘述')
+        open_status = value('公開狀態 (是否隱形)') == '公開'
+        into_top_ten_when_hide = value('隱板時進入十大排行榜') == '可以'
+        non_board_members_post = value('非看板會員發文') == '開放'
+        reply_post = value('回應文章') == '開放'
+        self_del_post = value('自刪文章') == '開放'
+        push_post = value('推薦文章 (推文)') == '開放'
+        boo_post = value('噓文') == '開放'
+        fast_push = value('快速連推文章') == '開放'
+        m = re.search(r'間隔 (\d+) 秒', value('快速連推文章'))
+        min_interval = int(m.group(1)) if m else 0
+        push_record_ip = value('推文時記錄來源 IP') == '自動記錄'
+        push_aligned = value('推文開頭自動對齊') == '對齊'
+        moderator_can_del_illegal_content = value('板主刪除部份違規文字') == '可'
+        tran_post_auto_recorded_and_require_post_permissions = value('轉錄文章自動記錄') == '會 (需發文權限)'
+        cool_mode = value('冷靜模式') != '未設定'
+        require18 = value('未滿十八歲進入') == '禁止'
+        # 2026-10-19 起有發文條件兩列:
+        #   '16.    [發文條件] 登入次數       500 次以上 (您: 6614 次)'
+        #   '17.    [發文條件] 退文篇數       1 篇以下 (您: 0 篇)'
+        # '無限制' 或沒有這兩列 (2026-10-18 的畫面) 都給 0 (= 無限制)
+        m = re.match(r'(\d+) 次以上', value('[發文條件] 登入次數'))
+        require_login_time = int(m.group(1)) if m else 0
+        m = re.match(r'(\d+) 篇以下', value('[發文條件] 退文篇數'))
+        require_illegal_post = int(m.group(1)) if m else 0
+    else:
+        open_status = ('公開狀態(是否隱形): 公開' in ori_screen)
+        logger.debug('公開狀態', open_status)
+
+        into_top_ten_when_hide = ('隱板時 可以 進入十大排行榜' in ori_screen)
+        logger.debug('隱板時可以進入十大排行榜', into_top_ten_when_hide)
+
+        non_board_members_post = ('開放 非看板會員發文' in ori_screen)
+        logger.debug('非看板會員發文', non_board_members_post)
+
+        reply_post = ('開放 回應文章' in ori_screen)
+        logger.debug('回應文章', reply_post)
+
+        self_del_post = ('開放 自刪文章' in ori_screen)
+        logger.debug('自刪文章', self_del_post)
+
+        push_post = ('開放 推薦文章' in ori_screen)
+        logger.debug('推薦文章', push_post)
+
+        boo_post = ('開放 噓文' in ori_screen)
+        logger.debug('噓文', boo_post)
+
+        # 限制 快速連推文章, 最低間隔時間: 5 秒
+        # 開放 快速連推文章
+
+        fast_push = ('開放 快速連推文章' in ori_screen)
+        logger.debug('快速連推文章', fast_push)
+
+        if not fast_push:
+            p = re.compile(r'最低間隔時間: [\d]+')
+            r = p.search(ori_screen)
+            if r is not None:
+                min_interval = r.group(0)[7:].strip()
+                min_interval = int(min_interval)
+            else:
+                min_interval = 0
+            logger.debug('最低間隔時間', min_interval)
+        else:
+            min_interval = 0
+
+        # 推文時 自動 記錄來源 IP
+        # 推文時 不會 記錄來源 IP
+        push_record_ip = ('推文時 自動 記錄來源 IP' in ori_screen)
+        logger.debug('記錄來源 IP', push_record_ip)
+
+        # 推文時 對齊 開頭
+        # 推文時 不用對齊 開頭
+        push_aligned = ('推文時 對齊 開頭' in ori_screen)
+        logger.debug('對齊開頭', push_aligned)
+
+        # 板主 可 刪除部份違規文字
+        moderator_can_del_illegal_content = ('板主 可 刪除部份違規文字' in ori_screen)
+        logger.debug('板主可刪除部份違規文字', moderator_can_del_illegal_content)
+
+        # 轉錄文章 會 自動記錄，且 需要 發文權限
+        tran_post_auto_recorded_and_require_post_permissions = ('轉錄文章 會 自動記錄，且 需要 發文權限' in ori_screen)
+        logger.debug('轉錄文章 會 自動記錄，且 需要 發文權限', tran_post_auto_recorded_and_require_post_permissions)
+
+        cool_mode = ('未 設為冷靜模式' not in ori_screen)
+        logger.debug('冷靜模式', cool_mode)
+
+        require18 = ('禁止 未滿十八歲進入' in ori_screen)
+        logger.debug('禁止未滿十八歲進入', require18)
+
+        p = re.compile(r'登入次數 [\d]+ 次以上')
+        r = p.search(ori_screen)
+        if r is not None:
+            require_login_time = r.group(0).split(' ')[1]
+            require_login_time = int(require_login_time)
+        else:
+            require_login_time = 0
+        logger.debug('發文限制登入次數', require_login_time)
+
+        p = re.compile(r'退文篇數 [\d]+ 篇以下')
+        r = p.search(ori_screen)
+        if r is not None:
+            require_illegal_post = r.group(0).split(' ')[1]
+            require_illegal_post = int(require_illegal_post)
+        else:
+            require_illegal_post = 0
+        logger.debug('發文限制退文篇數', require_illegal_post)
+
+    kind_list = []
+    if get_post_kind:
+
+        _api_util.goto_board(api, board)
+
+        # Go certain board, then post to get post type info
+        cmd_list = []
+        cmd_list.append(command.ctrl_p)
+        cmd = ''.join(cmd_list)
+
+        target_list = [
+            connect_core.TargetUnit('無法發文: 未達看板要求權限', break_detect=True),
+            connect_core.TargetUnit('或不選)', break_detect=True)
+        ]
+
+        index = api.connect_core.send(
+            cmd,
+            target_list)
+
+        if index == 0:
+            raise exceptions.NoPermission(i18n.no_permission)
+            # no post permission
+
+        ori_screen = api.connect_core.get_screen_queue()[-1]
+        screen_lines = ori_screen.split('\n')
+
+        for i in screen_lines:
+            if '種類：' in i:
+                type_pattern = re.compile(r'\d\.([^\ ]*)')
+                # 0 is not present any type that the key hold None object
+                kind_list = type_pattern.findall(i)
+                break
+
+        # Clear post status
+        cmd_list = []
+        cmd_list.append(command.ctrl_c)
+        cmd_list.append(command.ctrl_c)
+        cmd = ''.join(cmd_list)
+
+        target_list = [
+            connect_core.TargetUnit(screens.Target.InBoard, break_detect=True)
+        ]
+        api.connect_core.send(
+            cmd,
+            target_list)
+
+    logger.info(
+        i18n.replace(i18n.get_board_info, board),
+        '...', i18n.success
+    )
+
+    return {
+        BoardField.board: boardname,
+        BoardField.online_user: online_user,
+        BoardField.mandarin_des: chinese_des,
+        BoardField.moderators: moderators,
+        BoardField.open_status: open_status,
+        BoardField.into_top_ten_when_hide: into_top_ten_when_hide,
+        BoardField.can_non_board_members_post: non_board_members_post,
+        BoardField.can_reply_post: reply_post,
+        BoardField.self_del_post: self_del_post,
+        BoardField.can_comment_post: push_post,
+        BoardField.can_boo_post: boo_post,
+        BoardField.can_fast_push: fast_push,
+        BoardField.min_interval_between_comments: min_interval,
+        BoardField.is_comment_record_ip: push_record_ip,
+        BoardField.is_comment_aligned: push_aligned,
+        BoardField.can_moderators_del_illegal_content: moderator_can_del_illegal_content,
+        BoardField.does_tran_post_auto_recorded_and_require_post_permissions: tran_post_auto_recorded_and_require_post_permissions,
+        BoardField.is_cool_mode: cool_mode,
+        BoardField.is_require18: require18,
+        BoardField.require_login_time: require_login_time,
+        BoardField.require_illegal_post: require_illegal_post,
+        BoardField.post_kind_list: kind_list
+    }

{pyptt-2.3.10 → pyptt-2.3.12}/PyPtt/_api_get_favourite_board.py

@@ -1,11 +1,17 @@
+import re
+
 from . import _api_util
 from . import command
 from . import connect_core
 from . import exceptions
 from . import i18n
 from . import log
+from . import screens
 from .data_type import FavouriteBoardField
 
+# '    83)  MCP_Test     測試 ◎…'、'     2 ˇAllTogether  聯誼 ◎…'：編號、[)]、[ˇ]、板名、類別、◎標題
+_ROW = re.compile(r'\s*\d+\)?\s+ˇ?\s*(\S+)\s+(\S+)\s*(.*)')
+
 
 def get_favourite_board(api) -> list:
     _api_util.one_thread(api)
@@ -17,7 +23,8 @@ def get_favourite_board(api) -> list:
     cmd = ''.join(cmd_list)
 
     target_list = [
-        connect_core.TargetUnit('選擇看板', break_detect=True)
+        # 舊版頁尾有「選擇看板」，新版沒有；標頭與頁尾的「已讀/未讀」新舊都有
+        connect_core.TargetUnit(['【看板列表】', '已讀/未讀'], break_detect=True)
     ]
 
     log.logger.info(i18n.get_favourite_board_list)
@@ -32,42 +39,20 @@ def get_favourite_board(api) -> list:
             target_list)
 
         ori_screen = api.connect_core.get_screen_queue()[-1]
-        # print(OriScreen)
-        screen_buf = ori_screen
-        screen_buf = [x for x in screen_buf.split('\n')][3:-1]
-
-        # adjust for cursor
-        screen_buf[0] = '  ' + screen_buf[0][1:]
-        screen_buf = [x for x in screen_buf]
-
-        min_len = 47
-
-        for i, line in enumerate(screen_buf):
-            if len(screen_buf[i]) == 0:
-                continue
-            if len(screen_buf[i]) <= min_len:
-                # print(f'[{ScreenBuf[i]}]')
-                screen_buf[i] = screen_buf[i] + (' ' * ((min_len + 1) - len(screen_buf[i])))
-        screen_buf = [x[10:min_len - len(x)].strip() for x in screen_buf]
-        screen_buf = list(filter(None, screen_buf))
+        screen_buf = [x for x in ori_screen.split('\n')[3:-1] if x.strip()]
 
-        for i, line in enumerate(screen_buf):
+        for line in screen_buf:
             if '------------' in line:
                 continue
-
-            temp = line.strip().split(' ')
-            no_space_temp = list(filter(None, temp))
-
-            board = no_space_temp[0]
-            if board.startswith('ˇ'):
-                board = board[1:]
-
-            board_type = no_space_temp[1]
-
-            title_start_index = temp.index(board_type) + 1
-            board_title = ' '.join(temp[title_start_index:])
+            if line.startswith(api.cursor):
+                line = ' ' * screens._cell_len(api.cursor) + line[len(api.cursor):]
+            # 板名、類別依欄位內容切；標題與人氣欄之間沒有分隔，只能在第 64 格 (人氣欄起點) 切掉
+            m = _ROW.match(line[:screens._str_pos_at_cells(line, 64)])
+            if m is None:
+                continue
+            board, board_type = m.group(1), m.group(2)
             # remove ◎
-            board_title = board_title[1:]
+            board_title = m.group(3)[1:].strip()
 
             if board in board_list:
                 log.logger.info(i18n.get_favourite_board_list, '...', i18n.success)

{pyptt-2.3.10 → pyptt-2.3.12}/PyPtt/_api_get_newest_index.py

@@ -119,6 +119,12 @@ def get_newest_index(api, index_type: data_type.NewIndex, board: Optional[str] =
                                    screens.Target.InBoardWithCursor,
                                    log_level=log.DEBUG,
                                    break_detect=True))
+            # 新版搜尋無結果時，後面的 '1\r' 會打開游標所在的文章；落在文章裡就是沒有結果
+            # 游標文是動畫文時會先停在「要開始播放嗎？」；同樣是沒有結果 (畫面留在詢問上，由下一支 API 的導航離開)
+            target_list.append(connect_core.TargetUnit(screens.Target.InPost,
+                                                       exceptions_=exceptions.NoSearchResult()))
+            target_list.append(connect_core.TargetUnit(screens.Target.Animation,
+                                                       exceptions_=exceptions.NoSearchResult()))
 
             cmd_list = _api_util.get_search_condition_cmd(index_type, search_list)
 

{pyptt-2.3.10 → pyptt-2.3.12}/PyPtt/_api_get_post_list.py

@@ -54,6 +54,9 @@ def get_post_list(api, board: str, limit: int = 20, offset: int = 0) -> List[Dic
 
     post_list = []
 
+    # get_newest_index 命中 2 秒快取時不會導航，畫面可能還停在上一支 API 留下的地方 (例如 get_post 的文章內)
+    _api_util.goto_board(api, board)
+
     with _api_util.expanded_screen(api):
         for _ in range(max_round):
 

{pyptt-2.3.10 → pyptt-2.3.12}/PyPtt/_api_give_money.py

@@ -71,7 +71,8 @@ def give_money(api, ptt_id: str, money: int, red_bag_title: str, red_bag_content
 
     target_list = [
         connect_core.TargetUnit('你沒有那麼多Ptt幣喔!', break_detect=True, exceptions_=exceptions.NoMoney()),
-        connect_core.TargetUnit('金額過少，交易取消!', break_detect=True, exceptions_=exceptions.NoMoney()),
+        connect_core.TargetUnit('金額過少，交易取消!', break_detect=True,
+                                exceptions_=exceptions.ParameterError(f'money is too small: {money}')),
         connect_core.TargetUnit('交易取消!', break_detect=True,
                                 exceptions_=exceptions.UnknownError(i18n.transaction_cancelled)),
         connect_core.TargetUnit('確定進行交易嗎？', response='y' + command.enter),
@@ -80,10 +81,13 @@ def give_money(api, ptt_id: str, money: int, red_bag_title: str, red_bag_content
         connect_core.TargetUnit('要修改紅包袋嗎', response=command.enter),
         connect_core.TargetUnit('完成交易前要重新確認您的身份', response=api._ptt_pw + command.enter, secret=True),
         connect_core.TargetUnit('他是你的小主人，是否匿名？', response='n' + command.enter),
-        connect_core.TargetUnit('要給他多少Ptt幣呢?', response=command.tab + str(money) + command.enter),
-        connect_core.TargetUnit('這位幸運兒的id', response=ptt_id + command.enter),
+        # 金額那行在後續畫面都還在，所以後續的確認提示要排在「幣呢?」前面，否則金額會被打在 y/n 提示上
         connect_core.TargetUnit('認證尚未過期', response='y' + command.enter),
-        connect_core.TargetUnit('交易正在進行中', response=command.space)
+        connect_core.TargetUnit('交易正在進行中', response=command.space),
+        # 舊版「要給他多少Ptt幣呢?」、新版「要給多少Ptt幣呢?」(docker 站是 Dtt幣)。要排在「這位幸運兒的id」
+        # 前面，否則同畫面的 id 行先被對上，id 又被送進金額欄。TAB 切到「對方收到 (稅後)」，與舊版相同
+        connect_core.TargetUnit('幣呢?', response=command.tab + str(money) + command.enter),
+        connect_core.TargetUnit('這位幸運兒的id', response=ptt_id + command.enter),
     ]
 
     api.connect_core.send(