Skip to content

Commit dc70783

Browse files
committed
fix bug
1 parent b537020 commit dc70783

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Diff for: sagiri_bot/handler/handlers/pica/Pica.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def __init__(self, account, password):
6262
self.password = password
6363
self.header = header.copy()
6464
self.header["nonce"] = uuid_s
65-
loop.run_until_complete(self.check())
65+
asyncio.run_coroutine_threadsafe(self.check(), loop)
6666

6767
async def check(self):
6868
try:

Diff for: sagiri_bot/handler/handlers/speak.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import re
12
import json
23
import uuid
34
import base64
@@ -17,7 +18,7 @@
1718
from graia.ariadne.message.parser.twilight import Twilight
1819
from graia.ariadne.event.message import Group, GroupMessage
1920
from graia.saya.builtins.broadcast.schema import ListenerSchema
20-
from graia.ariadne.message.parser.twilight import FullMatch, RegexMatch, RegexResult
21+
from graia.ariadne.message.parser.twilight import FullMatch, WildcardMatch, RegexResult
2122

2223
from tencentcloud.common import credential
2324
from tencentcloud.tts.v20190823 import tts_client, models
@@ -45,7 +46,7 @@
4546
@channel.use(
4647
ListenerSchema(
4748
listening_events=[GroupMessage],
48-
inline_dispatchers=[Twilight([FullMatch("说"), RegexMatch(r"[^\s]+") @ "content"])],
49+
inline_dispatchers=[Twilight([FullMatch("说"), WildcardMatch().flags(re.DOTALL) @ "content"])],
4950
decorators=[
5051
FrequencyLimit.require("speak", 1),
5152
Function.require(channel.module),
@@ -60,7 +61,7 @@ async def speak(app: Ariadne, message: MessageChain, group: Group, content: Rege
6061
if isinstance(voice, str):
6162
await app.sendGroupMessage(group, MessageChain(voice), quote=message.getFirst(Source))
6263
elif isinstance(voice, bytes):
63-
await app.sendGroupMessage(group, MessageChain([Voice(data_bytes=await silkcoder.encode(voice))]))
64+
await app.sendGroupMessage(group, MessageChain([Voice(data_bytes=await silkcoder.async_encode(voice))]))
6465

6566

6667
class Speak(object):
@@ -116,7 +117,7 @@ async def get_long_voice(voice_type: Union[int, str], text: str):
116117
"ModelType": 1,
117118
"VoiceType": int(voice_type),
118119
"Volume": 10,
119-
"Codec": "wav"
120+
# "Codec": "wav"
120121
}
121122
req.from_json_string(json.dumps(params))
122123
resp = client.CreateTtsTask(req)

0 commit comments

Comments
 (0)