From c8ef0b9d4b2ee15cadb2404f80f4df6c577308c0 Mon Sep 17 00:00:00 2001
From: Nikhil Kothari <nik.kothari22@live.com>
Date: Sat, 17 Aug 2024 20:28:05 +0530
Subject: [PATCH 1/2] feat: start Google Meet via events from a channel

---
 .../components/common/LinkField/LinkField.tsx |  22 ++-
 .../feature/chat-header/ChannelHeaderMenu.tsx |  16 +-
 .../Renderers/TiptapRenderer/Link.tsx         |  91 ++++-----
 .../meetings/CreateMeetingDialog.tsx          |  44 +++++
 .../meetings/CreateMeetingForm.tsx            | 180 ++++++++++++++++++
 raven/api/events.py                           | 109 +++++++++++
 raven/api/raven_message.py                    |   2 +-
 7 files changed, 411 insertions(+), 53 deletions(-)
 create mode 100644 frontend/src/components/feature/integrations/meetings/CreateMeetingDialog.tsx
 create mode 100644 frontend/src/components/feature/integrations/meetings/CreateMeetingForm.tsx
 create mode 100644 raven/api/events.py

diff --git a/frontend/src/components/common/LinkField/LinkField.tsx b/frontend/src/components/common/LinkField/LinkField.tsx
index 10828203c..34d3837ee 100644
--- a/frontend/src/components/common/LinkField/LinkField.tsx
+++ b/frontend/src/components/common/LinkField/LinkField.tsx
@@ -16,11 +16,13 @@ export interface LinkFieldProps {
     value: string,
     setValue: (value: string) => void,
     disabled?: boolean,
-    autofocus?: boolean
+    autofocus?: boolean,
+    dropdownClass?: string,
+    required?: boolean,
 }
 
 
-const LinkField = ({ doctype, filters, label, placeholder, value, setValue, disabled, autofocus }: LinkFieldProps) => {
+const LinkField = ({ doctype, filters, label, placeholder, value, required, setValue, disabled, autofocus, dropdownClass }: LinkFieldProps) => {
 
     const [searchText, setSearchText] = useState('')
 
@@ -53,9 +55,11 @@ const LinkField = ({ doctype, filters, label, placeholder, value, setValue, disa
         },
     })
 
+    console.log(isOpen)
+
     return <div className="w-full">
-        <div className="flex flex-col gap-1">
-            <Label className="w-fit" {...getLabelProps()}>
+        <div className="flex flex-col">
+            <Label className="w-fit" isRequired={required} {...getLabelProps()}>
                 {label}
             </Label>
             <TextField.Root
@@ -68,9 +72,15 @@ const LinkField = ({ doctype, filters, label, placeholder, value, setValue, disa
 
             </TextField.Root>
         </div>
+        {isOpen && !items.length && (
+            <div
+                className={clsx(`p-2 sm:w-[550px] w-[24rem] absolute bg-background rounded-b-md mt-1 shadow-md z-[9999] max-h-96 overflow-scroll`, dropdownClass)}>
+                <Text as='span' size='2' color='gray'>No results found</Text>
+            </div>
+        )}
         <ul
-            className={`sm:w-[550px] w-[24rem] absolute bg-background rounded-b-md mt-1 shadow-md z-[9999] max-h-96 overflow-scroll p-0 ${!(isOpen && items.length) && 'hidden'
-                }`}
+            className={clsx(`sm:w-[550px] w-[24rem] absolute bg-background rounded-b-md mt-1 shadow-md z-[9999] max-h-96 overflow-scroll p-0 ${!(isOpen && items.length) && 'hidden'
+                }`, dropdownClass)}
             {...getMenuProps()}
         >
             {isOpen &&
diff --git a/frontend/src/components/feature/chat-header/ChannelHeaderMenu.tsx b/frontend/src/components/feature/chat-header/ChannelHeaderMenu.tsx
index 6324e217b..991c64cb9 100644
--- a/frontend/src/components/feature/chat-header/ChannelHeaderMenu.tsx
+++ b/frontend/src/components/feature/chat-header/ChannelHeaderMenu.tsx
@@ -1,6 +1,6 @@
 import { useBoolean } from '@/hooks/useBoolean'
 import { DropdownMenu, Flex, IconButton } from '@radix-ui/themes'
-import { BiDotsVerticalRounded, BiFile, BiSearch, BiUserPlus } from 'react-icons/bi'
+import { BiDotsVerticalRounded, BiFile, BiSearch, BiVideoPlus } from 'react-icons/bi'
 import { ViewFilesButton } from '../files/ViewFilesButton'
 import AddChannelMembersModal from '../channel-member-details/add-members/AddChannelMembersModal'
 import { useParams } from 'react-router-dom'
@@ -12,6 +12,7 @@ import { UserContext } from '@/utils/auth/UserProvider'
 import ViewChannelDetailsModal from '../channels/ViewChannelDetailsModal'
 import { SlSettings } from 'react-icons/sl'
 import { TbUsersPlus } from 'react-icons/tb'
+import CreateMeetingDialog from '../integrations/meetings/CreateMeetingDialog'
 
 type Props = {
     channelData: ChannelListItem,
@@ -30,6 +31,7 @@ const ChannelHeaderMenu = ({ channelData }: Props) => {
     const [isAddMembersOpen, { on: onAddMembersOpen }, onAddMembersChange] = useBoolean(false)
     const [isGlobalSearchModalOpen, { on: onGlobalSearchModalOpen, off: onGlobalSearchModalClose }] = useBoolean(false)
     const [isChannelDetailsOpen, { on: onChannelDetailsOpen }, onChannelDetailsChange] = useBoolean(false)
+    const [isMeetingModalOpen, { on: onMeetingModalOpen }, onMeetingModalChange] = useBoolean(false)
 
     const canAddMembers = useMemo(() => {
         if (channelData.type === 'Open') return false
@@ -48,6 +50,12 @@ const ChannelHeaderMenu = ({ channelData }: Props) => {
                 </IconButton>
             </DropdownMenu.Trigger>
             <DropdownMenu.Content className='min-w-48'>
+                <DropdownMenu.Item onClick={onMeetingModalOpen}>
+                    <Flex gap='2' align='center'>
+                        <BiVideoPlus size={ICON_SIZE} />
+                        Start a Meeting
+                    </Flex>
+                </DropdownMenu.Item>
                 <DropdownMenu.Item onClick={onGlobalSearchModalOpen}>
                     <Flex gap='2' align='center'>
                         <BiSearch size={ICON_SIZE} />
@@ -101,6 +109,12 @@ const ChannelHeaderMenu = ({ channelData }: Props) => {
                 setOpen={onChannelDetailsChange}
                 channelData={channelData}
             />
+
+            <CreateMeetingDialog
+                isOpen={isMeetingModalOpen}
+                setOpen={onMeetingModalChange}
+                channelData={channelData}
+            />
         </>
     )
 }
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/Link.tsx b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/Link.tsx
index 1f8ed5566..3783f3d1c 100644
--- a/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/Link.tsx
+++ b/frontend/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/Link.tsx
@@ -93,58 +93,59 @@ export const LinkPreview = memo(({ messageID }: { messageID: string }) => {
         })
     }
 
-    if (!href) return null
-
     const linkPreview = data?.message?.[0]
 
-    return <Box py='2'>
-        {linkPreview ? linkPreview.site_name && linkPreview.description ? <Flex className='gap-2 sm:gap-4 sm:flex-start items-center' width='100%'>
-            {(linkPreview.absolute_image || linkPreview.image) &&
-                <a href={href} target='_blank'>
-                    <Box className='relative w-18 min-w-20 min-h-12 h-12 sm:min-w-64 sm:min-h-32 sm:w-64 sm:h-32'>
-                        {/* Absolute positioned skeleton loader */}
-                        <Box className='absolute top-0 z-0 left-0 w-20 h-12 sm:w-64 sm:h-32' >
-                            <Box className='animate-pulse bg-gray-3 z-0 w-20 h-12 sm:w-64 sm:h-32 dark:bg-gray-5 rounded-md'>
+    if (!href || !linkPreview) return null
+
+    if (linkPreview && linkPreview.site_name && linkPreview.description) {
+        return <Box py='2'>
+            <Flex className='gap-2 sm:gap-4 sm:flex-start items-center' width='100%'>
+                {(linkPreview.absolute_image || linkPreview.image) &&
+                    <a href={href} target='_blank'>
+                        <Box className='relative w-18 min-w-20 min-h-12 h-12 sm:min-w-64 sm:min-h-32 sm:w-64 sm:h-32'>
+                            {/* Absolute positioned skeleton loader */}
+                            <Box className='absolute top-0 z-0 left-0 w-20 h-12 sm:w-64 sm:h-32' >
+                                <Box className='animate-pulse bg-gray-3 z-0 w-20 h-12 sm:w-64 sm:h-32 dark:bg-gray-5 rounded-md'>
 
+                                </Box>
                             </Box>
+                            <img
+                                width='100%'
+                                className='absolute object-cover min-w-20 sm:min-w-64 min-h-12 sm:min-h-32 w-20 sm:w-64 h-12 sm:h-32 rounded-md z-50 top-0 left-0'
+                                src={linkPreview.absolute_image || linkPreview.image}
+                                alt={linkPreview.title} />
                         </Box>
-                        <img
-                            width='100%'
-                            className='absolute object-cover min-w-20 sm:min-w-64 min-h-12 sm:min-h-32 w-20 sm:w-64 h-12 sm:h-32 rounded-md z-50 top-0 left-0'
-                            src={linkPreview.absolute_image || linkPreview.image}
-                            alt={linkPreview.title} />
-                    </Box>
-                </a>
-            }
-            <Flex className='group sm:pr-2 sm:gap-2 gap-0' width='100%'>
-                <a href={href} target='_blank' className='block w-full'>
-
-                    <Flex direction='column' gap='1' className='sm:py-1'>
-                        <Flex gap='1' className='sm:flex-col flex-col-reverse'>
-                            <Text as='span' weight='bold' className='sm:text-base text-xs'>{linkPreview.title}</Text>
-                            <Text as='span' color='gray' weight='medium' className='sm:text-md text-xs'>{linkPreview.site_name}</Text>
+                    </a>
+                }
+                <Flex className='group sm:pr-2 sm:gap-2 gap-0' width='100%'>
+                    <a href={href} target='_blank' className='block w-full'>
+
+                        <Flex direction='column' gap='1' className='sm:py-1'>
+                            <Flex gap='1' className='sm:flex-col flex-col-reverse'>
+                                <Text as='span' weight='bold' className='sm:text-base text-xs'>{linkPreview.title}</Text>
+                                <Text as='span' color='gray' weight='medium' className='sm:text-md text-xs'>{linkPreview.site_name}</Text>
+                            </Flex>
+                            <Text as='p' size='1' className='whitespace-break-spaces sm:block hidden'>{linkPreview.description}</Text>
                         </Flex>
-                        <Text as='p' size='1' className='whitespace-break-spaces sm:block hidden'>{linkPreview.description}</Text>
-                    </Flex>
-                </a>
-                <div className='group-hover:visible invisible sm:block hidden'>
-                    <Tooltip content='Hide link preview'>
-                        <IconButton size='1'
-                            color='gray'
-                            className='cursor-pointer'
-                            aria-label='Hide link preview'
-                            variant='soft'
-                            onClick={hidePreviewLink}
-                        >
-                            <BiX size='20' />
-                        </IconButton>
-                    </Tooltip>
-                </div>
+                    </a>
+                    <div className='group-hover:visible invisible sm:block hidden'>
+                        <Tooltip content='Hide link preview'>
+                            <IconButton size='1'
+                                color='gray'
+                                className='cursor-pointer'
+                                aria-label='Hide link preview'
+                                variant='soft'
+                                onClick={hidePreviewLink}
+                            >
+                                <BiX size='20' />
+                            </IconButton>
+                        </Tooltip>
+                    </div>
+                </Flex>
             </Flex>
-        </Flex> : null :
+        </Box>
+    }
 
-            null
-        }
-    </Box>
+    return null
 
 })
\ No newline at end of file
diff --git a/frontend/src/components/feature/integrations/meetings/CreateMeetingDialog.tsx b/frontend/src/components/feature/integrations/meetings/CreateMeetingDialog.tsx
new file mode 100644
index 000000000..df7d88494
--- /dev/null
+++ b/frontend/src/components/feature/integrations/meetings/CreateMeetingDialog.tsx
@@ -0,0 +1,44 @@
+import { Drawer, DrawerContent } from '@/components/layout/Drawer'
+import { useIsDesktop } from '@/hooks/useMediaQuery'
+import { ChannelListItem } from '@/utils/channel/ChannelListProvider'
+import { DIALOG_CONTENT_CLASS } from '@/utils/layout/dialog'
+import { Dialog } from '@radix-ui/themes'
+import CreateMeetingForm from './CreateMeetingForm'
+
+interface CreateMeetingDialogProps {
+    isOpen: boolean,
+    setOpen: (open: boolean) => void
+    channelData: ChannelListItem
+}
+
+const CreateMeetingDialog = ({ isOpen, setOpen, channelData }: CreateMeetingDialogProps) => {
+
+
+    const isDesktop = useIsDesktop()
+
+    if (isDesktop) {
+        return (
+            <Dialog.Root open={isOpen} onOpenChange={setOpen}>
+                <Dialog.Content className={DIALOG_CONTENT_CLASS}>
+                    <CreateMeetingForm
+                        channelData={channelData}
+                        onClose={() => setOpen(false)}
+                    />
+                </Dialog.Content>
+            </Dialog.Root>
+        )
+    } else {
+        return <Drawer open={isOpen} onOpenChange={setOpen}>
+            <DrawerContent>
+                <div className='pb-16 min-h-48 px-1 overflow-auto'>
+                    <CreateMeetingForm
+                        channelData={channelData}
+                        onClose={() => setOpen(false)}
+                    />
+                </div>
+            </DrawerContent>
+        </Drawer>
+    }
+}
+
+export default CreateMeetingDialog
\ No newline at end of file
diff --git a/frontend/src/components/feature/integrations/meetings/CreateMeetingForm.tsx b/frontend/src/components/feature/integrations/meetings/CreateMeetingForm.tsx
new file mode 100644
index 000000000..58d572df6
--- /dev/null
+++ b/frontend/src/components/feature/integrations/meetings/CreateMeetingForm.tsx
@@ -0,0 +1,180 @@
+import { ErrorText, Label } from '@/components/common/Form'
+import LinkFormField from '@/components/common/LinkField/LinkFormField'
+import { Loader } from '@/components/common/Loader'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { useGetUser } from '@/hooks/useGetUser'
+import { useIsDesktop } from '@/hooks/useMediaQuery'
+import { useUserData } from '@/hooks/useUserData'
+import { UserContext } from '@/utils/auth/UserProvider'
+import { ChannelListItem, DMChannelListItem } from '@/utils/channel/ChannelListProvider'
+import { Box, Button, Dialog, Flex, Link, Select, Text, TextArea } from '@radix-ui/themes'
+import { useFrappeGetCall, useFrappePostCall } from 'frappe-react-sdk'
+import { useContext } from 'react'
+import { Controller, FormProvider, useForm } from 'react-hook-form'
+import { toast } from 'sonner'
+
+type CreateMeetingFormProps = {
+    channelData: ChannelListItem | DMChannelListItem,
+    onClose: () => void
+}
+
+interface CreateMeetingFormFields {
+    channel: string
+    subject: string,
+    duration: string,
+    google_calendar: string,
+    description: string,
+    // participants: string[]
+}
+
+const CreateMeetingForm = ({ onClose, channelData }: CreateMeetingFormProps) => {
+
+    let defaultSubject = `Meeting with #${channelData.channel_name}`
+
+    const { currentUser } = useContext(UserContext)
+
+    const currentUserData = useUserData()
+
+    const peerUser = useGetUser((channelData as DMChannelListItem).peer_user_id ?? undefined)
+
+    if (channelData.is_direct_message) {
+        defaultSubject = `Meeting between ${peerUser?.full_name ?? (channelData as DMChannelListItem).peer_user_id} and ${currentUserData?.full_name ?? currentUser}`
+    }
+
+
+    const methods = useForm<CreateMeetingFormFields>({
+        defaultValues: {
+            channel: channelData.name,
+            subject: defaultSubject,
+            duration: '60',
+        }
+    })
+    const { control, handleSubmit, register, setValue, formState: { errors } } = methods
+
+    useFrappeGetCall('frappe.client.get_value', {
+        doctype: 'Google Calendar',
+        fieldname: ['name'],
+        filters: {
+            user: currentUser,
+            enable: 1
+        }
+    }, undefined, {
+        onSuccess: (data) => {
+            if (data.message)
+                setValue('google_calendar', data.message.name)
+        }
+    })
+
+    const { call, loading, error } = useFrappePostCall('raven.api.events.create_event')
+
+    const onSubmit = async (data: CreateMeetingFormFields) => {
+
+        return call(data).then((res) => {
+            toast.success("Meeting created", {
+                description: <Link
+                    href={res.message.google_meet_link}
+                    underline='always'
+                    className='cursor-pointer'
+                    target='_blank'
+                    rel='noreferrer'>{res.message.google_meet_link}</Link>
+            })
+            onClose()
+        })
+
+    }
+
+    return (
+        <FormProvider {...methods}>
+            <form onSubmit={handleSubmit(onSubmit)}>
+                <Dialog.Title>Start a Meeting</Dialog.Title>
+
+                <Flex gap='2' direction='column' width='100%'>
+                    <ErrorBanner error={error} />
+                    <Box width='100%'>
+                        <Flex direction='column' gap='2'>
+                            <Box>
+                                <Label htmlFor='subject' isRequired>Subject</Label>
+                                <TextArea
+                                    {...register('subject', { required: "Subject is required" })}
+                                />
+                            </Box>
+
+                            {errors?.subject && <ErrorText>{errors.subject?.message}</ErrorText>}
+                        </Flex>
+                    </Box>
+
+                    <Flex gap='2'>
+                        <Box width='100%'>
+                            <Flex direction='column' gap='2'>
+                                <Box width='100%'>
+                                    <Label htmlFor='duration' isRequired>Duration</Label>
+                                    <Controller
+                                        name="duration"
+                                        rules={{
+                                            required: "Duration is required"
+                                        }}
+                                        control={control}
+                                        render={({ field }) => (
+                                            <Select.Root value={field.value}
+                                                name={field.name}
+                                                required
+                                                onValueChange={field.onChange}
+                                            >
+                                                <Select.Trigger onBlur={field.onBlur} className='w-full' />
+                                                <Select.Content>
+                                                    <Select.Item value="15">15 minutes</Select.Item>
+                                                    <Select.Item value="30">30 minutes</Select.Item>
+                                                    <Select.Item value="60">1 hour</Select.Item>
+                                                    <Select.Item value="120">2 hours</Select.Item>
+                                                </Select.Content>
+                                            </Select.Root>
+                                        )}
+                                    />
+                                </Box>
+                                {errors?.duration && <ErrorText>{errors.duration?.message}</ErrorText>}
+                            </Flex>
+                        </Box>
+
+                        <Box width='100%'>
+                            <Flex direction='column' gap='2'>
+                                <LinkFormField
+                                    name='google_calendar'
+                                    label='Google Calendar'
+                                    required
+                                    dropdownClass='sm:w-[255px] w-[10rem]'
+                                    rules={{
+                                        required: 'Calendar is required',
+                                    }}
+                                    filters={[["enable", "=", 1], ["user", "=", currentUser]]}
+                                    doctype="Google Calendar"
+                                />
+                                <ErrorText>{methods.formState.errors.google_calendar?.message}</ErrorText>
+                            </Flex>
+                        </Box>
+                    </Flex>
+
+                    <Box width='100%'>
+                        <Label htmlFor='description'>Description <Text as='span' size='1' color='gray'> (Optional)</Text></Label>
+                        <TextArea
+                            {...register('description')}
+                        />
+
+                        {errors?.description && <ErrorText>{errors.description?.message}</ErrorText>}
+                    </Box>
+                </Flex>
+
+                <Flex gap="3" mt="6" justify="end" align='center'>
+                    <Dialog.Close disabled={loading}>
+                        <Button variant="soft" color="gray">Cancel</Button>
+                    </Dialog.Close>
+                    <Button type='submit' disabled={loading}>
+                        {loading && <Loader />}
+                        {loading ? "Creating" : "Create"}
+                    </Button>
+                </Flex>
+            </form>
+        </FormProvider>
+    )
+}
+
+export default CreateMeetingForm
\ No newline at end of file
diff --git a/raven/api/events.py b/raven/api/events.py
new file mode 100644
index 000000000..56b704a2a
--- /dev/null
+++ b/raven/api/events.py
@@ -0,0 +1,109 @@
+import frappe
+
+
+@frappe.whitelist()
+def create_event(
+	channel: str, subject: str, duration: str, google_calendar: str = None, description: str = None
+):
+	"""
+	Create a new event with Google Meet enabled.
+	Once created, send a message to the channel with the event details.
+	"""
+	# Create a new event
+	if isinstance(duration, str):
+		duration = int(duration)
+
+	if not google_calendar:
+		google_calendar = frappe.get_value(
+			"Google Calendar", {"enable": 1, "user": frappe.session.user}, "name"
+		)
+
+	if not google_calendar:
+		frappe.throw("Google Calendar not found for the current user")
+
+	event = frappe.get_doc(
+		{
+			"doctype": "Event",
+			"subject": subject,
+			"starts_on": frappe.utils.now_datetime(),
+			"ends_on": frappe.utils.add_to_date(frappe.utils.now_datetime(), minutes=duration),
+			"description": description,
+			"send_reminder": 0,
+		}
+	)
+
+	event.save()
+
+	add_participants(event, channel)
+
+	event = update_meeting_details(event, google_calendar)
+
+	# Send a message to the channel
+	doc = frappe.get_doc(
+		{
+			"doctype": "Raven Message",
+			"channel_id": channel,
+			"text": '<p>To join the meeting, click on the link below: <a href="{0}">{0}</a></p>'.format(
+				event.google_meet_link
+			),
+			"message_type": "Text",
+			"hide_link_preview": 1,
+			"link_doctype": "Event",
+			"link_document": event.name,
+		}
+	)
+	doc.insert()
+
+	return event
+
+
+def add_participants(event, channel):
+	"""
+	Add participants to the event and send a message to the channel with the event details.
+	"""
+	participants = [frappe.session.user]
+	channel_type = frappe.get_cached_value("Raven Channel", channel, "type")
+
+	if channel_type == "Open":
+		# Only add the current user
+		pass
+
+	else:
+		# Add all members of the channel
+		members = frappe.get_all(
+			"Raven Channel Member", filters={"channel_id": channel}, pluck="user_id"
+		)
+
+		for member in members:
+			if member not in participants:
+				participants.append(member)
+
+	for participant in participants:
+		contact_name = frappe.db.exists("Contact", {"user": participant})
+		if contact_name:
+			frappe.get_doc(
+				{
+					"doctype": "Event Participants",
+					"reference_doctype": "Contact",
+					"reference_docname": contact_name,
+					"email": participant,
+					"parent": event.name,
+					"parenttype": "Event",
+					"parentfield": "event_participants",
+				}
+			).save()
+
+
+def update_meeting_details(event, calendar):
+	event.reload()
+	event.update(
+		{
+			"sync_with_google_calendar": 1,
+			"add_video_conferencing": 1,
+			"google_calendar": calendar,
+		}
+	)
+	event.save()
+	event.reload()
+
+	return event
diff --git a/raven/api/raven_message.py b/raven/api/raven_message.py
index 985b5e411..34f626d0b 100644
--- a/raven/api/raven_message.py
+++ b/raven/api/raven_message.py
@@ -11,7 +11,7 @@
 
 
 @frappe.whitelist(methods=["POST"])
-def send_message(channel_id, text, is_reply, linked_message=None, json_content=None):
+def send_message(channel_id, text, is_reply=False, linked_message=None, json_content=None):
 
 	# remove empty list items
 	clean_text = text.replace("<li><br></li>", "").strip()

From a2f143c3e56223d8afec32b6068644eb88d1be14 Mon Sep 17 00:00:00 2001
From: Nikhil Kothari <nik.kothari22@live.com>
Date: Sun, 18 Aug 2024 18:07:14 +0530
Subject: [PATCH 2/2] fix: revalidate messages on focus

---
 frontend/package.json                                           | 2 +-
 .../src/components/feature/chat/ChatStream/useChatStream.ts     | 2 +-
 package.json                                                    | 2 +-
 raven/__init__.py                                               | 2 +-
 raven/package.json                                              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index aee6f044b..2225a1b80 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -2,7 +2,7 @@
   "name": "raven-ui",
   "private": true,
   "license": "AGPL-3.0-only",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/frontend/src/components/feature/chat/ChatStream/useChatStream.ts b/frontend/src/components/feature/chat/ChatStream/useChatStream.ts
index 9d1f0f58b..5500c7d2b 100644
--- a/frontend/src/components/feature/chat/ChatStream/useChatStream.ts
+++ b/frontend/src/components/feature/chat/ChatStream/useChatStream.ts
@@ -72,7 +72,7 @@ const useChatStream = (scrollRef: MutableRefObject<HTMLDivElement | null>) => {
         'channel_id': channelID,
         'base_message': state?.baseMessage ? state.baseMessage : undefined
     }, { path: `get_messages_for_channel_${channelID}`, baseMessage: state?.baseMessage }, {
-        revalidateOnFocus: false,
+        revalidateOnFocus: true,
         onSuccess: (data) => {
             if (!highlightedMessage) {
                 if (!data.message.has_new_messages) {
diff --git a/package.json b/package.json
index 8b00d2706..689c7537c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "raven",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "Messaging Application",
   "workspaces": [
     "frontend"
diff --git a/raven/__init__.py b/raven/__init__.py
index 773631a95..a13aafced 100644
--- a/raven/__init__.py
+++ b/raven/__init__.py
@@ -1 +1 @@
-__version__ = "1.6.9"
+__version__ = "1.6.10"
diff --git a/raven/package.json b/raven/package.json
index e65f36bf9..c43b015b8 100644
--- a/raven/package.json
+++ b/raven/package.json
@@ -1,6 +1,6 @@
 {
   "name": "raven-app",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "description": "",
   "main": "index.js",
   "scripts": {