Skip to content
This repository was archived by the owner on Feb 20, 2026. It is now read-only.

Commit 1c82016

Browse files
clanstyclansty
committed
fix llbot 合并转发
1 parent d1c436f commit 1c82016

5 files changed

Lines changed: 290 additions & 7 deletions

File tree

‎apps/qqbot/src/adapter/Bot.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,10 @@ export class BotAdapter extends Bot<BotTypes> {
181181
}
182182
} catch (e) {
183183
this.logger.withError(e).error('处理消息时出错');
184-
console.error(e);
185184
if (e instanceof NoReportError) return;
186185

187186
await this.constructMessage(data.message_type === 'group' ? -data.group_id : data.user_id)
188-
.setText('出现错误：' + e.message || e.toString())
187+
.setText('出现错误：' + (e.message || e.toString()))
189188
.dispatch();
190189
}
191190
}

‎apps/qqbot/src/adapter/BundledMessage.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export class BundledMessageNode extends BundledMessageNodeBase<BotTypes> {
6767
params = (this._bundledMessage as BundledMessage).compose();
6868
// @ts-ignore
6969
params.content = params.message;
70+
delete (params as any).message;
7071
}
7172
if(this._markdown) {
7273
params.content.push({
@@ -80,8 +81,10 @@ export class BundledMessageNode extends BundledMessageNodeBase<BotTypes> {
8081
return {
8182
type: 'node',
8283
data: {
83-
nickname: 'AquaDX Bot',
84+
nickname: 'MuBot',
85+
name: 'MuBot',
8486
user_id: this.bot.selfId,
87+
uin: this.bot.selfId,
8588
...params
8689
}
8790
};

‎apps/qqbot/src/adapter/MessageAction.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,17 @@ export class SendMessageAction extends SendMessageActionBase<BotTypes> {
9898
};
9999
}
100100

101-
const ret = await this.bot.callApi('send_msg', params);
101+
let action: keyof WSSendReturn = 'send_msg';
102+
if (this._bundledMessage) {
103+
if (this.chatId < 0) {
104+
action = 'send_group_forward_msg'
105+
}
106+
else {
107+
action = 'send_private_forward_msg'
108+
}
109+
}
110+
111+
const ret = await this.bot.callApi(action, params);
102112
return new SendMessageResult(this.bot, ret);
103113
}
104114
}

‎apps/web/src/routes/b50/components/B50.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const getLogoByVersion = (ver: MaiVersion) => {
1919
export default component$(({ rating, user, ver }: { rating: UserCombinedRating, user: NameplateData, ver: MaiVersion }) =>
2020
<div style={{ padding: '0 20px' }}>
2121
<div class={`${styles.b50Header} flex items-center p-[20px_0] gap-[10px_40px]`}>
22-
<div class="text-1.8em of-hidden" style={{ boxShadow: '0 0 8px rgba(0, 0, 0, 0.8)', borderRadius: '8px' }}>
22+
<div class="text-1.8em">
2323
<Nameplate user={user} />
2424
</div>
2525
<div class={`${styles.hideOnSmallScreen} grow`} />
@@ -79,8 +79,6 @@ const RatingAnalyse = component$(({ rating }: { rating: number }) => {
7979
return <>
8080
<span class="font-600">{rating}</span>
8181
{' ≈ '}
82-
<span>{ap.toFixed(1)}</span>
83-
{' AP / '}
8482
<span>{sssp.toFixed(1)}</span>
8583
{' SSS+ / '}
8684
<span>{sss.toFixed(1)}</span>

‎packages/data/src/all-music.json‎

Lines changed: 273 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14531,6 +14531,26 @@
1453114531
}
1453214532
]
1453314533
},
14534+
"1327": {
14535+
"name": "僕は空気が嫁ない",
14536+
"ver": "26007",
14537+
"composer": "cosMo＠暴走P",
14538+
"genre": "niconicoボーカロイド",
14539+
"notes": [
14540+
{
14541+
"lv": 4
14542+
},
14543+
{
14544+
"lv": 7.7
14545+
},
14546+
{
14547+
"lv": 10.8
14548+
},
14549+
{
14550+
"lv": 13.5
14551+
}
14552+
]
14553+
},
1453414554
"1736": {
1453514555
"name": "プリズム△▽リズム",
1453614556
"ver": "25513",
@@ -31497,6 +31517,26 @@
3149731517
}
3149831518
]
3149931519
},
31520+
"10106": {
31521+
"name": "BAD∞END∞NIGHT",
31522+
"ver": "26007",
31523+
"composer": "ひとしずくP・やま△",
31524+
"genre": "niconicoボーカロイド",
31525+
"notes": [
31526+
{
31527+
"lv": 4
31528+
},
31529+
{
31530+
"lv": 7.8
31531+
},
31532+
{
31533+
"lv": 11.2
31534+
},
31535+
{
31536+
"lv": 13.5
31537+
}
31538+
]
31539+
},
3150031540
"10117": {
3150131541
"name": "炎歌 -ほむらうた-",
3150231542
"ver": "24506",
@@ -49677,6 +49717,86 @@
4967749717
}
4967849718
]
4967949719
},
49720+
"11890": {
49721+
"name": "ミクマリ",
49722+
"ver": "26008",
49723+
"composer": "テヅカ",
49724+
"genre": "maimai",
49725+
"notes": [
49726+
{
49727+
"lv": 4
49728+
},
49729+
{
49730+
"lv": 7.8
49731+
},
49732+
{
49733+
"lv": 10.6
49734+
},
49735+
{
49736+
"lv": 13.5
49737+
}
49738+
]
49739+
},
49740+
"11891": {
49741+
"name": "雲外蒼電 -Dreaming Voltage-",
49742+
"ver": "26008",
49743+
"composer": "adaptor vs DRIVE.",
49744+
"genre": "maimai",
49745+
"notes": [
49746+
{
49747+
"lv": 4
49748+
},
49749+
{
49750+
"lv": 7.7
49751+
},
49752+
{
49753+
"lv": 12.2
49754+
},
49755+
{
49756+
"lv": 13.9
49757+
}
49758+
]
49759+
},
49760+
"11892": {
49761+
"name": "鬼女紅妖",
49762+
"ver": "26008",
49763+
"composer": "Earliri",
49764+
"genre": "maimai",
49765+
"notes": [
49766+
{
49767+
"lv": 5
49768+
},
49769+
{
49770+
"lv": 8
49771+
},
49772+
{
49773+
"lv": 11.7
49774+
},
49775+
{
49776+
"lv": 14.1
49777+
}
49778+
]
49779+
},
49780+
"11893": {
49781+
"name": "華天月兎",
49782+
"ver": "26008",
49783+
"composer": "satella feat.Risa Yuzuki",
49784+
"genre": "maimai",
49785+
"notes": [
49786+
{
49787+
"lv": 5
49788+
},
49789+
{
49790+
"lv": 8.2
49791+
},
49792+
{
49793+
"lv": 12.5
49794+
},
49795+
{
49796+
"lv": 14.4
49797+
}
49798+
]
49799+
},
4968049800
"11899": {
4968149801
"name": "イーヴィルガール",
4968249802
"ver": "26000",
@@ -49717,6 +49837,26 @@
4971749837
}
4971849838
]
4971949839
},
49840+
"11901": {
49841+
"name": "ラストピースに祝福と栄光を",
49842+
"ver": "26007",
49843+
"composer": "cosMo＠暴走P",
49844+
"genre": "オンゲキCHUNITHM",
49845+
"notes": [
49846+
{
49847+
"lv": 7
49848+
},
49849+
{
49850+
"lv": 9
49851+
},
49852+
{
49853+
"lv": 12.9
49854+
},
49855+
{
49856+
"lv": 14.6
49857+
}
49858+
]
49859+
},
4972049860
"11906": {
4972149861
"name": "Unwelcome School",
4972249862
"ver": "26000",
@@ -50266,6 +50406,106 @@
5026650406
}
5026750407
]
5026850408
},
50409+
"11935": {
50410+
"name": "初音ミクの暴走",
50411+
"ver": "26007",
50412+
"composer": "cosMo＠暴走P",
50413+
"genre": "niconicoボーカロイド",
50414+
"notes": [
50415+
{
50416+
"lv": 6
50417+
},
50418+
{
50419+
"lv": 8.8
50420+
},
50421+
{
50422+
"lv": 12.7
50423+
},
50424+
{
50425+
"lv": 13.9
50426+
}
50427+
]
50428+
},
50429+
"11936": {
50430+
"name": "Let's ミクササイズ！！",
50431+
"ver": "26007",
50432+
"composer": "cosMo＠暴走P「Fit Boxing feat. 初音ミク -ミクといっしょにエクササイズ-」",
50433+
"genre": "niconicoボーカロイド",
50434+
"notes": [
50435+
{
50436+
"lv": 5
50437+
},
50438+
{
50439+
"lv": 8.5
50440+
},
50441+
{
50442+
"lv": 12.4
50443+
},
50444+
{
50445+
"lv": 13.8
50446+
}
50447+
]
50448+
},
50449+
"11937": {
50450+
"name": "スノーマン (Rerec)",
50451+
"ver": "26009",
50452+
"composer": "halyosy",
50453+
"genre": "niconicoボーカロイド",
50454+
"notes": [
50455+
{
50456+
"lv": 2
50457+
},
50458+
{
50459+
"lv": 6.2
50460+
},
50461+
{
50462+
"lv": 9.8
50463+
},
50464+
{
50465+
"lv": 13.1
50466+
}
50467+
]
50468+
},
50469+
"11938": {
50470+
"name": "JINGLE DEATH",
50471+
"ver": "26009",
50472+
"composer": "DJ Myosuke & Gram",
50473+
"genre": "ゲームバラエティ",
50474+
"notes": [
50475+
{
50476+
"lv": 5
50477+
},
50478+
{
50479+
"lv": 8.2
50480+
},
50481+
{
50482+
"lv": 12.4
50483+
},
50484+
{
50485+
"lv": 14.1
50486+
}
50487+
]
50488+
},
50489+
"11942": {
50490+
"name": "ヤミナベ!!!!",
50491+
"ver": "26009",
50492+
"composer": "cosMo＠暴走P",
50493+
"genre": "niconicoボーカロイド",
50494+
"notes": [
50495+
{
50496+
"lv": 6
50497+
},
50498+
{
50499+
"lv": 8.5
50500+
},
50501+
{
50502+
"lv": 12.6
50503+
},
50504+
{
50505+
"lv": 14.5
50506+
}
50507+
]
50508+
},
5026950509
"11951": {
5027050510
"name": "サイエンス",
5027150511
"ver": "26000",
@@ -74493,6 +74733,17 @@
7449374733
}
7449474734
]
7449574735
},
74736+
"110684": {
74737+
"name": "[一]もうみんなしねばいいのに",
74738+
"ver": "26009",
74739+
"composer": "谷屋楽",
74740+
"genre": "宴会場",
74741+
"notes": [
74742+
{
74743+
"lv": 14.7
74744+
}
74745+
]
74746+
},
7449674747
"110781": {
7449774748
"name": "[協]Seyana. ～何でも言うことを聞いてくれるアカネチャン～",
7449874749
"ver": "25516",
@@ -74933,6 +75184,28 @@
7493375184
}
7493475185
]
7493575186
},
75187+
"111919": {
75188+
"name": "[充]エンジェル ドリーム",
75189+
"ver": "26009",
75190+
"composer": "「太鼓の達人」より",
75191+
"genre": "宴会場",
75192+
"notes": [
75193+
{
75194+
"lv": 11
75195+
}
75196+
]
75197+
},
75198+
"111936": {
75199+
"name": "[鍛]Let's ミクササイズ！！",
75200+
"ver": "26007",
75201+
"composer": "cosMo＠暴走P「Fit Boxing feat. 初音ミク -ミクといっしょにエクササイズ-」",
75202+
"genre": "宴会場",
75203+
"notes": [
75204+
{
75205+
"lv": 5
75206+
}
75207+
]
75208+
},
7493675209
"113009": {
7493775210
"name": "[協]ちっちゃな私",
7493875211
"ver": "24000",

0 commit comments

Comments
 (0)