Skip to content

[QU-298] Fix message filter issue #42

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 2 commits into from
Oct 26, 2021
Merged

[QU-298] Fix message filter issue #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ce3644
Fix typo of isReplyToChannel
HoonBaek Oct 26, 2021
e2edfcd
Ignore '*' in the customTypes of messageListParams because it's inser…
HoonBaek Oct 26, 2021
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
23,907 changes: 23,906 additions & 1 deletion src/sendbird.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/smart-components/Conversation/hooks/useSendFileMessageCallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function useSendFileMessageCallback({
const params = new sdk.FileMessageParams();
params.file = file_;
if (quoteMessage) {
params.isReplyTochannel = true;
params.isReplyToChannel = true;
params.parentMessageId = quoteMessage.messageId;
}
return params;
Expand Down
2 changes: 1 addition & 1 deletion src/smart-components/Conversation/hooks/useSendMessageCallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function useSendMessageCallback({ currentGroupChannel, onBeforeSe
const params = new sdk.UserMessageParams();
params.message = message;
if (quoteMessage) {
params.isReplyTochannel = true;
params.isReplyToChannel = true;
params.parentMessageId = quoteMessage.messageId;
}
return params;
Expand Down
8 changes: 6 additions & 2 deletions src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,12 @@ export const filterMessageListParams = (params: SubsitutionMessageListParams, me
if (params?.messageType && params.messageType !== message.messageType) {
return false;
}
if (params?.customTypes?.length > 0 && !params.customTypes.includes(message.customType)) {
return false;
if (params?.customTypes?.length > 0) {
const customTypes = params.customTypes.filter((item) => item !== '*');
// Because Chat SDK inserts '*' when customTypes is empty
if (customTypes.includes(message.customType)) {
return false;
}
}
if (params?.senderUserIds && params?.senderUserIds?.length > 0) {
if (message?.isUserMessage() || message.isFileMessage()) {
Expand Down