Skip to content

fix: Improve util functions type #724

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
Aug 30, 2023
Merged

fix: Improve util functions type #724

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35d1397
fix: Improve util functions type
HoonBaek Aug 30, 2023
de9b187
chore: remove -> as MessageListParams & { customTypesFilter: Array<st…
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
14 changes: 9 additions & 5 deletions src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ export const isMessageSentByMe = (
userId: string,
message: SendableMessageType,
): boolean => (
(userId && message?.sender?.userId) && userId === message.sender.userId
!!(userId && message?.sender?.userId && userId === message.sender.userId)
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.

why do we need to do this?

);

const URL_REG = /^((http|https):\/\/)?([a-z\d]+\.)+[a-z]{2,6}(\:[0-9]{1,5})?(\/[-a-zA-Z\d%_.~+&=]*)*(\?[;&a-zA-Z\d%_.~+=-]*)?(\#[-a-zA-Z\d_]*)?$/;
Expand Down Expand Up @@ -415,18 +415,22 @@ export const hasSameMembers = <T>(a: T[], b: T[]): boolean => {
}
return true;
};
export const isFriend = (user: User): boolean => !!(user.friendDiscoveryKey || user.friendName);
export const isFriend = (user: Nullable<User>): boolean => {
if (!user) return false;
return !!(user.friendDiscoveryKey || user.friendName);
};

export const filterMessageListParams = (
params: MessageListParams,
message: SendableMessageType,
): boolean => {
const { customTypesFilter = [] } = params;
// @ts-ignore
if (params?.messageTypeFilter && params.messageTypeFilter !== message.messageType) {
return false;
}
if (params?.customTypesFilter?.length > 0) {
const customTypes = params.customTypesFilter.filter((item) => item !== '*');
if (customTypesFilter?.length > 0) {
const customTypes = customTypesFilter.filter((item) => item !== '*');
// Because Chat SDK inserts '*' when customTypes is empty
if (customTypes.length > 0 && !customTypes.includes(message.customType)) {
return false;
Expand Down Expand Up @@ -676,7 +680,7 @@ export interface StringObj {
export const convertWordToStringObj = (word: string, _users: Array<User>, _template?: string): Array<StringObj> => {
const users = _users || [];
const template = _template || '@'; // Use global variable
const resultArray = [];
const resultArray: Array<StringObj> = [];
const regex = RegExp(`${template}{(${users.map((user) => user?.userId).join('|')})}`, 'g');
let excutionResult;
let lastIndex = 0;
Expand Down