PyPtt 2.1.2__tar.gz → 2.1.3__tar.gz

{pyptt-2.1.2 → pyptt-2.1.3}/PKG-INFO

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

@@ -1071,7 +1071,7 @@ class API:
 
         return _api_get_bottom_post_list.get_bottom_post_list(self, board)
 
-    def del_post(self, board: str, aid: Optional[str] = None, index: int = 0) -> None:
+    def del_post(self, board: str, aid: Optional[str] = None, index: int = 0, reason: Optional[str] = None) -> None:
         """
         刪除文章。
 
@@ -1079,6 +1079,7 @@ class API:
             board (str): 看板名稱。
             aid (str): 文章編號。
             index (int): 文章編號。
+            reason (str): 板主刪除他人文章時，加註於刪除後標題的理由（僅板主刪除他板友文章時有效）。
 
         Returns:
             None
@@ -1089,6 +1090,7 @@ class API:
             NoSuchBoard: 看板不存在。
             NoSuchPost: 文章不存在。
             NoPermission: 沒有權限。
+            ParameterError: 對自己的文章傳入 reason（加註理由僅適用於版主刪除他人文章）。
 
         範例::
 
@@ -1103,7 +1105,7 @@ class API:
                 ptt_bot.logout()
         """
 
-        _api_del_post.del_post(self, board, aid, index)
+        _api_del_post.del_post(self, board, aid, index, reason)
 
     def get_post_list(self, board: str, limit: int = 20, offset: int = 0) -> list[dict]:
         """

{pyptt-2.1.2 → pyptt-2.1.3}/PyPtt/__init__.py

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

{pyptt-2.1.2 → pyptt-2.1.3}/PyPtt/_api_del_post.py

@@ -14,7 +14,7 @@ from . import log
 from . import screens
 
 
-def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int = 0) -> None:
+def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int = 0, reason: Optional[str] = None) -> None:
     _api_util.one_thread(api)
 
     if not api.is_registered_user:
@@ -27,6 +27,8 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
     if post_aid is not None:
         check_value.check_type(post_aid, str, 'PostAID')
     check_value.check_type(post_index, int, 'PostIndex')
+    if reason is not None:
+        check_value.check_type(reason, str, 'reason')
 
     if len(board) == 0:
         raise exceptions.ParameterError(f'board error parameter: {board}')
@@ -64,6 +66,13 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
         log.logger.info(i18n.delete_post, '...', i18n.success)
         return
 
+    # PTT only offers the "R加註理由" annotation when a moderator deletes
+    # another user's post. On your own post the reason can never be applied,
+    # so reject it rather than silently dropping it.
+    if reason and api.ptt_id.lower() == post_info[data_type.PostField.author].lower():
+        raise exceptions.ParameterError(
+            'reason is only valid when a moderator deletes another user\'s post')
+
     if check_author:
         if api.ptt_id.lower() != post_info[data_type.PostField.author].lower():
             log.logger.info(i18n.delete_post, '...', i18n.fail)
@@ -90,20 +99,40 @@ def del_post(api, board: str, post_aid: Optional[str] = None, post_index: int =
     def confirm_delete_handler(screen):
         api.confirm = True
 
+    # A board moderator deleting another user's post gets an extra
+    # "R加註理由" option that lets us annotate the title shown after deletion.
+    use_reason = bool(reason) and not check_author
+
+    def confirm_delete_response(screen):
+        if use_reason and '加註理由' in screen:
+            return 'r' + command.enter
+        return 'y' + command.enter
+
     target_list = [
         connect_core.TargetUnit('請按任意鍵繼續', response=' '),
-        connect_core.TargetUnit('請確定刪除(Y/N)?[N]', response='y' + command.enter, handler=confirm_delete_handler,
-                                max_match=1),
-        connect_core.TargetUnit(screens.Target.InBoard, break_detect=True),
+        connect_core.TargetUnit('請確定刪除(Y/N', response=confirm_delete_response,
+                                handler=confirm_delete_handler, max_match=1),
     ]
 
-    index = api.connect_core.send(
-        cmd,
-        target_list)
-
-    if index == 1:
-        if not api.confirm:
-            log.logger.info(i18n.delete_post, '...', i18n.fail)
-            raise exceptions.NoPermission(i18n.no_permission)
+    if use_reason:
+        target_list.append(
+            connect_core.TargetUnit(
+                '請輸入刪除後要顯示的標題',
+                response=command.ctrl_e + ' ' + reason + command.enter,
+                max_match=1))
+        target_list.append(
+            connect_core.TargetUnit(
+                '請再次確定是否要用上述理由刪除(Y/N',
+                response='y' + command.enter,
+                max_match=1))
+
+    target_list.append(
+        connect_core.TargetUnit(screens.Target.InBoard, break_detect=True))
+
+    api.connect_core.send(cmd, target_list)
+
+    if not api.confirm:
+        log.logger.info(i18n.delete_post, '...', i18n.fail)
+        raise exceptions.NoPermission(i18n.no_permission)
 
     log.logger.info(i18n.delete_post, '...', i18n.success)

pyptt-2.1.3/PyPtt/ssl_config.py

@@ -0,0 +1,24 @@
+key = """-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIEkOJyMNiLY15Dbj6KQAQzcL8VCnyWHTZRAtIku05VDZoAoGCCqGSM49
+AwEHoUQDQgAEKUSVL5IptOLhRvvjbwASpbMm2u9g5bB+JzwZFipu7YcP/M3O/hdn
+itOTx/TQ1WUZzOO1K8VVP+PiJ848Gf7oXQ==
+-----END EC PRIVATE KEY-----
+"""
+
+cert = """-----BEGIN CERTIFICATE-----
+MIIB6DCCAY8CFBQB2jo2W/VcD/OwELD8q619nPFLMAoGCCqGSM49BAMCMHcxCzAJ
+BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
+CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
+EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA2MjkxMzI5MjNaFw0zNjA2MjYxMzI5
+MjNaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
+eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
+bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
+AwEHA0IABClElS+SKbTi4Ub7428AEqWzJtrvYOWwfic8GRYqbu2HD/zNzv4XZ4rT
+k8f00NVlGczjtSvFVT/j4ifOPBn+6F0wCgYIKoZIzj0EAwIDRwAwRAIgXp4Ylzan
+xWWkNTM2MrkPDIy06zA6vLWkKaXNaTRbc+8CICnfggxFK7IrkX5Z7ZOstjCaO+kd
+/xwJcAEv99IpTAr/
+-----END CERTIFICATE-----
+"""

{pyptt-2.1.2 → pyptt-2.1.3}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.1.2
+Version: 2.1.3
 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.2 → pyptt-2.1.3}/tests/test_del_post.py

@@ -4,6 +4,7 @@ import time
 import pytest
 
 import PyPtt
+from tests import config
 
 
 def test_del_own_post(ptt_bots):
@@ -86,3 +87,64 @@ def test_del_other_post_permission_error(ptt_bots):
         # 5. Try to delete it and expect a permission error
         with pytest.raises(PyPtt.NoPermission):
             ptt_bot.del_post(board=board, index=target_index)
+
+
+def test_del_own_post_with_reason_raises(ptt_bots):
+    """Passing a reason for your own post is rejected: the annotation only
+    applies when a moderator deletes another user's post."""
+    for ptt_bot in ptt_bots:
+        post_title = f"PyPtt Reason Reject Test {int(time.time())}"
+        ptt_bot.post(board='Test', title_index=1, title=post_title,
+                     content="This is a test post for deletion.")
+        time.sleep(1)
+
+        newest_index = ptt_bot.get_newest_index(PyPtt.NewIndex.BOARD, board='Test')
+        index = -1
+        for i in range(5):
+            post_data = ptt_bot.get_post('Test', index=newest_index - i)
+            if post_data['author'].startswith(ptt_bot.ptt_id) and \
+                    post_data['title'] == f"[測試] {post_title}":
+                index = newest_index - i
+                break
+        assert index != -1
+
+        # reason on your own post must raise, and must NOT delete it
+        with pytest.raises(PyPtt.exceptions.ParameterError):
+            ptt_bot.del_post(board='Test', index=index, reason='測試理由')
+
+        # clean up: a plain delete still works
+        ptt_bot.del_post(board='Test', index=index)
+
+
+def test_del_other_post_with_reason_as_moderator(ptt_bots):
+    """Tests that a board moderator can delete another user's post and
+    annotate a reason on the resulting title."""
+    if not config.MOD_BOARD:
+        pytest.skip('MOD_BOARD env var not set')
+    for ptt_bot in ptt_bots:
+        if ptt_bot.host != PyPtt.HOST.PTT1:
+            continue  # MOD_BOARD is a PTT1 board
+
+        board = config.MOD_BOARD
+        newest_index = ptt_bot.get_newest_index(PyPtt.NewIndex.BOARD, board=board)
+
+        # Find a recent existing post on MOD_BOARD not authored by the bot.
+        target_index = -1
+        for i in range(10):
+            index_to_check = newest_index - i
+            try:
+                post = ptt_bot.get_post(board, index=index_to_check, query=True)
+                if post[PyPtt.PostField.post_status] == PyPtt.PostStatus.EXISTS and not post['author'].startswith(
+                        ptt_bot.ptt_id):
+                    target_index = index_to_check
+                    break
+            except PyPtt.NoSuchPost:
+                continue
+
+        if target_index == -1:
+            pytest.skip(f"Could not find a recent post by another user on {board} for host {ptt_bot.host}")
+
+        ptt_bot.del_post(board=board, index=target_index, reason='PyPtt 自動測試刪文理由')
+
+        deleted_post = ptt_bot.get_post(board, index=target_index, query=True)
+        assert deleted_post[PyPtt.PostField.post_status] == PyPtt.PostStatus.DELETED_BY_MODERATOR

pyptt-2.1.2/PyPtt/ssl_config.py

@@ -1,24 +0,0 @@
-key = """-----BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIFxFRO1jNtGmuhLNAdh+bbaPqEl8jXy2OnIDJ7xcYpKQoAoGCCqGSM49
-AwEHoUQDQgAEWh3ZP/+oUkac+bXn6m1DpFOQ8ZxJO6R1AurOgK8Q+Dwr0mS/0+nO
-wwE63McobMsFUiGM3t3YdzfKnlTAECNlbw==
------END EC PRIVATE KEY-----
-"""
-
-cert = """-----BEGIN CERTIFICATE-----
-MIIB6TCCAY8CFB0+cdUrN+Ovk+BQN8KWG1vDyrW5MAoGCCqGSM49BAMCMHcxCzAJ
-BgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0eTEVMBMGA1UE
-CgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25hbCBVbml0MRQw
-EgYDVQQDDAtDb21tb24gTmFtZTAeFw0yNjA1MjUxNDI4MzdaFw0zNjA1MjIxNDI4
-MzdaMHcxCzAJBgNVBAYTAlRXMQ4wDAYDVQQIDAVTdGF0ZTENMAsGA1UEBwwEQ2l0
-eTEVMBMGA1UECgwMT3JnYW5pemF0aW9uMRwwGgYDVQQLDBNPcmdhbml6YXRpb25h
-bCBVbml0MRQwEgYDVQQDDAtDb21tb24gTmFtZTBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABFod2T//qFJGnPm15+ptQ6RTkPGcSTukdQLqzoCvEPg8K9Jkv9PpzsMB
-OtzHKGzLBVIhjN7d2Hc3yp5UwBAjZW8wCgYIKoZIzj0EAwIDSAAwRQIhAMQMHvf4
-CIY36vOEAMrop9Z0RNEGTPF+EQjj95BZNsayAiBxUKgbC3Sdw34xKfUSdO/K3fP7
-ou/8qOK+MUBXLV73zw==
------END CERTIFICATE-----
-"""