Skip to content

Commit

Permalink
fix feishu call_api result (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MeetWq
MeetWq committed Mar 1, 2024
1 parent 103c1ae commit d373774
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 62 deletions.
17 changes: 9 additions & 8 deletions nonebot_plugin_chatrecorder/adapters/feishu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,17 @@ async def record_send_msg(
):
return

chat_id = result["chat_id"]
result_data = result["data"]
chat_id = result_data["chat_id"]
resp = await get_chat_info(bot, chat_id)
chat_mode = resp["chat_mode"]
chat_mode = resp["data"]["chat_mode"]

level = SessionLevel.LEVEL0
id1 = None
id2 = None
if chat_mode == "p2p":
level = SessionLevel.LEVEL1
id1 = resp["owner_id"]
id1 = resp["data"]["owner_id"]
elif chat_mode == "group":
level = SessionLevel.LEVEL2
id2 = chat_id
Expand All @@ -97,16 +98,16 @@ async def record_send_msg(
)
session_persist_id = await get_session_persist_id(session)

msg_type = result["msg_type"]
content = result["body"]["content"]
mentions = result.get("mentions")
msg_type = result_data["msg_type"]
content = result_data["body"]["content"]
mentions = result_data.get("mentions")
message = Message.deserialize(content, mentions, msg_type)

record = MessageRecord(
session_persist_id=session_persist_id,
time=datetime.utcfromtimestamp(int(result["create_time"]) / 1000),
time=datetime.utcfromtimestamp(int(result_data["create_time"]) / 1000),
type="message_sent",
message_id=result["message_id"],
message_id=result_data["message_id"],
message=serialize_message(adapter, message),
plain_text=message.extract_plain_text(),
)
Expand Down
132 changes: 78 additions & 54 deletions tests/test_feishu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ async def test_record_recv_msg(app: App):
),
),
reply=None,
)
) # type: ignore
await record_recv_msg(bot, event)
await check_record(
"2233",
Expand Down Expand Up @@ -127,7 +127,7 @@ async def test_record_recv_msg(app: App):
),
),
reply=None,
)
) # type: ignore
await record_recv_msg(bot, event)
await check_record(
"2233",
Expand Down Expand Up @@ -168,10 +168,14 @@ async def test_record_send_msg(app: App):
"im/v1/chats/oc_123",
{"method": "GET", "query": {"user_id_type": "open_id"}},
{
"chat_mode": "group",
"name": "test",
"owner_id": "3344",
"owner_id_type": "open_id",
"code": 0,
"msg": "success",
"data": {
"chat_mode": "group",
"name": "test",
"owner_id": "3344",
"owner_id_type": "open_id",
},
},
)
await record_send_msg(
Expand All @@ -188,17 +192,21 @@ async def test_record_send_msg(app: App):
},
},
{
"body": {"content": content},
"chat_id": "oc_123",
"create_time": "123456000",
"mentions": [],
"message_id": "om_3",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
"code": 0,
"msg": "success",
"data": {
"body": {"content": content},
"chat_id": "oc_123",
"create_time": "123456000",
"mentions": [],
"message_id": "om_3",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
},
},
},
)
Expand All @@ -221,10 +229,14 @@ async def test_record_send_msg(app: App):
"im/v1/chats/oc_456",
{"method": "GET", "query": {"user_id_type": "open_id"}},
{
"chat_mode": "p2p",
"name": "test",
"owner_id": "3344",
"owner_id_type": "open_id",
"code": 0,
"msg": "success",
"data": {
"chat_mode": "p2p",
"name": "test",
"owner_id": "3344",
"owner_id_type": "open_id",
},
},
)
await record_send_msg(
Expand All @@ -241,17 +253,21 @@ async def test_record_send_msg(app: App):
},
},
{
"body": {"content": content},
"chat_id": "oc_456",
"create_time": "123456000",
"mentions": [],
"message_id": "om_4",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
"code": 0,
"msg": "success",
"data": {
"body": {"content": content},
"chat_id": "oc_456",
"create_time": "123456000",
"mentions": [],
"message_id": "om_4",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
},
},
},
)
Expand Down Expand Up @@ -282,17 +298,21 @@ async def test_record_send_msg(app: App):
},
},
{
"body": {"content": content},
"chat_id": "oc_123",
"create_time": "123456000",
"mentions": [],
"message_id": "om_5",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
"code": 0,
"msg": "success",
"data": {
"body": {"content": content},
"chat_id": "oc_123",
"create_time": "123456000",
"mentions": [],
"message_id": "om_5",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
},
},
},
)
Expand Down Expand Up @@ -323,17 +343,21 @@ async def test_record_send_msg(app: App):
},
},
{
"body": {"content": content},
"chat_id": "oc_456",
"create_time": "123456000",
"mentions": [],
"message_id": "om_6",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
"code": 0,
"msg": "success",
"data": {
"body": {"content": content},
"chat_id": "oc_456",
"create_time": "123456000",
"mentions": [],
"message_id": "om_6",
"msg_type": msg_type,
"sender": {
"id": "2233",
"id_type": "app_id",
"sender_type": "app",
"tenant_key": "tenant_key",
},
},
},
)
Expand Down

0 comments on commit d373774

Please sign in to comment.