fix(app): invite member & presence counts (#59)

fluxer_app/src/components/channel/InviteEmbed.tsx

@@ -42,7 +42,6 @@ import {Tooltip} from '~/components/uikit/Tooltip/Tooltip';
 import {ComponentDispatch} from '~/lib/ComponentDispatch';
 import {Routes} from '~/Routes';
 import {UserRecord} from '~/records/UserRecord';
-import ChannelStore from '~/stores/ChannelStore';
 import GuildMemberStore from '~/stores/GuildMemberStore';
 import GuildStore from '~/stores/GuildStore';
 import InviteStore from '~/stores/InviteStore';
@@ -51,6 +50,7 @@ import UserStore from '~/stores/UserStore';
 
 import {isGroupDmInvite, isGuildInvite, isPackInvite as isPackInviteGuard} from '~/types/InviteTypes';
 import * as AvatarUtils from '~/utils/AvatarUtils';
+import {getGroupDmInviteCounts} from '~/utils/invite/GroupDmInviteCounts';
 import {
 	GuildInvitePrimaryAction,
 	getGuildInviteActionState,
@@ -58,7 +58,6 @@ import {
 	isGuildInviteActionDisabled,
 } from '~/utils/invite/GuildInviteActionState';
 import * as RouterUtils from '~/utils/RouterUtils';
-
 import {getGroupDMTitle, getGuildEmbedSplashAspectRatio, getImageAspectRatioFromBase64} from './InviteEmbed/utils';
 import styles from './InviteEmbed.module.css';
 
@@ -146,8 +145,12 @@ export const InviteEmbed = observer(function InviteEmbed({code}: InviteEmbedProp
 		const groupDMPath = Routes.dmChannel(invite.channel.id);
 		const handleAcceptInvite = () => InviteActionCreators.acceptAndTransitionToChannel(invite.code, i18n);
 		const handleNavigateToGroup = () => RouterUtils.transitionTo(groupDMPath);
-		const isAlreadyInGroupDM = !!ChannelStore.getChannel(invite.channel.id);
-		const memberCount = invite.member_count ?? 0;
+		const groupDMCounts = getGroupDmInviteCounts({
+			channelId: invite.channel.id,
+			inviteMemberCount: invite.member_count,
+		});
+		const isAlreadyInGroupDM = groupDMCounts.hasLocalChannel;
+		const memberCount = groupDMCounts.memberCount;
 
 		return (
 			<EmbedCard

fluxer_app/src/components/modals/InviteAcceptModal.tsx

@@ -32,6 +32,7 @@ import foodPatternUrl from '~/images/i-like-food.svg';
 import InviteStore from '~/stores/InviteStore';
 import {isGroupDmInvite, isGuildInvite, isPackInvite as isPackInviteGuard} from '~/types/InviteTypes';
 import * as AvatarUtils from '~/utils/AvatarUtils';
+import {getGroupDmInviteCounts} from '~/utils/invite/GroupDmInviteCounts';
 import {
 	GuildInvitePrimaryAction,
 	getGuildInviteActionState,
@@ -57,6 +58,13 @@ export const InviteAcceptModal = observer(function InviteAcceptModal({code}: Inv
 	}, [code, inviteState]);
 
 	const isGroupDM = invite != null && isGroupDmInvite(invite);
+	const groupDMCounts =
+		invite && isGroupDM
+			? getGroupDmInviteCounts({
+					channelId: invite.channel.id,
+					inviteMemberCount: invite.member_count,
+				})
+			: null;
 	const isPackInvite = invite != null && isPackInviteGuard(invite);
 
 	const guildActionState = getGuildInviteActionState({invite});
@@ -64,12 +72,18 @@ export const InviteAcceptModal = observer(function InviteAcceptModal({code}: Inv
 
 	const inviteForHeader = React.useMemo(() => {
 		if (!invite) return null;
+		if (isGroupDM && groupDMCounts) {
+			return {
+				...invite,
+				member_count: groupDMCounts.memberCount,
+			};
+		}
 		return {
 			...invite,
 			presence_count: presenceCount,
 			member_count: memberCount,
 		};
-	}, [invite, presenceCount, memberCount]);
+	}, [invite, isGroupDM, presenceCount, memberCount, groupDMCounts?.memberCount]);
 
 	const splashUrl = React.useMemo(() => {
 		if (!invite || !isGuildInvite(invite)) {