✨ weibo dynamic push use forward-node

app/database/model.py

@@ -1,3 +1,5 @@
+from dataclasses import dataclass
+
 from sqlalchemy import MetaData
 from sqlalchemy.ext.asyncio import AsyncAttrs
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
@@ -17,6 +19,7 @@ class Base(AsyncAttrs, DeclarativeBase):
     metadata = MetaData(naming_convention=_NAMING_CONVENTION)
 
 
+@dataclass
 class User(Base):
     __tablename__ = "user"
 
@@ -30,6 +33,7 @@ class User(Base):
     """用户信任度"""
 
 
+@dataclass
 class Group(Base):
     __tablename__ = "group"
 

app/statistic.py

@@ -16,6 +16,7 @@ class Statistic:
     time: datetime = field(default_factory=datetime.now)
 
 
+@dataclass
 class StatisticTable(Base):
     __tablename__ = "statistic"
 

config/plugins/weibo.yml

@@ -0,0 +1,2 @@
+## 动态推送是否使用合并转发
+dynamic_forward: false

plugins/admin/model.py

@@ -1,9 +1,12 @@
+from dataclasses import dataclass
+
 from sqlalchemy import Boolean, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.database import Base
 
 
+@dataclass
 class BlacklistCache(Base):
     __tablename__ = "blacklist"
 

plugins/coc/model.py

@@ -1,9 +1,12 @@
+from dataclasses import dataclass
+
 from sqlalchemy import ForeignKey, Integer
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.database import Base, Group
 
 
+@dataclass
 class CocRule(Base):
     __tablename__ = "coc"
 

plugins/draw/model.py

@@ -1,9 +1,12 @@
+from dataclasses import dataclass
+
 from sqlalchemy import DateTime, ForeignKey, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.database import Base, User
 
 
+@dataclass
 class DrawRecord(Base):
     __tablename__ = "draw"
 

plugins/gacha/model.py

@@ -1,9 +1,12 @@
+from dataclasses import dataclass
+
 from sqlalchemy import ForeignKey, Integer
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.database import Base, User
 
 
+@dataclass
 class ArkgachaRecord(Base):
     __tablename__ = "arkgacha"
 

plugins/learn_repeat/model.py

@@ -1,9 +1,12 @@
+from dataclasses import dataclass
+
 from sqlalchemy import JSON, ForeignKey, Integer, String
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.database import Base, Group
 
 
+@dataclass
 class Learn(Base):
     __tablename__ = "learn_repeat"
 

plugins/sign/model.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from datetime import datetime
 
 from sqlalchemy import DateTime, ForeignKey, Integer
@@ -6,6 +7,7 @@
 from app.database import Base, User
 
 
+@dataclass
 class SignRecord(Base):
     __tablename__ = "sign"
 

plugins/sk_autosign/model.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from datetime import datetime
 
 from sqlalchemy import JSON, DateTime, ForeignKey, String
@@ -6,6 +7,7 @@
 from app.database import Base, User
 
 
+@dataclass
 class SKAutoSignRecord(Base):
     __tablename__ = "sk_autosign"
 
@@ -16,6 +18,7 @@ class SKAutoSignRecord(Base):
     """森空岛token"""
 
 
+@dataclass
 class SKAutoSignResultRecord(Base):
     __tablename__ = "sk_autosign_result"
 

plugins/weibo/config.py

@@ -0,0 +1,9 @@
+from app.config import BasePluginConfig
+
+
+class Config(BasePluginConfig, domain="global"):
+    dynamic_forward: bool = False
+    """动态推送是否使用合并转发"""
+
+
+WeiboConfig = Config

plugins/weibo/main.py

@@ -1,5 +1,6 @@
 import asyncio
 import random
+from datetime import datetime
 from secrets import token_hex
 
 from arclet.alconna import Alconna, Arg, CommandMeta, Field, Option
@@ -35,10 +36,11 @@
 from app.shortcut import accessable, allow, exclusive, picture, record
 from library.weibo import WeiboAPI, WeiboDynamic
 
+from .config import WeiboConfig
 from .model import WeiboFollower
 
 bot = RaianBotService.current()
-
+weibo_config = bot.config.plugin.get(WeiboConfig)
 weibo_fetch = Alconna(
     "微博",
     Arg(
@@ -108,14 +110,16 @@ async def _handle_dynamic(
                 url = await bot.upload_to_cos(await resp.read(), f"weibo_dym_{token_hex(16)}.png")
                 imgs.append(Picture(UrlResource(url)))
     return first, imgs
-    # nodes: List[MessageChain] = [first, MessageChain(*imgs)] if imgs else [first]
-    # if data.video_url:
-    #     nodes.append(MessageChain(f"视频链接: {data.video_url}"))
-    # if data.retweet:
-    #     # nodes.extend(await _handle_dynamic(app, data.retweet, time, target, name, method))
-    #     nodes.append(MessageChain(Forward(*(await _handle_dynamic(app, data.retweet, time, target, name, method)))))
-    # # return nodes
-    # return [ForwardNode(target=target, name=name, time=time, message=i) for i in nodes]
+
+
+async def _handle_dynamic_forward(data: WeiboDynamic, pw: PlaywrightService, uid: str, name: str, url_imgs: bool = False):
+    first, imgs = await _handle_dynamic(data, pw, url_imgs)
+    nodes: list[MessageChain] = [MessageChain([first]), MessageChain(imgs)] if imgs else [MessageChain([first])]
+    if data.video_url:
+        nodes.append(MessageChain(f"视频链接: {data.video_url}"))
+    if data.retweet:
+        nodes.extend(node.content for node in await _handle_dynamic_forward(data.retweet, pw, uid, name, url_imgs))  # type: ignore
+    return [Node(uid=uid, name=name, time=datetime.now(), content=i) for i in nodes]
 
 
 @alcommand(weibo_fetch, comp_session={}, post=True)
@@ -351,11 +355,7 @@ async def update(avilla: Avilla):
             wp = wp.copy()
             try:
                 if res := await api.update(int(uid)):
-                    dynamics[int(uid)] = (
-                        await _handle_dynamic(res, pw, url_imgs=True),
-                        res.user.name if res.user else "",
-                    )
-                    await asyncio.sleep(5)
+                    dynamics[int(uid)] = res
                 else:
                     continue
             except Exception as e:
@@ -390,13 +390,28 @@ async def update(avilla: Avilla):
             if not accounts:
                 continue
             choose = random.choice(accounts)
+            self_info = next(
+                (info for info in bot.config.bots if info.ensure(choose)), None  # type: ignore
+            )
+            if not self_info:
+                continue
             ctx = choose.get_context(Selector().land("qq").group(group.id))
             for uid in mapping[group.id]:
-                dy, name = dynamics[uid]
+                if uid not in dynamics:
+                    continue
+                slot = dynamics[uid]
+                if isinstance(slot, WeiboDynamic):
+                    name = slot.user.name if slot.user else f"微博用户{uid}"
+                    if weibo_config.dynamic_forward:
+                        nodes = await _handle_dynamic_forward(slot, pw, self_info.account, self_info.name)
+                        dy = Forward(nodes=nodes)
+                    else:
+                        dy, _ = await _handle_dynamic(slot, pw, True)
+                    dynamics[uid] = (dy, name)
+                else:
+                    dy, name = slot  # type: ignore
                 await ctx.scene.send_message(f"{name} 有一条新动态！请查收!")
-                await ctx.scene.send_message(dy[0])
-                # if dy[1]:
-                #     await ctx.scene.send_message([*(Picture(UrlResource(url)) for url in dy[1])])
+                await ctx.scene.send_message(dy)
                 await asyncio.sleep(10)
 
     dynamics.clear()

plugins/weibo/model.py

@@ -1,9 +1,12 @@
+from dataclasses import dataclass
+
 from sqlalchemy import ForeignKey, Integer
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.database import Base, Group
 
 
+@dataclass
 class WeiboFollower(Base):
     __tablename__ = "weibo"