✨ send file image if image is small

Author: yanyongyu

src/plugins/github/helpers/__init__.py

@@ -2,13 +2,17 @@
 @Author         : yanyongyu
 @Date           : 2022-09-07 12:17:55
 @LastEditors    : yanyongyu
-@LastEditTime   : 2023-11-13 17:35:27
+@LastEditTime   : 2024-06-02 16:49:07
 @Description    : Helpers for github plugin
 @GitHub         : https://github.com/yanyongyu
 """
 
 __author__ = "yanyongyu"
 
+from .image import qqofficial_conditional_image as qqofficial_conditional_image
+
+# isort: split
+
 from .rule import REPLY_PR as REPLY_PR
 from .rule import REPLY_ANY as REPLY_ANY
 from .rule import NO_GITHUB_EVENT as NO_GITHUB_EVENT

src/plugins/github/helpers/image.py

@@ -0,0 +1,23 @@
+"""
+@Author         : yanyongyu
+@Date           : 2024-06-02 16:44:42
+@LastEditors    : yanyongyu
+@LastEditTime   : 2024-06-02 16:48:07
+@Description    : None
+@GitHub         : https://github.com/yanyongyu
+"""
+
+__author__ = "yanyongyu"
+
+from nonebot.adapters.qq import MessageSegment as QQOfficialMS
+
+from src.providers.filehost import save_image
+
+QQOFFICIAL_IMAGE_MAX_SIZE = 2 * 1024 * 1024
+
+
+async def qqofficial_conditional_image(image: bytes) -> QQOfficialMS:
+    """Get the QQ official image message segment depends on image size"""
+    if len(image) > QQOFFICIAL_IMAGE_MAX_SIZE:
+        return QQOfficialMS.image(await save_image(image))
+    return QQOfficialMS.file_image(image)

src/plugins/github/plugins/github_issue/__init__.py

@@ -2,7 +2,7 @@
 @Author         : yanyongyu
 @Date           : 2021-03-09 15:15:02
 @LastEditors    : yanyongyu
-@LastEditTime   : 2023-12-11 12:04:57
+@LastEditTime   : 2024-06-02 16:49:23
 @Description    : None
 @GitHub         : https://github.com/yanyongyu
 """
@@ -19,8 +19,6 @@
 from nonebot.adapters.qq import MessageSegment as QQOfficialMS
 
 from src.plugins.github import config
-from src.providers.filehost import save_image
-from src.plugins.github.helpers import NO_GITHUB_EVENT, MATCH_WHEN_GROUP
 from src.plugins.github.libs.renderer import issue_to_image, pr_diff_to_image
 from src.plugins.github.cache.message_tag import (
     IssueTag,
@@ -33,6 +31,11 @@
     TargetType,
     extract_sent_message,
 )
+from src.plugins.github.helpers import (
+    NO_GITHUB_EVENT,
+    MATCH_WHEN_GROUP,
+    qqofficial_conditional_image,
+)
 from src.plugins.github.dependencies import (
     ISSUE,
     BINDED_GROUP,
@@ -114,7 +117,7 @@ async def handle_issue(
         case TargetType.QQ_USER | TargetType.QQ_GROUP:
             result = await issue.send(QQMS.image(img))
         case TargetType.QQ_OFFICIAL_USER | TargetType.QQ_OFFICIAL_GROUP:
-            result = await issue.send(QQOfficialMS.image(await save_image(img)))
+            result = await issue.send(await qqofficial_conditional_image(img))
         case TargetType.QQGUILD_USER | TargetType.QQGUILD_CHANNEL:
             result = await issue.send(QQOfficialMS.file_image(img))
 
@@ -164,7 +167,7 @@ async def handle_pr_diff(
         case TargetType.QQ_USER | TargetType.QQ_GROUP:
             result = await pr_diff_link.send(QQMS.image(img))
         case TargetType.QQ_OFFICIAL_USER | TargetType.QQ_OFFICIAL_GROUP:
-            result = await pr_diff_link.send(QQOfficialMS.image(await save_image(img)))
+            result = await pr_diff_link.send(await qqofficial_conditional_image(img))
         case TargetType.QQGUILD_USER | TargetType.QQGUILD_CHANNEL:
             result = await pr_diff_link.send(QQOfficialMS.file_image(img))
 
@@ -225,7 +228,7 @@ async def handle_short(
         case TargetType.QQ_USER | TargetType.QQ_GROUP:
             result = await issue_short.send(QQMS.image(img))
         case TargetType.QQ_OFFICIAL_USER | TargetType.QQ_OFFICIAL_GROUP:
-            result = await issue_short.send(QQOfficialMS.image(await save_image(img)))
+            result = await issue_short.send(await qqofficial_conditional_image(img))
         case TargetType.QQGUILD_USER | TargetType.QQGUILD_CHANNEL:
             result = await issue_short.send(QQOfficialMS.file_image(img))
 

src/plugins/github/plugins/github_reply/content.py

@@ -2,7 +2,7 @@
 @Author         : yanyongyu
 @Date           : 2021-03-26 14:45:05
 @LastEditors    : yanyongyu
-@LastEditTime   : 2023-12-11 18:11:00
+@LastEditTime   : 2024-06-02 16:50:38
 @Description    : None
 @GitHub         : https://github.com/yanyongyu
 """
@@ -21,10 +21,9 @@
 from nonebot.adapters.qq import MessageSegment as QQOfficialMS
 
 from src.plugins.github import config
-from src.providers.filehost import save_image
-from src.plugins.github.helpers import NO_GITHUB_EVENT
 from src.plugins.github.libs.renderer import issue_to_image
 from src.plugins.github.libs.github import ISSUE_REGEX, FULLREPO_REGEX
+from src.plugins.github.helpers import NO_GITHUB_EVENT, qqofficial_conditional_image
 from src.plugins.github.dependencies import (
     ISSUE,
     OPTIONAL_REPLY_TAG,
@@ -123,7 +122,7 @@ async def handle_content(
         case TargetType.QQ_USER | TargetType.QQ_GROUP:
             result = await content.send(QQMS.image(img))
         case TargetType.QQ_OFFICIAL_USER | TargetType.QQ_OFFICIAL_GROUP:
-            result = await content.send(QQOfficialMS.image(await save_image(img)))
+            result = await content.send(await qqofficial_conditional_image(img))
         case TargetType.QQGUILD_USER | TargetType.QQGUILD_CHANNEL:
             result = await content.send(QQOfficialMS.file_image(img))
 

src/plugins/github/plugins/github_reply/diff.py

@@ -2,7 +2,7 @@
 @Author         : yanyongyu
 @Date           : 2021-03-26 14:59:59
 @LastEditors    : yanyongyu
-@LastEditTime   : 2023-12-15 10:37:34
+@LastEditTime   : 2024-06-02 16:51:03
 @Description    : None
 @GitHub         : https://github.com/yanyongyu
 """
@@ -21,11 +21,10 @@
 from nonebot.adapters.qq import MessageSegment as QQOfficialMS
 
 from src.plugins.github import config
-from src.providers.filehost import save_image
-from src.plugins.github.helpers import NO_GITHUB_EVENT
 from src.plugins.github.libs.renderer import pr_diff_to_image
 from src.plugins.github.libs.github import ISSUE_REGEX, FULLREPO_REGEX
 from src.plugins.github.cache.message_tag import PullRequestTag, create_message_tag
+from src.plugins.github.helpers import NO_GITHUB_EVENT, qqofficial_conditional_image
 from src.plugins.github.dependencies import (
     ISSUE,
     OPTIONAL_REPLY_TAG,
@@ -115,7 +114,7 @@ async def handle_diff(
         case TargetType.QQ_USER | TargetType.QQ_GROUP:
             result = await diff.send(QQMS.image(img))
         case TargetType.QQ_OFFICIAL_USER | TargetType.QQ_OFFICIAL_GROUP:
-            result = await diff.send(QQOfficialMS.image(await save_image(img)))
+            result = await diff.send(await qqofficial_conditional_image(img))
         case TargetType.QQGUILD_USER | TargetType.QQGUILD_CHANNEL:
             result = await diff.send(QQOfficialMS.file_image(img))
 

src/plugins/github/plugins/github_reply/readme.py

@@ -2,7 +2,7 @@
 @Author         : yanyongyu
 @Date           : 2023-10-18 17:08:37
 @LastEditors    : yanyongyu
-@LastEditTime   : 2023-12-11 18:15:15
+@LastEditTime   : 2024-06-02 16:51:25
 @Description    : None
 @GitHub         : https://github.com/yanyongyu
 """
@@ -21,11 +21,10 @@
 from nonebot.adapters.github import ActionFailed, ActionTimeout
 
 from src.plugins.github import config
-from src.providers.filehost import save_image
-from src.plugins.github.helpers import NO_GITHUB_EVENT
 from src.plugins.github.libs.github import FULLREPO_REGEX
 from src.plugins.github.libs.renderer import readme_to_image
 from src.plugins.github.cache.message_tag import RepoTag, create_message_tag
+from src.plugins.github.helpers import NO_GITHUB_EVENT, qqofficial_conditional_image
 from src.plugins.github.dependencies import (
     REPOSITORY,
     OPTIONAL_REPLY_TAG,
@@ -135,7 +134,7 @@ async def render_content(
         case TargetType.QQ_USER | TargetType.QQ_GROUP:
             result = await readme.send(QQMS.image(img))
         case TargetType.QQ_OFFICIAL_USER | TargetType.QQ_OFFICIAL_GROUP:
-            result = await readme.send(QQOfficialMS.image(await save_image(img)))
+            result = await readme.send(await qqofficial_conditional_image(img))
         case TargetType.QQGUILD_USER | TargetType.QQGUILD_CHANNEL:
             result = await readme.send(QQOfficialMS.file_image(img))
 

src/plugins/github/webhooks/_dependencies.py

@@ -2,7 +2,7 @@
 @Author         : yanyongyu
 @Date           : 2022-11-07 08:35:10
 @LastEditors    : yanyongyu
-@LastEditTime   : 2023-12-06 17:07:07
+@LastEditTime   : 2024-06-02 16:52:21
 @Description    : Webhook dependencies
 @GitHub         : https://github.com/yanyongyu
 """
@@ -21,12 +21,11 @@
 from nonebot.adapters.github.utils import get_attr_or_item
 from nonebot.adapters.onebot.v11 import Message as QQMessage
 from nonebot.adapters.onebot.v11 import MessageSegment as QQMS
-from nonebot.adapters.qq import MessageSegment as QQOfficialMS
 from nonebot.adapters.qq.exception import ActionFailed as QQOfficialActionFailed
 
 from src.providers.redis import redis_client
-from src.providers.filehost import save_image
 from src.plugins.github.models import Subscription
+from src.plugins.github.helpers import qqofficial_conditional_image
 from src.plugins.github.cache.message_tag import Tag, create_message_tag
 from src.providers.platform import TargetInfo, get_target_bot, extract_sent_message
 from src.providers.platform.targets import (
@@ -133,12 +132,12 @@ async def send_subscriber_image(
             case QQOfficialUserInfo():
                 result = await cast(QQOfficialBot, bot).send_to_c2c(
                     openid=target_info.qq_user_open_id,
-                    message=QQOfficialMS.image(await save_image(image)),
+                    message=await qqofficial_conditional_image(image),
                 )
             case QQOfficialGroupInfo():
                 result = await cast(QQOfficialBot, bot).send_to_group(
                     group_openid=target_info.qq_group_open_id,
-                    message=QQOfficialMS.image(await save_image(image)),
+                    message=await qqofficial_conditional_image(image),
                 )
             case QQGuildUserInfo():
                 logger.error("Unable to send message to QQGuild User", user=target_info)