Commit 2c9c0d5

@@ -69,7 +69,7 @@ async def download_url_in_message(client: Client, message: Message, extra_prefix
         if path.suffix != suffix:
             path.rename(path.with_suffix(suffix))
             path = path.with_suffix(suffix)
-        if img := validate_img(path, force_jpg=False, delete=False):
+        if img := validate_img(path, delete=False):
             await modify_progress(text=f"🏞图片下载成功: {readable_size(path=img)}", force_update=True, **kwargs)
             success = await send2tg(client, message, target_chat, reply_msg_id, texts=caption, media=[{"photo": img}])
         elif path.suffix in AUDIO_FORMAT:

@@ -346,14 +346,11 @@ def convert_jpg_via_ffmpeg(path: str | Path | None, *, delete: bool = True) -> t
     return True, save_path
 
 
-def convert_img_to_telegram_format(path: str | Path | None, *, force_jpg: bool = True, delete: bool = True) -> Path:
+def convert_img_to_telegram_format(path: str | Path | None, *, delete: bool = True) -> Path:
     if path is None or not Path(path).expanduser().resolve().is_file():
         return Path("")
     path = Path(path).expanduser().resolve()
-    if path.suffix.lower() in [".jpg", ".jpeg"]:
-        return path
-
-    if force_jpg is False and path.suffix.lower() in [".png", ".bmp", ".gif"]:
+    if path.suffix.lower() in [".jpg", ".jpeg", ".png", ".bmp", ".gif"]:
         return path
 
     success, out_path = convert_jpg_via_pillow(path, delete=delete)
@@ -413,7 +410,7 @@ def convert_img_match_telegram_rules(path: str | Path, num_bytes: int = 10485760
     return convert_img_match_telegram_rules(save_path, num_bytes, wh_total, max_ratio, delete=delete)
 
 
-def validate_img(path: str | Path | None, *, force_jpg: bool = True, delete: bool = True) -> str:
+def validate_img(path: str | Path | None, *, delete: bool = True) -> str:
     """Check if the image is valid.
 
     0. format must be in ["heic", "jpg", "jpeg", "png", "webp"]
@@ -431,7 +428,7 @@ def validate_img(path: str | Path | None, *, force_jpg: bool = True, delete: boo
     if path.suffix.lower() not in [".heic", ".jpg", ".jpeg", ".png", ".webp", ".bmp", ".gif"]:
         logger.warning(f"Invalid image format: {path.name}")
         return ""
-    path = convert_img_to_telegram_format(path, force_jpg=force_jpg, delete=delete)
+    path = convert_img_to_telegram_format(path, delete=delete)
 
     if not path.is_file():
         logger.warning(f"Invalid image: {path}")