Skip to content

fix: Apply metadata to the ChannelListQuery #723

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 4 commits into from
Sep 1, 2023
Merged

fix: Apply metadata to the ChannelListQuery #723

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4c4949
fix: apply metadataKey, metadataValues, and metadataStartsWith
HoonBaek Aug 30, 2023
77527b6
chore: fix lint error
HoonBaek Aug 30, 2023
6c6cc69
fix: remove useless type assertion
HoonBaek Aug 30, 2023
2a5afd9
fix: do not set the default value of filterChannelListParams param
HoonBaek Aug 30, 2023
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
73 changes: 52 additions & 21 deletions src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,29 @@ export const filterMessageListParams = (
};

export const filterChannelListParams = (params: GroupChannelListQuery, channel: GroupChannel, currentUserId: string): boolean => {
if (!params?.includeEmpty && channel?.lastMessage === null) {
const {
includeEmpty,
includeFrozen,
searchFilter,
userIdsFilter,
customTypesFilter,
channelUrlsFilter,
customTypeStartsWithFilter,
channelNameContainsFilter,
nicknameContainsFilter,
myMemberStateFilter,
hiddenChannelFilter,
unreadChannelFilter,
publicChannelFilter,
superChannelFilter,
metadataKey = '',
metadataValues = ['a', 'b'],
metadataValueStartsWith,
} = params;

if (!includeEmpty && channel?.lastMessage === null) {
return false;
}
const searchFilter = params?.searchFilter;
if (searchFilter?.query && (searchFilter?.fields?.length ?? 0) > 0) {
const searchQuery = searchFilter.query;
const searchFields = searchFilter.fields;
Expand All @@ -474,7 +493,6 @@ export const filterChannelListParams = (params: GroupChannelListQuery, channel:
}
}
}
const userIdsFilter = params?.userIdsFilter;
if (userIdsFilter?.userIds?.length > 0) {
const { includeMode, queryType } = userIdsFilter;
const userIds: string[] = userIdsFilter.userIds;
Expand Down Expand Up @@ -509,32 +527,32 @@ export const filterChannelListParams = (params: GroupChannelListQuery, channel:
}
}
}
if (params?.includeEmpty === false && channel?.lastMessage === null) {
if (includeEmpty === false && channel?.lastMessage === null) {
return false;
}
if (params?.includeFrozen === false && channel?.isFrozen === true) {
if (includeFrozen === false && channel?.isFrozen === true) {
return false;
}
if (params?.customTypesFilter?.length > 0 && !params.customTypesFilter.includes(channel?.customType)) {
if (customTypesFilter && !customTypesFilter.includes(channel?.customType)) {
Copy link
Contributor

@chohongm chohongm Sep 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe better to do:

typeof customTypesFilter === 'array'

return false;
}
if (params?.customTypeStartsWithFilter && !new RegExp(`^${params.customTypeStartsWithFilter}`).test(channel?.customType)) {
if (customTypeStartsWithFilter && !new RegExp(`^${customTypeStartsWithFilter}`).test(channel?.customType)) {
return false;
}
if (params?.channelNameContainsFilter && !channel?.name?.toLowerCase().includes(params.channelNameContainsFilter.toLowerCase())) {
if (channelNameContainsFilter && !channel?.name?.toLowerCase().includes(channelNameContainsFilter.toLowerCase())) {
return false;
}
if (params?.nicknameContainsFilter) {
const lowerCasedSubString = params.nicknameContainsFilter.toLowerCase();
if (nicknameContainsFilter) {
const lowerCasedSubString = nicknameContainsFilter.toLowerCase();
if (channel?.members?.every((member: Member) => !member.nickname.toLowerCase().includes(lowerCasedSubString))) {
return false;
}
}
if (params?.channelUrlsFilter?.length > 0 && !params.channelUrlsFilter.includes(channel?.url)) {
if (channelUrlsFilter && !channelUrlsFilter.includes(channel?.url)) {
return false;
}
if (params?.myMemberStateFilter) {
switch (params.myMemberStateFilter) {
if (myMemberStateFilter) {
switch (myMemberStateFilter) {
case 'joined_only':
if (channel?.myMemberState !== 'joined') {
return false;
Expand All @@ -557,8 +575,8 @@ export const filterChannelListParams = (params: GroupChannelListQuery, channel:
break;
}
}
if (params?.hiddenChannelFilter) {
switch (params.hiddenChannelFilter) {
if (hiddenChannelFilter) {
switch (hiddenChannelFilter) {
case 'unhidden_only':
if (channel?.isHidden || channel?.hiddenState !== 'unhidden') {
return false;
Expand All @@ -581,17 +599,17 @@ export const filterChannelListParams = (params: GroupChannelListQuery, channel:
break;
}
}
if (params?.unreadChannelFilter) {
switch (params.unreadChannelFilter) {
if (unreadChannelFilter) {
switch (unreadChannelFilter) {
case 'unread_message':
if (channel?.unreadMessageCount === 0) {
return false;
}
break;
}
}
if (params?.publicChannelFilter) {
switch (params.publicChannelFilter) {
if (publicChannelFilter) {
switch (publicChannelFilter) {
case 'public':
if (!channel?.isPublic) {
return false;
Expand All @@ -604,8 +622,8 @@ export const filterChannelListParams = (params: GroupChannelListQuery, channel:
break;
}
}
if (params?.superChannelFilter) {
switch (params.superChannelFilter) {
if (superChannelFilter) {
switch (superChannelFilter) {
case 'super':
if (!channel?.isSuper) {
return false;
Expand All @@ -618,6 +636,19 @@ export const filterChannelListParams = (params: GroupChannelListQuery, channel:
break;
}
}
const { cachedMetaData = {} } = channel;
if (metadataKey && (metadataValues || metadataValueStartsWith)) {
const metadataValue: string = cachedMetaData[metadataKey];
if (!metadataValue) {
return false;
}
if (metadataValues && !metadataValues.every(value => metadataValue.includes(value))) {
return false;
}
if (metadataValueStartsWith && !metadataValue.startsWith(metadataValueStartsWith)) {
return false;
}
}
return true;
};

Expand Down