From dcafe6efdcf992da801c593073f3cba35c3d2621 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 18 Jun 2026 19:58:41 -0700 Subject: [PATCH] =?UTF-8?q?fix(im):=20=E5=B0=86=E9=A2=91=E9=81=93=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9A=84=20pull=20=E6=94=B9=E6=88=90=20pullChannelMes?= =?UTF-8?q?sageList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/im/message/channel/index.ts | 5 ++++- src/api/im/message/group/index.ts | 2 +- src/api/im/message/private/index.ts | 2 +- src/views/im/home/composables/useMessagePuller.ts | 12 ++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/api/im/message/channel/index.ts b/src/api/im/message/channel/index.ts index 4f769fc5e..6a5cfde97 100644 --- a/src/api/im/message/channel/index.ts +++ b/src/api/im/message/channel/index.ts @@ -12,7 +12,10 @@ export interface ImChannelMessageRespVO { } // 拉取当前用户应收的频道消息(离线增量);按 minId 游标分页 -export const pullChannelMessages = (params: { minId: number; size?: number }, signal?: AbortSignal) => { +export const pullChannelMessageList = ( + params: { minId: number; size?: number }, + signal?: AbortSignal +) => { return request.get({ url: '/im/channel/message/pull', params, diff --git a/src/api/im/message/group/index.ts b/src/api/im/message/group/index.ts index 7bb4523a2..42921dafa 100644 --- a/src/api/im/message/group/index.ts +++ b/src/api/im/message/group/index.ts @@ -39,7 +39,7 @@ export const sendGroupMessage = (data: ImGroupMessageSendReqVO) => { } // 拉取群聊消息(增量) -export const pullGroupMessages = ( +export const pullGroupMessageList = ( params: { minId: number | string; size: number }, signal?: AbortSignal ) => { diff --git a/src/api/im/message/private/index.ts b/src/api/im/message/private/index.ts index 3c5bf16aa..89dd08d4d 100644 --- a/src/api/im/message/private/index.ts +++ b/src/api/im/message/private/index.ts @@ -35,7 +35,7 @@ export const sendPrivateMessage = (data: ImPrivateMessageSendReqVO) => { } // 拉取私聊消息(增量) -export const pullPrivateMessages = ( +export const pullPrivateMessageList = ( params: { minId: number | string; size: number }, signal?: AbortSignal ) => { diff --git a/src/views/im/home/composables/useMessagePuller.ts b/src/views/im/home/composables/useMessagePuller.ts index 74a41b41b..92bb93499 100644 --- a/src/views/im/home/composables/useMessagePuller.ts +++ b/src/views/im/home/composables/useMessagePuller.ts @@ -7,16 +7,16 @@ import { getFriendDisplayName, getGroupDisplayName } from '../../utils/user' import { useGroupStore } from '../store/groupStore' import { useGroupRequestStore } from '../store/groupRequestStore' import { - pullPrivateMessages as apiPullPrivateMessages, + pullPrivateMessageList as apiPullPrivateMessageList, getPrivateMaxReadMessageId as apiGetPrivateMaxReadMessageId, type ImPrivateMessageRespVO } from '@/api/im/message/private' import { - pullGroupMessages as apiPullGroupMessages, + pullGroupMessageList as apiPullGroupMessageList, type ImGroupMessageRespVO } from '@/api/im/message/group' import { - pullChannelMessages as apiPullChannelMessages, + pullChannelMessageList as apiPullChannelMessageList, type ImChannelMessageRespVO } from '@/api/im/message/channel' import { @@ -182,12 +182,12 @@ export const useMessagePuller = () => { isActive: isStillValid, fetchPage: ({ minId, size }) => { if (isPrivate) { - return apiPullPrivateMessages({ minId, size }, signal) + return apiPullPrivateMessageList({ minId, size }, signal) } if (isChannel) { - return apiPullChannelMessages({ minId, size }, signal) + return apiPullChannelMessageList({ minId, size }, signal) } - return apiPullGroupMessages({ minId, size }, signal) + return apiPullGroupMessageList({ minId, size }, signal) }, applyPage: async (list, nextMinId) => { const pulledMessages: PulledMessage[] = []