sync: 上传 240 个文件，删除 2 个文件

.gitattributes

@@ -1178,3 +1178,7 @@ meme_generator/memes_emoji/kurogames_suoming_say/images/0.png filter=lfs diff=lf
 meme_generator/memes_emoji/kurogames_xuanling_say/images/0.png filter=lfs diff=lfs merge=lfs -text
 meme_generator/memes_emoji/nailoong_snuggle/images/20.png filter=lfs diff=lfs merge=lfs -text
 meme_generator/memes_emoji/nailoong_snuggle/images/74.png filter=lfs diff=lfs merge=lfs -text
+meme_generator/memes_emoji/ai_ace/images/0.png filter=lfs diff=lfs merge=lfs -text
+meme_generator/memes_emoji/heart_shape/images/0.png filter=lfs diff=lfs merge=lfs -text
+meme_generator/memes_emoji/prosperitywish/images/0.png filter=lfs diff=lfs merge=lfs -text
+meme_generator/memes_tudou/nawabao/images/0.png filter=lfs diff=lfs merge=lfs -text

meme_generator/memes_emoji/ai_ace/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def ai_ace(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -18,10 +18,10 @@ def ai_ace(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     text = f"不用了\n我{name}是AI高手\n正在用AI写代码中ing"
     try:
         frame.draw_text(
-            (35, 19, 594, 406),
+            (115, 83, 1104, 744),
             text,
             fill=(58, 58, 58),
-            max_fontsize=100,
+            max_fontsize=200,
             min_fontsize=20,
             lines_align="left",
             font_families=["FZShaoEr-M11S"],
@@ -29,9 +29,9 @@ def ai_ace(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     except ValueError:
         raise TextOverLength(name)
     def make(imgs: list[BuildImage]) -> BuildImage:
-        img = imgs[0].convert("RGBA").resize((340, 340))
-        return frame.copy().paste(img, (600, 77), alpha=True, below=True)
-    return make_jpg_or_gif(images, make)
+        img = imgs[0].convert("RGBA").resize((650, 650))
+        return frame.copy().paste(img, (1142, 151), alpha=True, below=True)
+    return make_png_or_gif(images, make)
 add_meme(
     "ai_ace",
     ai_ace,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["AI高手","ai高手"],
     date_created=datetime(2025, 7, 11),
-    date_modified=datetime(2025, 7, 11),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/allegiance/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def allegiance(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def allegiance(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((436, 400))
         return frame.copy().paste(img, (279, 159), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "allegiance",
     allegiance,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["충성","忠橙","敬礼"],
     date_created=datetime(2025, 8, 16),
-    date_modified=datetime(2025, 8, 16),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/anyliew_struggling/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def anyliew_struggling(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -11,7 +10,7 @@ def anyliew_struggling(images: list[BuildImage], texts: list[str], args: MemeArg
         img = imgs[0].convert("RGBA").circle().resize((300, 300))
         img = img.rotate(25, expand=True)
         return frame.copy().paste(img, (275, 28), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "anyliew_struggling",
     anyliew_struggling,
@@ -21,5 +20,5 @@ add_meme(
     max_texts=0,
     keywords=["挣扎"],
     date_created=datetime(2025, 5, 26),
-    date_modified=datetime(2025, 5, 26),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/atri_like/__init__.py

@@ -4,7 +4,7 @@ from pil_utils import BuildImage
 from meme_generator import add_meme
 from meme_generator.exception import TextOverLength
 from meme_generator.tags import MemeTags
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 default_text = "亚托莉喜欢这个"
 def atri_like(images: list[BuildImage], texts: list[str], args):
@@ -24,7 +24,7 @@ def atri_like(images: list[BuildImage], texts: list[str], args):
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((305, 235), keep_ratio=True)
         return frame.copy().paste(img, (106, 72), below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "atri_like",
     atri_like,
@@ -36,5 +36,5 @@ add_meme(
     keywords=["亚托莉喜欢"],
     tags=MemeTags.atri,
     date_created=datetime(2025, 5, 25),
-    date_modified=datetime(2025, 5, 25),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/baby/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def baby (images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -11,7 +10,7 @@ def baby (images: list[BuildImage], texts: list[str], args: MemeArgsModel):
         img = imgs[0].convert("RGBA").resize((235, 235))
         img = img.rotate(-8, expand=True)
         return frame.copy().paste(img, (140, 480), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "baby",
     baby,
@@ -21,5 +20,5 @@ add_meme(
     max_texts=0,
     keywords=["宝宝","BB","bb","baby","Baby"],
     date_created=datetime(2025, 6, 11),
-    date_modified=datetime(2025, 6, 11),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/begged_me/__init__.py

@@ -2,42 +2,28 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
+
 img_dir = Path(__file__).parent / "images"
+
 def begged_me(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
-    ta = "她"
-    name = ta
-    if texts:
-        name = texts[0]
-    elif args.user_infos:
-        info = args.user_infos[0]
-        ta = "他" if info.gender == "male" else "她"
-        name = info.name or ta
-    text = f""
-    try:
-        frame.draw_text(
-            (235, 615, 478, 659),
-            text,
-            max_fontsize=100,
-            min_fontsize=20,
-            valign="bottom",
-        )
-    except ValueError:
-        raise TextOverLength(name)
+
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").circle().resize((1720, 1720))
         img = img.rotate(-15, expand=True)
-        return frame.copy().paste(img, (125, 655), alpha=True, below=True )
-    return make_jpg_or_gif(images, make)
+        return frame.copy().paste(img, (125, 655), alpha=True, below=True)
+
+    return make_png_or_gif(images, make)
+
 add_meme(
     "begged_me",
     begged_me,
     min_images=1,
     max_images=1,
-    max_texts=1,
+    min_texts=0,
+    max_texts=0,
     keywords=["求我"],
     date_created=datetime(2025, 3, 10),
-    date_modified=datetime(2025, 3, 10),
-)
+    date_modified=datetime(2026, 10, 12),
+)

meme_generator/memes_emoji/beloveds/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def beloveds(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def beloveds(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((330, 330))
         return frame.copy().paste(img, (330, 140), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "beloveds",
     beloveds,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["挚爱"],
     date_created=datetime(2025, 5, 26),
-    date_modified=datetime(2025, 10, 4),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/catch/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def catch (images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -20,5 +19,5 @@ add_meme(
     max_texts=0,
     keywords=["抓住"],
     date_created=datetime(2026, 4, 17),
-    date_modified=datetime(2026, 4, 17),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/chillet_deer/__init__.py

@@ -2,23 +2,22 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def chillet_deer(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((549, 463))
         return frame.copy().paste(img, (202, 289), alpha=True, below=True )
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "chillet_deer",
     chillet_deer,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["疾风鹿"],
     date_created=datetime(2025, 8, 14),
-    date_modified=datetime(2025, 8, 14),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/christmas_hat/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def christmas_hat(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -20,5 +19,5 @@ add_meme(
     max_texts=0,
     keywords=["圣诞帽子","圣诞帽"],
     date_created=datetime(2025, 12, 6),
-    date_modified=datetime(2025, 12, 6),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/cleverer/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
@@ -59,5 +58,5 @@ add_meme(
     max_texts=1,
     keywords=["比聪明"],
     date_created=datetime(2025, 11, 21),
-    date_modified=datetime(2025, 11, 21),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/commemorate/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def commemorate(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -11,15 +10,15 @@ def commemorate(images: list[BuildImage], texts: list[str], args: MemeArgsModel)
         img = imgs[0].convert("RGBA").resize((815, 747), keep_ratio=True)
         img = img.convert("L").convert("RGBA")  
         return frame.copy().paste(img, (129, 218), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "commemorate",
     commemorate,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["奠","寄"],
     date_created=datetime(2026, 1, 12),
-    date_modified=datetime(2026, 1, 12),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/dalia_everyone/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def dalia_everyone(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def dalia_everyone(images: list[BuildImage], texts: list[str], args: MemeArgsMod
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((95, 95)).circle().rotate(-5, expand=True)
         return frame.copy().paste(img, (611, 387), alpha=True, below=True) 
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "dalia_everyone",
     dalia_everyone,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["所有人"],
     date_created=datetime(2025, 12, 1),
-    date_modified=datetime(2025, 12, 2),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/deer_time/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
@@ -21,5 +20,5 @@ add_meme(
     max_texts=0,
     keywords=["鹿管时间"],
     date_created=datetime(2025, 7, 2),
-    date_modified=datetime(2025, 9, 13),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/dinosaur_head/__init__.py

@@ -2,42 +2,27 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
+
 img_dir = Path(__file__).parent / "images"
+
 def dinosaur_head(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
-    ta = "她"
-    name = ta
-    if texts:
-        name = texts[0]
-    elif args.user_infos:
-        info = args.user_infos[0]
-        ta = "他" if info.gender == "male" else "她"
-        name = info.name or ta
-    text = f""
-    try:
-        frame.draw_text(
-            (27, 73, 374, 136),
-            text,
-            max_fontsize=100,
-            min_fontsize=20,
-            valign="bottom",
-        )
-    except ValueError:
-        raise TextOverLength(name)
+
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((620, 620))
         return frame.copy().paste(img, (215, 245), alpha=True, below=True)
-    return make_jpg_or_gif(images, make)
+
+    return make_png_or_gif(images, make)
+
 add_meme(
     "dinosaur_head",
     dinosaur_head,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["恐龙头"],
     date_created=datetime(2024, 7, 26),
-    date_modified=datetime(2024, 7, 26),
-)
+    date_modified=datetime(2026, 10, 12),
+)

meme_generator/memes_emoji/doro_contact/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def doro_contact(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def doro_contact(images: list[BuildImage], texts: list[str], args: MemeArgsModel
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((108, 108))
         return frame.copy().paste(img, (145, 278), alpha=True, below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "doro_contact",
     doro_contact,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["交往","doro交往","Doro交往","DORO交往","桃乐丝交往"],
     date_created=datetime(2025, 7, 7),
-    date_modified=datetime(2025, 7, 7),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/doro_dear/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def doro_dear(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def doro_dear(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((100, 100))
         return frame.copy().paste(img, (576, 529), alpha=True, below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "doro_dear",
     doro_dear,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["最爱","doro最爱","Doro最爱","DORO最爱","桃乐丝最爱"],
     date_created=datetime(2025, 7, 7),
-    date_modified=datetime(2025, 7, 7),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/doro_group_photo/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def doro_group_photo(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -20,5 +19,5 @@ add_meme(
     max_texts=0,
     keywords=["doro合影","Doro合影","桃乐丝合影"],
     date_created=datetime(2026, 2, 16),
-    date_modified=datetime(2026, 2, 16),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/doro_orange/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def doro_orange(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def doro_orange(images: list[BuildImage], texts: list[str], args: MemeArgsModel)
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((270, 270))
         return frame.copy().paste(img, (588, 65), alpha=True, below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "doro_orange",
     doro_orange,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["欧润吉","润吉","润橘","橘子","橘","🍊"],
     date_created=datetime(2025, 7, 7),
-    date_modified=datetime(2025, 7, 7),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/doro_surrounding_photos/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def doro_surrounding_photos(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -39,7 +39,7 @@ def doro_surrounding_photos(images: list[BuildImage], texts: list[str], args: Me
         img3 = img.resize((100, 100)).rotate(-15, expand=True)
         result_frame.paste(img3, (815, 1296), alpha=True, below=True)
         return result_frame
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "doro_surrounding_photos",
     doro_surrounding_photos,
@@ -49,5 +49,5 @@ add_meme(
     max_texts=1,
     keywords=["周边写真"],
     date_created=datetime(2025, 9, 13),
-    date_modified=datetime(2025, 9, 13),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/doro_work_for_you/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def doro_work_for_you(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -39,7 +39,7 @@ def doro_work_for_you(images: list[BuildImage], texts: list[str], args: MemeArgs
         img3 = img.resize((35, 35)).rotate(35, expand=True)
         result_frame.paste(img3, (60, 450), alpha=True, below=True)
         return result_frame
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "doro_work_for_you",
     doro_work_for_you,
@@ -49,5 +49,5 @@ add_meme(
     max_texts=1,
     keywords=["为你打工"],
     date_created=datetime(2025, 9, 2),
-    date_modified=datetime(2025, 9, 2),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/drumstick/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
@@ -23,5 +22,5 @@ add_meme(
     keywords=["🍗","鸡腿"],
     tags=MemeTags.genshin,
     date_created=datetime(2025, 7, 1),
-    date_modified=datetime(2025, 7, 1),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/durian/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def durian(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -18,8 +17,8 @@ add_meme(
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["榴莲"],
     date_created=datetime(2025, 5, 29),
-    date_modified=datetime(2025, 5, 29),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/error3b/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def error3b(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -22,5 +21,5 @@ add_meme(
     max_texts=0,
     keywords=["30亿error", "三十亿报错"],
     date_created=datetime(2026, 4, 17),
-    date_modified=datetime(2026, 4, 17),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/family_know/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def family_know(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def family_know(images: list[BuildImage], texts: list[str], args: MemeArgsModel)
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").circle().resize((205, 205))
         return frame.copy().paste(img, (199, 937), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "family_know",
     family_know,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["家人们谁懂啊"],
     date_created=datetime(2025, 9, 9),
-    date_modified=datetime(2025, 9, 9),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/fireworks_head/__init__.py

@@ -2,42 +2,27 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
+
 img_dir = Path(__file__).parent / "images"
+
 def fireworks_head(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
-    ta = "她"
-    name = ta
-    if texts:
-        name = texts[0]
-    elif args.user_infos:
-        info = args.user_infos[0]
-        ta = "他" if info.gender == "male" else "她"
-        name = info.name or ta
-    text = f""
-    try:
-        frame.draw_text(
-            (235, 615, 478, 659),
-            text,
-            max_fontsize=100,
-            min_fontsize=20,
-            valign="bottom",
-        )
-    except ValueError:
-        raise TextOverLength(name)
+
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").circle().resize((320, 320))
-        return frame.copy().paste(img, (340, 165), alpha=True, below=True )
-    return make_jpg_or_gif(images, make)
+        return frame.copy().paste(img, (340, 165), alpha=True, below=True)
+
+    return make_png_or_gif(images, make)
+
 add_meme(
     "fireworks_head",
     fireworks_head,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["烟花头像"],
     date_created=datetime(2025, 1, 28),
-    date_modified=datetime(2025, 1, 28),
-)
+    date_modified=datetime(2026, 10, 12),
+)

meme_generator/memes_emoji/heart_shape/__init__.py

@@ -0,0 +1,64 @@
+from datetime import datetime
+from pathlib import Path
+
+from pil_utils import BuildImage
+
+from meme_generator import MemeArgsModel, add_meme
+from meme_generator.utils import make_png_or_gif
+
+img_dir = Path(__file__).parent / "images"
+
+AVATAR_SLOTS: list[tuple[int, int, int, int]] = [
+    (77, 710, 220, 220),      # 1
+    (77, 968, 220, 220),      # 2
+    (322, 429, 246, 246),     # 3
+    (599, 429, 246, 246),     # 4
+    (350, 710, 485, 485),     # 5
+    (350, 1255, 215, 215),    # 6
+    (620, 1255, 495, 495),    # 7
+    (891, 710, 220, 220),     # 8
+    (891, 968, 220, 220),     # 9
+    (891, 1793, 220, 220),    # 10
+    (1163, 429, 500, 500),    # 11
+    (1163, 968, 500, 500),    # 12
+    (1163, 1508, 247, 247),   # 13
+    (1709, 688, 244, 244),    # 14
+    (1709, 974, 244, 244),    # 15
+]
+
+
+def heart_shape(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
+    frame = BuildImage.open(img_dir / "0.png")
+
+    def make(imgs: list[BuildImage]) -> BuildImage:
+        result = frame.copy()
+        for i, (x, y, w, h) in enumerate(AVATAR_SLOTS):
+            img = imgs[i % len(imgs)].convert("RGBA").square().resize((w, h))
+            result.paste(img, (x, y), alpha=True)
+        if texts:
+            result.draw_text(
+                (180, 93, 1868, 295),
+                texts[0],
+                fill=(255, 255, 255),
+                allow_wrap=True,
+                max_fontsize=300,
+                min_fontsize=15,
+                lines_align="center",
+                font_families=["FZKaTong-M19S"],
+            )
+        return result
+
+    return make_png_or_gif(images, make)
+
+
+add_meme(
+    "heart_shape",
+    heart_shape,
+    min_images=1,
+    max_images=15,
+    min_texts=0,
+    max_texts=1,
+    keywords=["爱心形状"],
+    date_created=datetime(2026, 10, 12),
+    date_modified=datetime(2026, 10, 12),
+)

meme_generator/memes_emoji/ice_tea_head/__init__.py

@@ -2,42 +2,27 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
+
 img_dir = Path(__file__).parent / "images"
+
 def ice_tea_head(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
-    ta = "她"
-    name = ta
-    if texts:
-        name = texts[0]
-    elif args.user_infos:
-        info = args.user_infos[0]
-        ta = "他" if info.gender == "male" else "她"
-        name = info.name or ta
-    text = f""
-    try:
-        frame.draw_text(
-            (235, 615, 478, 659),
-            text,
-            max_fontsize=100,
-            min_fontsize=20,
-            valign="bottom",
-        )
-    except ValueError:
-        raise TextOverLength(name)
+
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").circle().resize((500, 500))
-        return frame.copy().paste(img, (320,35), alpha=True)
-    return make_jpg_or_gif(images, make)
+        return frame.copy().paste(img, (320, 35), alpha=True)
+
+    return make_png_or_gif(images, make)
+
 add_meme(
     "ice_tea_head",
     ice_tea_head,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["冰红茶"],
     date_created=datetime(2025, 3, 25),
-    date_modified=datetime(2025, 3, 25),
-)
+    date_modified=datetime(2026, 10, 12),
+)

meme_generator/memes_emoji/ikun_basketball/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def ikun_basketball(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -11,7 +10,7 @@ def ikun_basketball(images: list[BuildImage], texts: list[str], args: MemeArgsMo
         img = imgs[0].convert("RGBA").circle().resize((250, 250))
         img = img.rotate(10, expand=True)
         return frame.copy().paste(img, (322, 129), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "ikun_basketball",
     ikun_basketball,
@@ -19,5 +18,5 @@ add_meme(
     max_images=1,
     keywords=["篮球","🏀"],
     date_created=datetime(2025, 5, 29),
-    date_modified=datetime(2025, 5, 29),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/ikun_durian_head/__init__.py

@@ -2,42 +2,22 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def ikun_durian_head(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
-    ta = "她"
-    name = ta
-    if texts:
-        name = texts[0]
-    elif args.user_infos:
-        info = args.user_infos[0]
-        ta = "他" if info.gender == "male" else "她"
-        name = info.name or ta
-    text = f""
-    try:
-        frame.draw_text(
-            (235, 615, 478, 659),
-            text,
-            max_fontsize=100,
-            min_fontsize=20,
-            valign="bottom",
-        )
-    except ValueError:
-        raise TextOverLength(name)
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((180, 180))
         return frame.copy().paste(img, (62, 93), alpha=True, below=True )
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "ikun_durian_head",
     ikun_durian_head,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["榴莲坤头"],
     date_created=datetime(2025, 3, 29),
-    date_modified=datetime(2025, 3, 29),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/ikun_head/__init__.py

@@ -2,42 +2,22 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def ikun_head(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
-    ta = "她"
-    name = ta
-    if texts:
-        name = texts[0]
-    elif args.user_infos:
-        info = args.user_infos[0]
-        ta = "他" if info.gender == "male" else "她"
-        name = info.name or ta
-    text = f""
-    try:
-        frame.draw_text(
-            (235, 615, 478, 659),
-            text,
-            max_fontsize=100,
-            min_fontsize=20,
-            valign="bottom",
-        )
-    except ValueError:
-        raise TextOverLength(name)
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").circle().resize((220, 220))
         return frame.copy().paste(img, (73, 75), alpha=True, below=True )
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "ikun_head",
     ikun_head,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["小黑子"],
     date_created=datetime(2025, 3, 25),
-    date_modified=datetime(2025, 3, 25),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/ikun_like/__init__.py

@@ -4,7 +4,7 @@ from pil_utils import BuildImage
 from meme_generator import add_meme
 from meme_generator.exception import TextOverLength
 from meme_generator.tags import MemeTags
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 default_text = "坤坤喜欢这个"
 def ikun_like(images: list[BuildImage], texts: list[str], args):
@@ -24,7 +24,7 @@ def ikun_like(images: list[BuildImage], texts: list[str], args):
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((305, 235), keep_ratio=True)
         return frame.copy().paste(img, (106, 72), below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "ikun_like",
     ikun_like,
@@ -36,5 +36,5 @@ add_meme(
     keywords=["坤坤喜欢"],
     tags=["ikun","坤坤","真爱粉","喜欢"],
     date_created=datetime(2025, 5, 25),
-    date_modified=datetime(2025, 5, 25),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/ikun_need_tv/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def ikun_need_tv(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -31,7 +31,7 @@ def ikun_need_tv(images: list[BuildImage], texts: list[str], args: MemeArgsModel
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((518, 488))
         return frame.copy().paste(img, (614, 118), alpha=True, below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "ikun_need_tv",
     ikun_need_tv,
@@ -41,5 +41,5 @@ add_meme(
     max_texts=1,
     keywords=["坤坤想要"],
     date_created=datetime(2025, 9, 4),
-    date_modified=datetime(2025, 9, 4),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/ikun_why_are_you/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_jpg_or_gif
 img_dir = Path(__file__).parent / "images"
 def ikun_why_are_you(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -18,8 +17,8 @@ add_meme(
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["你干嘛","你干吗"],
     date_created=datetime(2024, 7, 26),
-    date_modified=datetime(2024, 7, 26),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/izumi_sagiri_painting/__init__.py

@@ -2,15 +2,14 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def izumi_sagiri_painting (images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((1270, 730)).rotate(-10, expand=True)
         return frame.copy().paste(img, (350, 1423), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "izumi_sagiri_painting",
     izumi_sagiri_painting ,
@@ -20,5 +19,5 @@ add_meme(
     max_texts=0,
     keywords=["和泉纱雾画画"],
     date_created=datetime(2025, 9, 21),
-    date_modified=datetime(2025, 9, 21),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/jd_delivery_person/__init__.py

@@ -4,7 +4,7 @@ from pil_utils import BuildImage
 from PIL import ImageEnhance
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def jd_delivery_person(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -39,7 +39,7 @@ def jd_delivery_person(images: list[BuildImage], texts: list[str], args: MemeArg
         img = BuildImage(img_darkened)
         img = img.rotate(-20, expand=True)
         return frame.copy().paste(img, (420, 1000), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "jd_delivery_person",
     jd_delivery_person,
@@ -49,5 +49,5 @@ add_meme(
     max_texts=1,
     keywords=["京东外卖骑手","京东外卖工牌"],
     date_created=datetime(2025, 3, 24),
-    date_modified=datetime(2025, 9, 25),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/jd_takeout/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def jd_takeout(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
     frame = BuildImage.open(img_dir / "0.png")
@@ -11,7 +10,7 @@ def jd_takeout(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
         img = imgs[0].convert("RGBA").circle().resize((230, 230))
         img = img.rotate(10, expand=True)
         return frame.copy().paste(img, (625, 5), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "jd_takeout",
     jd_takeout,
@@ -19,5 +18,5 @@ add_meme(
     max_images=1,
     keywords=["京东外卖"],
     date_created=datetime(2025, 5, 29),
-    date_modified=datetime(2025, 5, 29),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kfc/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 img_dir = Path(__file__).parent / "images"
 def kfc(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -21,5 +20,5 @@ add_meme(
     max_texts=0,
     keywords=["kfc","KFC","肯德基"],
     date_created=datetime(2025, 5, 29),
-    date_modified=datetime(2025, 5, 29),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kfc_thursday/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_jpg_or_gif
 img_dir = Path(__file__).parent / "images"
 def kfc_thursday(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -18,5 +17,5 @@ add_meme(
     max_images=1,
     keywords=["星期四","疯狂星期四"],
     date_created=datetime(2025, 5, 29),
-    date_modified=datetime(2025, 5, 29),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_aemeath/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
@@ -18,9 +17,9 @@ add_meme(
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["爱弥斯"],
     tags=MemeTags.wuthering_waves,
     date_created=datetime(2026, 2, 7),
-    date_modified=datetime(2026, 2, 7),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_aemeath_holding/__init__.py

@@ -4,6 +4,7 @@ from PIL.Image import Image as IMG
 from pil_utils import BuildImage
 from meme_generator import add_meme
 from meme_generator.utils import save_gif
+from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
 def kurogames_aemeath_holding(images: list[BuildImage], texts, args):
     img = images[0].convert("RGBA")
@@ -22,6 +23,7 @@ add_meme(
     min_images=1,
     max_images=1,
     keywords=["爱弥斯捧"],
+    tags=MemeTags.wuthering_waves,
     date_created=datetime(2026, 2, 24),
-    date_modified=datetime(2026, 2, 24),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_brqd/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
@@ -22,5 +21,5 @@ add_meme(
     keywords=["百日签到"],
     tags=MemeTags.wuthering_waves,
     date_created=datetime(2026, 2, 16),
-    date_modified=datetime(2026, 2, 16),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_camellya_photo/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
 def kurogames_camellya_photo(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -12,7 +11,7 @@ def kurogames_camellya_photo(images: list[BuildImage], texts: list[str], args: M
         img = imgs[0].convert("RGBA").resize((345, 310))
         img = img.rotate(-5, expand=True)
         return frame.copy().paste(img, (170, 500), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "kurogames_camellya_photo",
     kurogames_camellya_photo,
@@ -23,5 +22,5 @@ add_meme(
     keywords=["大傻椿照片","傻椿照片"],
     tags=MemeTags.wuthering_waves,
     date_created=datetime(2025, 7, 4),
-    date_modified=datetime(2025, 7, 4),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_camellya_red_hug/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
 def kurogames_camellya_red_hug(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -11,16 +10,16 @@ def kurogames_camellya_red_hug(images: list[BuildImage], texts: list[str], args:
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((428, 428))
         return frame.copy().paste(img, (399, 0), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "kurogames_camellya_red_hug",
     kurogames_camellya_red_hug,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["红椿抱"],
     tags=MemeTags.wuthering_waves,
     date_created=datetime(2025, 12, 19),
-    date_modified=datetime(2025, 12, 19),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_carlotta_play/__init__.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
 from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
 def kurogames_carlotta_play(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -32,7 +32,7 @@ def kurogames_carlotta_play(images: list[BuildImage], texts: list[str], args: Me
     def make(imgs: list[BuildImage]) -> BuildImage:
         img = imgs[0].convert("RGBA").resize((290, 340)).rotate(-60, expand=True)
         return frame.copy().paste(img, (1090, 920), alpha=True,below=True)
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "kurogames_carlotta_play",
     kurogames_carlotta_play,
@@ -43,5 +43,5 @@ add_meme(
     keywords=["一边玩去吧","一边玩去"],
     tags=MemeTags.wuthering_waves,
     date_created=datetime(2025, 10, 11),
-    date_modified=datetime(2025, 10, 11),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_cartethyia/__init__.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
 from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
@@ -22,5 +21,5 @@ add_meme(
     keywords=["卡提希娅","卡提"],
     tags=MemeTags.wuthering_waves,
     date_created=datetime(2026, 2, 16),
-    date_modified=datetime(2026, 2, 16),
+    date_modified=datetime(2026, 10, 12),
 )

meme_generator/memes_emoji/kurogames_cartethyia_feetup/__init__.py

@@ -2,8 +2,7 @@ from datetime import datetime
 from pathlib import Path
 from pil_utils import BuildImage
 from meme_generator import MemeArgsModel, add_meme
-from meme_generator.exception import TextOverLength
-from meme_generator.utils import make_jpg_or_gif
+from meme_generator.utils import make_png_or_gif
 from meme_generator.tags import MemeTags
 img_dir = Path(__file__).parent / "images"
 def kurogames_cartethyia_feetup(images: list[BuildImage], texts: list[str], args: MemeArgsModel):
@@ -12,16 +11,16 @@ def kurogames_cartethyia_feetup(images: list[BuildImage], texts: list[str], args
         img = imgs[0].convert("RGBA").resize((120, 120))
         img = img.rotate(15, expand=True)
         return frame.copy().paste(img, (395, 130), alpha=True, below=True ) 
-    return make_jpg_or_gif(images, make)
+    return make_png_or_gif(images, make)
 add_meme(
     "kurogames_cartethyia_feetup",
     kurogames_cartethyia_feetup,
     min_images=1,
     max_images=1,
     min_texts=0,
-    max_texts=1,
+    max_texts=0,
     keywords=["卡提希娅抬脚","卡提抬脚"],
     tags=MemeTags.wuthering_waves,
     date_created=datetime(2025, 8, 12),
-    date_modified=datetime(2025, 8, 12),
+    date_modified=datetime(2026, 10, 12),
 )