Skip to content

Commit 467e422

Browse files
authored
🍻 qq 适配器支持更多的 Button Style (#141)
* 更新了qq适配器中的exporter,以支持更多的Button style * 修改qq适配器相关test的buttons tyle为正确的默认值
1 parent 0d56421 commit 467e422

3 files changed

Lines changed: 22 additions & 11 deletions

File tree

src/nonebot_plugin_alconna/uniseg/adapters/qq/exporter.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,23 @@ def _button(self, seg: Button, bot: Bot | None):
296296
else:
297297
perm = Permission(type=0, specify_user_ids=[i.target for i in seg.permission])
298298
label = str(seg.label)
299+
style_dict = {
300+
"grey": 0,
301+
"secondary": 0,
302+
"blue": 1,
303+
"primary": 1,
304+
"success": 1,
305+
"info": 2,
306+
"warning": 3,
307+
"danger": 3,
308+
"link": 4,
309+
}
299310
return ButtonModel(
300311
id=seg.id or (label if seg.flag == "action" else None),
301312
render_data=RenderData(
302313
label=label,
303314
visited_label=seg.clicked_label or label,
304-
style=0 if seg.style == "secondary" else 1,
315+
style=style_dict[seg.style] if seg.style else 0,
305316
),
306317
action=Action(
307318
type=0 if seg.flag == "link" else 1 if seg.flag == "action" else 2,

tests/test_buttons.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ async def _(row: int):
123123
buttons=[
124124
QQButton(
125125
id="1",
126-
render_data=RenderData(label="1", visited_label="1", style=1),
126+
render_data=RenderData(label="1", visited_label="1", style=0),
127127
action=Action(
128128
type=1,
129129
permission=Permission(type=2),
@@ -132,7 +132,7 @@ async def _(row: int):
132132
),
133133
QQButton(
134134
id="2",
135-
render_data=RenderData(label="2", visited_label="2", style=1),
135+
render_data=RenderData(label="2", visited_label="2", style=0),
136136
action=Action(
137137
type=1,
138138
permission=Permission(type=2),
@@ -141,7 +141,7 @@ async def _(row: int):
141141
),
142142
QQButton(
143143
id="3",
144-
render_data=RenderData(label="3", visited_label="3", style=1),
144+
render_data=RenderData(label="3", visited_label="3", style=0),
145145
action=Action(
146146
type=1,
147147
permission=Permission(type=2),
@@ -154,7 +154,7 @@ async def _(row: int):
154154
buttons=[
155155
QQButton(
156156
id="4",
157-
render_data=RenderData(label="4", visited_label="4", style=1),
157+
render_data=RenderData(label="4", visited_label="4", style=0),
158158
action=Action(
159159
type=1,
160160
permission=Permission(type=2),
@@ -163,7 +163,7 @@ async def _(row: int):
163163
),
164164
QQButton(
165165
id="5",
166-
render_data=RenderData(label="5", visited_label="5", style=1),
166+
render_data=RenderData(label="5", visited_label="5", style=0),
167167
action=Action(
168168
type=1,
169169
permission=Permission(type=2),
@@ -172,7 +172,7 @@ async def _(row: int):
172172
),
173173
QQButton(
174174
id="6",
175-
render_data=RenderData(label="6", visited_label="6", style=1),
175+
render_data=RenderData(label="6", visited_label="6", style=0),
176176
action=Action(
177177
type=1,
178178
permission=Permission(type=2),
@@ -185,7 +185,7 @@ async def _(row: int):
185185
buttons=[
186186
QQButton(
187187
id="7",
188-
render_data=RenderData(label="7", visited_label="7", style=1),
188+
render_data=RenderData(label="7", visited_label="7", style=0),
189189
action=Action(
190190
type=1,
191191
permission=Permission(type=2),
@@ -194,7 +194,7 @@ async def _(row: int):
194194
),
195195
QQButton(
196196
id="8",
197-
render_data=RenderData(label="8", visited_label="8", style=1),
197+
render_data=RenderData(label="8", visited_label="8", style=0),
198198
action=Action(
199199
type=1,
200200
permission=Permission(type=2),
@@ -203,7 +203,7 @@ async def _(row: int):
203203
),
204204
QQButton(
205205
id="9",
206-
render_data=RenderData(label="9", visited_label="9", style=1),
206+
render_data=RenderData(label="9", visited_label="9", style=0),
207207
action=Action(
208208
type=1,
209209
permission=Permission(type=2),

tests/test_qq.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ async def _():
8787
InlineKeyboardRow(
8888
buttons=[
8989
QQButton(
90-
render_data=RenderData(label="再来一发", visited_label="再来一发", style=1),
90+
render_data=RenderData(label="再来一发", visited_label="再来一发", style=0),
9191
action=Action(
9292
type=2,
9393
data="/十连",

0 commit comments

Comments
 (0)