mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-07-14 08:26:07 +00:00
fix(aiocqhttp): resolve group member metadata (#2298)
* fix(aiocqhttp): resolve group member metadata * style: ruff format
This commit is contained in:
彼方
@@ -1,7 +1,12 @@
|
||||
import pytest
|
||||
import aiocqhttp
|
||||
|
||||
import langbot_plugin.api.entities.builtin.platform.message as platform_message
|
||||
from langbot.pkg.platform.sources.aiocqhttp import AiocqhttpAdapter, AiocqhttpMessageConverter
|
||||
from langbot.pkg.platform.sources.aiocqhttp import (
|
||||
AiocqhttpAdapter,
|
||||
AiocqhttpEventConverter,
|
||||
AiocqhttpMessageConverter,
|
||||
)
|
||||
|
||||
|
||||
async def _convert_single(component: platform_message.MessageComponent):
|
||||
@@ -103,3 +108,431 @@ async def test_forward_image_base64_payload_is_normalized():
|
||||
'type': 'image',
|
||||
'data': {'file': 'base64://raw-forward-image'},
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_member_name_prefers_group_card():
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
'title': 'Special Title',
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
class Bot:
|
||||
async def get_group_info(self, group_id):
|
||||
assert group_id == 2000
|
||||
return {'group_id': group_id, 'group_name': 'Test Group'}
|
||||
|
||||
converted = await AiocqhttpEventConverter().target2yiri(event, Bot())
|
||||
|
||||
assert converted.sender.member_name == 'Group Card'
|
||||
assert converted.sender.group.id == 2000
|
||||
assert converted.sender.group.name == 'Test Group'
|
||||
assert converted.sender.special_title == 'Special Title'
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_member_name_falls_back_to_nickname():
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': '',
|
||||
'role': 'member',
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
converted = await AiocqhttpEventConverter().target2yiri(event)
|
||||
|
||||
assert converted.sender.member_name == 'QQ Nickname'
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_special_title_uses_group_member_info_when_sender_title_is_empty():
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
'title': '',
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
class Bot:
|
||||
async def get_group_info(self, group_id):
|
||||
return {'group_id': group_id, 'group_name': 'Test Group'}
|
||||
|
||||
async def get_group_member_info(self, group_id, user_id):
|
||||
assert group_id == 2000
|
||||
assert user_id == 3000
|
||||
return {'group_id': group_id, 'user_id': user_id, 'title': 'Member Title'}
|
||||
|
||||
converted = await AiocqhttpEventConverter().target2yiri(event, Bot())
|
||||
|
||||
assert converted.sender.special_title == 'Member Title'
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_special_title_does_not_lookup_when_sender_title_exists():
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
'title': 'Event Title',
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
class Bot:
|
||||
async def get_group_info(self, group_id):
|
||||
return {'group_id': group_id, 'group_name': 'Test Group'}
|
||||
|
||||
async def get_group_member_info(self, group_id, user_id):
|
||||
raise AssertionError('get_group_member_info should not be called')
|
||||
|
||||
converted = await AiocqhttpEventConverter().target2yiri(event, Bot())
|
||||
|
||||
assert converted.sender.special_title == 'Event Title'
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_special_title_member_info_failure_is_cached(monkeypatch):
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
'title': '',
|
||||
},
|
||||
}
|
||||
)
|
||||
now = 1000.0
|
||||
|
||||
class Bot:
|
||||
member_info_calls = 0
|
||||
|
||||
async def get_group_info(self, group_id):
|
||||
return {'group_id': group_id, 'group_name': 'Test Group'}
|
||||
|
||||
async def get_group_member_info(self, group_id, user_id):
|
||||
self.member_info_calls += 1
|
||||
raise RuntimeError('api unavailable')
|
||||
|
||||
monkeypatch.setattr('langbot.pkg.platform.sources.aiocqhttp.time.monotonic', lambda: now)
|
||||
|
||||
bot = Bot()
|
||||
converter = AiocqhttpEventConverter()
|
||||
|
||||
first = await converter.target2yiri(event, bot)
|
||||
second = await converter.target2yiri(event, bot)
|
||||
|
||||
assert first.sender.special_title == ''
|
||||
assert second.sender.special_title == ''
|
||||
assert bot.member_info_calls == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_special_title_member_info_cache_expires(monkeypatch):
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
'title': '',
|
||||
},
|
||||
}
|
||||
)
|
||||
now = 1000.0
|
||||
|
||||
class Bot:
|
||||
member_info_calls = 0
|
||||
|
||||
async def get_group_info(self, group_id):
|
||||
return {'group_id': group_id, 'group_name': 'Test Group'}
|
||||
|
||||
async def get_group_member_info(self, group_id, user_id):
|
||||
self.member_info_calls += 1
|
||||
return {
|
||||
'group_id': group_id,
|
||||
'user_id': user_id,
|
||||
'title': f'Member Title {self.member_info_calls}',
|
||||
}
|
||||
|
||||
monkeypatch.setattr('langbot.pkg.platform.sources.aiocqhttp.time.monotonic', lambda: now)
|
||||
|
||||
bot = Bot()
|
||||
converter = AiocqhttpEventConverter()
|
||||
|
||||
first = await converter.target2yiri(event, bot)
|
||||
now = 87401.0
|
||||
second = await converter.target2yiri(event, bot)
|
||||
|
||||
assert first.sender.special_title == 'Member Title 1'
|
||||
assert second.sender.special_title == 'Member Title 2'
|
||||
assert bot.member_info_calls == 2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_special_title_retries_after_negative_cache_expires(monkeypatch):
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
'title': '',
|
||||
},
|
||||
}
|
||||
)
|
||||
now = 1000.0
|
||||
|
||||
class Bot:
|
||||
member_info_calls = 0
|
||||
|
||||
async def get_group_info(self, group_id):
|
||||
return {'group_id': group_id, 'group_name': 'Test Group'}
|
||||
|
||||
async def get_group_member_info(self, group_id, user_id):
|
||||
self.member_info_calls += 1
|
||||
if self.member_info_calls == 1:
|
||||
raise RuntimeError('api unavailable')
|
||||
return {'group_id': group_id, 'user_id': user_id, 'title': 'Recovered Title'}
|
||||
|
||||
monkeypatch.setattr('langbot.pkg.platform.sources.aiocqhttp.time.monotonic', lambda: now)
|
||||
|
||||
bot = Bot()
|
||||
converter = AiocqhttpEventConverter()
|
||||
|
||||
failed = await converter.target2yiri(event, bot)
|
||||
now = 1601.0
|
||||
recovered = await converter.target2yiri(event, bot)
|
||||
|
||||
assert failed.sender.special_title == ''
|
||||
assert recovered.sender.special_title == 'Recovered Title'
|
||||
assert bot.member_info_calls == 2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_group_name_is_cached(monkeypatch):
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
class Bot:
|
||||
calls = 0
|
||||
|
||||
async def get_group_info(self, group_id):
|
||||
self.calls += 1
|
||||
assert group_id == 2000
|
||||
return {'group_id': group_id, 'group_name': 'Cached Group'}
|
||||
|
||||
monotonic = 1000.0
|
||||
monkeypatch.setattr('langbot.pkg.platform.sources.aiocqhttp.time.monotonic', lambda: monotonic)
|
||||
|
||||
bot = Bot()
|
||||
converter = AiocqhttpEventConverter()
|
||||
|
||||
first = await converter.target2yiri(event, bot)
|
||||
second = await converter.target2yiri(event, bot)
|
||||
|
||||
assert first.sender.group.name == 'Cached Group'
|
||||
assert second.sender.group.name == 'Cached Group'
|
||||
assert bot.calls == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_group_name_cache_expires(monkeypatch):
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
},
|
||||
}
|
||||
)
|
||||
now = 1000.0
|
||||
|
||||
class Bot:
|
||||
calls = 0
|
||||
|
||||
async def get_group_info(self, group_id):
|
||||
self.calls += 1
|
||||
return {'group_id': group_id, 'group_name': f'Group Name {self.calls}'}
|
||||
|
||||
monkeypatch.setattr('langbot.pkg.platform.sources.aiocqhttp.time.monotonic', lambda: now)
|
||||
|
||||
bot = Bot()
|
||||
converter = AiocqhttpEventConverter()
|
||||
|
||||
first = await converter.target2yiri(event, bot)
|
||||
now = 4601.0
|
||||
second = await converter.target2yiri(event, bot)
|
||||
|
||||
assert first.sender.group.name == 'Group Name 1'
|
||||
assert second.sender.group.name == 'Group Name 2'
|
||||
assert bot.calls == 2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_group_name_uses_placeholder_when_lookup_fails(monkeypatch):
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
},
|
||||
}
|
||||
)
|
||||
now = 1000.0
|
||||
|
||||
class Bot:
|
||||
calls = 0
|
||||
|
||||
async def get_group_info(self, group_id):
|
||||
self.calls += 1
|
||||
raise RuntimeError('api unavailable')
|
||||
|
||||
monkeypatch.setattr('langbot.pkg.platform.sources.aiocqhttp.time.monotonic', lambda: now)
|
||||
|
||||
bot = Bot()
|
||||
converter = AiocqhttpEventConverter()
|
||||
|
||||
converted = await converter.target2yiri(event, bot)
|
||||
cached_failure = await converter.target2yiri(event, bot)
|
||||
|
||||
assert converted.sender.group.name == 'Group 2000'
|
||||
assert cached_failure.sender.group.name == 'Group 2000'
|
||||
assert bot.calls == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_group_message_group_name_retries_after_negative_cache_expires(monkeypatch):
|
||||
event = aiocqhttp.Event(
|
||||
{
|
||||
'post_type': 'message',
|
||||
'message_type': 'group',
|
||||
'message_id': 1000,
|
||||
'message': '',
|
||||
'time': 1776491725,
|
||||
'group_id': 2000,
|
||||
'sender': {
|
||||
'user_id': 3000,
|
||||
'nickname': 'QQ Nickname',
|
||||
'card': 'Group Card',
|
||||
'role': 'member',
|
||||
},
|
||||
}
|
||||
)
|
||||
now = 1000.0
|
||||
|
||||
class Bot:
|
||||
calls = 0
|
||||
|
||||
async def get_group_info(self, group_id):
|
||||
self.calls += 1
|
||||
if self.calls == 1:
|
||||
raise RuntimeError('api unavailable')
|
||||
return {'group_id': group_id, 'group_name': 'Recovered Group'}
|
||||
|
||||
monkeypatch.setattr('langbot.pkg.platform.sources.aiocqhttp.time.monotonic', lambda: now)
|
||||
|
||||
bot = Bot()
|
||||
converter = AiocqhttpEventConverter()
|
||||
|
||||
failed = await converter.target2yiri(event, bot)
|
||||
now = 1061.0
|
||||
recovered = await converter.target2yiri(event, bot)
|
||||
|
||||
assert failed.sender.group.name == 'Group 2000'
|
||||
assert recovered.sender.group.name == 'Recovered Group'
|
||||
assert bot.calls == 2
|
||||
|
||||
Reference in New Issue
Block a user