Skip to content

Apply replyType to messageListParams #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Apply replyType to messageListParams #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/smart-components/Conversation/hooks/useHandleReconnect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect } from 'react';
import * as utils from '../utils';
import * as messageActionTypes from '../dux/actionTypes';

function useHandleReconnect({ isOnline }, {
function useHandleReconnect({ isOnline, replyType }, {
logger,
sdk,
currentGroupChannel,
Expand All @@ -21,9 +21,13 @@ function useHandleReconnect({ isOnline }, {

const messageListParams = new sdk.MessageListParams();
messageListParams.prevResultSize = 30;
messageListParams.isInclusive = true;
messageListParams.includeReplies = false;
messageListParams.includeReaction = useReaction;

if (replyType && replyType === 'QUOTE_REPLY') {
messageListParams.includeParentMessageInfo = true;
messageListParams.replyType = 'all';
}
if (userFilledMessageListQuery) {
Object.keys(userFilledMessageListQuery).forEach((key) => {
messageListParams[key] = userFilledMessageListQuery[key];
Expand Down Expand Up @@ -71,7 +75,7 @@ function useHandleReconnect({ isOnline }, {
});
}
};
}, [isOnline]);
}, [isOnline, replyType]);
}

export default useHandleReconnect;
14 changes: 11 additions & 3 deletions src/smart-components/Conversation/hooks/useScrollCallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ function useScrollCallback({
currentGroupChannel,
lastMessageTimeStamp,
userFilledMessageListQuery,
replyType,
}, {
hasMore,
logger,
Expand All @@ -14,11 +15,18 @@ function useScrollCallback({
}) {
return useCallback((cb) => {
if (!hasMore) { return; }
const {appInfo = {}} = sdk;
const useReaction = appInfo.isUsingReaction || false;

const messageListParams = new sdk.MessageListParams();
messageListParams.prevResultSize = 30;
messageListParams.isInclusive = true;
messageListParams.includeReplies = false;
messageListParams.includeReaction = true;

messageListParams.includeReaction = useReaction;
if (replyType && replyType === 'QUOTE_REPLY') {
messageListParams.includeParentMessageInfo = true;
messageListParams.replyType = 'all';
}
if (userFilledMessageListQuery) {
Object.keys(userFilledMessageListQuery).forEach((key) => {
messageListParams[key] = userFilledMessageListQuery[key];
Expand Down Expand Up @@ -63,7 +71,7 @@ function useScrollCallback({
.finally(() => {
currentGroupChannel.markAsRead();
});
}, [currentGroupChannel, lastMessageTimeStamp]);
}, [currentGroupChannel, lastMessageTimeStamp, replyType]);
}

export default useScrollCallback;
14 changes: 11 additions & 3 deletions src/smart-components/Conversation/hooks/useScrollDownCallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,26 @@ function useScrollDownCallback({
latestFetchedMessageTimeStamp,
userFilledMessageListQuery,
hasMoreToBottom,
replyType,
}, {
logger,
messagesDispatcher,
sdk,
}) {
return useCallback((cb) => {
if (!hasMoreToBottom) { return; }
const { appInfo = {} } = sdk;
const useReaction = appInfo.isUsingReaction || false;

const messageListParams = new sdk.MessageListParams();
messageListParams.nextResultSize = RESULT_SIZE;
messageListParams.isInclusive = true;
messageListParams.includeReplies = false;
messageListParams.includeReaction = true;

messageListParams.includeReaction = useReaction;
if (replyType && replyType === 'QUOTE_REPLY') {
messageListParams.includeParentMessageInfo = true;
messageListParams.replyType = 'all';
}
if (userFilledMessageListQuery) {
Object.keys(userFilledMessageListQuery).forEach((key) => {
messageListParams[key] = userFilledMessageListQuery[key];
Expand Down Expand Up @@ -66,7 +74,7 @@ function useScrollDownCallback({
.finally(() => {
currentGroupChannel.markAsRead();
});
}, [currentGroupChannel, latestFetchedMessageTimeStamp, hasMoreToBottom]);
}, [currentGroupChannel, latestFetchedMessageTimeStamp, hasMoreToBottom, replyType]);
}

export default useScrollDownCallback;
5 changes: 3 additions & 2 deletions src/smart-components/Conversation/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export const ConversationPanel = (props) => {

// Scrollup is default scroll for channel
const onScrollCallback = useScrollCallback({
currentGroupChannel, lastMessageTimeStamp, userFilledMessageListQuery,
currentGroupChannel, lastMessageTimeStamp, userFilledMessageListQuery, replyType,
}, {
hasMore,
logger,
Expand All @@ -168,6 +168,7 @@ export const ConversationPanel = (props) => {
latestFetchedMessageTimeStamp,
userFilledMessageListQuery,
hasMoreToBottom,
replyType,
}, {
logger,
messagesDispatcher,
Expand Down Expand Up @@ -227,7 +228,7 @@ export const ConversationPanel = (props) => {
}, [channelUrl, sdkInit]);

// handling connection breaks
useHandleReconnect({ isOnline }, {
useHandleReconnect({ isOnline, replyType }, {
logger,
sdk,
currentGroupChannel,
Expand Down