From d4c44a1ce14b3841ad29cda4fa300aad9836b57f Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Tue, 2 Sep 2025 13:53:01 +0700
Subject: [PATCH 01/25] Create separate love client

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 plugins/love-resources/src/loveClient.ts | 127 +++++++++++++++++++++++
 plugins/love-resources/src/utils.ts      |  99 +-----------------
 2 files changed, 132 insertions(+), 94 deletions(-)
 create mode 100644 plugins/love-resources/src/loveClient.ts

diff --git a/plugins/love-resources/src/loveClient.ts b/plugins/love-resources/src/loveClient.ts
new file mode 100644
index 00000000000..fcd567ec9d5
--- /dev/null
+++ b/plugins/love-resources/src/loveClient.ts
@@ -0,0 +1,127 @@
+import { concatLink, type Ref } from "@hcengineering/core"
+import love, { type Room } from "@hcengineering/love"
+import { getMetadata } from "@hcengineering/platform"
+import presentation from "@hcengineering/presentation"
+import { getPlatformToken, lk } from "./utils"
+import { getCurrentEmployee } from "@hcengineering/contact"
+import { getPersonByPersonRef } from "@hcengineering/contact-resources"
+import { Analytics } from "@hcengineering/analytics"
+import { currentMeetingMinutes } from "./stores"
+import { get } from "svelte/store"
+
+interface RoomToken {
+  issuedOn: number
+  token: string
+}
+export function getLoveClient() {
+  return new LoveClient()
+}
+
+export class LoveClient {
+  private tokens: Map<Ref<Room>, RoomToken>
+
+  constructor() {
+    this.tokens = new Map<Ref<Room>, RoomToken>()
+
+  }
+
+  async getRoomToken (room: Room): Promise<string> {
+    const currentTime = Date.now()
+    let roomToken: RoomToken | undefined = this.tokens.get(room._id)
+    // refresh token after 8 minutes, server sets token ttl to 10 minutes
+    if (roomToken === undefined || currentTime - roomToken.issuedOn >= 8 * 60 * 1000) {
+      roomToken = { issuedOn: currentTime, token: await this.refreshRoomToken(room) }
+      this.tokens.set(room._id, roomToken)
+    }
+    return roomToken.token
+  }
+
+  async updateSessionLanguage (room: Room): Promise<void> {
+    try {
+      const endpoint = this.getLoveEndpoint()
+      const token = getPlatformToken()
+      const roomName = this.getTokenRoomName(room)
+
+      await fetch(concatLink(endpoint, '/language'), {
+        method: 'POST',
+        headers: {
+          Authorization: 'Bearer ' + token,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ roomName, room: room.name, language: room.language })
+      })
+    } catch (err: any) {
+      Analytics.handleError(err)
+      console.error(err)
+    }
+  }
+
+  async record (room: Room): Promise<void> {
+    try {
+      const endpoint = this.getLoveEndpoint()
+      const token = getPlatformToken()
+      const roomName = this.getTokenRoomName(room)
+      if (lk.isRecording) {
+        await fetch(concatLink(endpoint, '/stopRecord'), {
+          method: 'POST',
+          headers: {
+            Authorization: 'Bearer ' + token,
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ roomName, room: room.name })
+        })
+      } else {
+        await fetch(concatLink(endpoint, '/startRecord'), {
+          method: 'POST',
+          headers: {
+            Authorization: 'Bearer ' + token,
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ roomName, room: room.name, meetingMinutes: get(currentMeetingMinutes)?._id })
+        })
+      }
+    } catch (err: any) {
+      Analytics.handleError(err)
+      console.error(err)
+    }
+  }
+
+  private getLoveEndpoint (): string {
+    const endpoint = getMetadata(love.metadata.ServiceEnpdoint)
+    if (endpoint === undefined) {
+      throw new Error('Love service endpoint not found')
+    }
+
+    return endpoint
+  }
+
+  private async refreshRoomToken(room: Room): Promise<string> {
+    const sessionName = this.getTokenRoomName(room)
+    const endpoint = this.getLoveEndpoint()
+    if (endpoint === undefined) {
+      throw new Error('Love service endpoint not found')
+    }
+    const myPerson = await getPersonByPersonRef(getCurrentEmployee())
+    if (myPerson == null) {
+      throw new Error('Cannot find current person')
+    }
+    const platformToken = getPlatformToken()
+    const res = await fetch(concatLink(endpoint, '/getToken'), {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${platformToken}`,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({ roomName: sessionName, _id: myPerson._id, participantName: myPerson.name })
+    })
+    return await res.text()
+  }
+
+  private getTokenRoomName (room: Room): string {
+    const currentWorkspaceUuid = getMetadata(presentation.metadata.WorkspaceUuid)
+    if (currentWorkspaceUuid === undefined) {
+      throw new Error('Current workspace not found')
+    }
+    return `${currentWorkspaceUuid}_${room.name}_${room._id}`
+  }
+}
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index 064b9e7abb2..48bf943f5cf 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -75,40 +75,13 @@ import RoomSettingsPopup from './components/RoomSettingsPopup.svelte'
 import love from './plugin'
 import { $myPreferences, currentMeetingMinutes, currentRoom, myOffice, selectedRoomPlace } from './stores'
 import { getLiveKitClient } from './liveKitClient'
-
-export async function getToken (
-  roomName: string,
-  roomId: Ref<Room>,
-  userId: string,
-  participantName: string
-): Promise<string> {
-  const endpoint = getMetadata(love.metadata.ServiceEnpdoint)
-  if (endpoint === undefined) {
-    throw new Error('Love service endpoint not found')
-  }
-  const token = getPlatformToken()
-  const res = await fetch(concatLink(endpoint, '/getToken'), {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${token}`,
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify({ roomName: getTokenRoomName(roomName, roomId), _id: userId, participantName })
-  })
-  return await res.text()
-}
-
-function getTokenRoomName (roomName: string, roomId: Ref<Room>): string {
-  const currentWorkspaceUuid = getMetadata(presentation.metadata.WorkspaceUuid)
-  if (currentWorkspaceUuid === undefined) {
-    throw new Error('Current workspace not found')
-  }
-  return `${currentWorkspaceUuid}_${roomName}_${roomId}`
-}
+import { getLoveClient } from './loveClient'
 
 export const liveKitClient = getLiveKitClient()
 export const lk: LKRoom = liveKitClient.liveKitRoom
 
+const loveClient = getLoveClient()
+
 export function setCustomCreateScreenTracks (value: () => Promise<Array<LocalTrack<Track.Kind>>>): void {
   lk.localParticipant.createScreenTracks = value
 }
@@ -357,7 +330,7 @@ async function initRoomMetadata (metadata: string | undefined): Promise<void> {
   }
 
   if (get(isRecordingAvailable) && data.recording == null && room?.startWithRecording === true && !get(isRecording)) {
-    await record(room)
+    await loveClient.record(room)
   }
 }
 
@@ -534,7 +507,7 @@ export async function connectRoom (
     return
   }
   await disconnect()
-  const token = await getToken(room.name, room._id, currentPerson._id, currentPerson.name)
+  const token = await loveClient.getRoomToken(room)
   try {
     await withRetries(
       async () => {
@@ -700,36 +673,6 @@ export async function invite (person: Ref<Person>, room: Ref<Room> | undefined):
   })
 }
 
-export async function record (room: Room): Promise<void> {
-  try {
-    const endpoint = getLoveEndpoint()
-    const token = getPlatformToken()
-    const roomName = getTokenRoomName(room.name, room._id)
-    if (lk.isRecording) {
-      await fetch(concatLink(endpoint, '/stopRecord'), {
-        method: 'POST',
-        headers: {
-          Authorization: 'Bearer ' + token,
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ roomName, room: room.name })
-      })
-    } else {
-      await fetch(concatLink(endpoint, '/startRecord'), {
-        method: 'POST',
-        headers: {
-          Authorization: 'Bearer ' + token,
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ roomName, room: room.name, meetingMinutes: get(currentMeetingMinutes)?._id })
-      })
-    }
-  } catch (err: any) {
-    Analytics.handleError(err)
-    console.error(err)
-  }
-}
-
 async function checkRecordAvailable (): Promise<void> {
   try {
     const endpoint = getMetadata(love.metadata.ServiceEnpdoint)
@@ -810,15 +753,6 @@ export function getLiveKitEndpoint (): string {
   return endpoint
 }
 
-export function getLoveEndpoint (): string {
-  const endpoint = getMetadata(love.metadata.ServiceEnpdoint)
-  if (endpoint === undefined) {
-    throw new Error('Love service endpoint not found')
-  }
-
-  return endpoint
-}
-
 export function getPlatformToken (): string {
   const token = getMetadata(presentation.metadata.Token)
   if (token === undefined) {
@@ -842,29 +776,6 @@ export async function stopTranscription (room: Room): Promise<void> {
   await disconnectMeeting(room._id)
 }
 
-export async function updateSessionLanguage (room: Room): Promise<void> {
-  const current = get(currentRoom)
-  if (current === undefined || room._id !== current._id || !get(isTranscription)) return
-
-  try {
-    const endpoint = getLoveEndpoint()
-    const token = getPlatformToken()
-    const roomName = getTokenRoomName(room.name, room._id)
-
-    await fetch(concatLink(endpoint, '/language'), {
-      method: 'POST',
-      headers: {
-        Authorization: 'Bearer ' + token,
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({ roomName, room: room.name, language: room.language })
-    })
-  } catch (err: any) {
-    Analytics.handleError(err)
-    console.error(err)
-  }
-}
-
 export async function showRoomSettings (room?: Room): Promise<void> {
   if (room === undefined) return
 

From e34da1831f3c1cc6534672a204dcc8b14795b2ea Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Tue, 2 Sep 2025 16:26:48 +0700
Subject: [PATCH 02/25] Add prepare connection

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 plugins/love-resources/src/components/EditRoom.svelte  |  3 ++-
 plugins/love-resources/src/components/RoomPopup.svelte |  8 ++++++--
 plugins/love-resources/src/liveKitClient.ts            | 10 ++++++----
 plugins/love-resources/src/utils.ts                    |  9 ++++++++-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/plugins/love-resources/src/components/EditRoom.svelte b/plugins/love-resources/src/components/EditRoom.svelte
index b5a941e7e06..0f1dc59ea9c 100644
--- a/plugins/love-resources/src/components/EditRoom.svelte
+++ b/plugins/love-resources/src/components/EditRoom.svelte
@@ -19,7 +19,7 @@
   import { IntlString } from '@hcengineering/platform'
 
   import love from '../plugin'
-  import { getRoomName, tryConnect } from '../utils'
+  import { getRoomName, prepareRoomConnection, tryConnect } from '../utils'
   import { infos, invites, myInfo, myRequests, selectedRoomPlace, myOffice, currentRoom } from '../stores'
   import { lkSessionConnected } from '../liveKitClient'
 
@@ -35,6 +35,7 @@
   let connecting = false
 
   onMount(() => {
+    prepareRoomConnection(object)
     dispatch('open', { ignoreKeys: ['name'] })
   })
 
diff --git a/plugins/love-resources/src/components/RoomPopup.svelte b/plugins/love-resources/src/components/RoomPopup.svelte
index a791d3ae9ab..bb1c6d8223f 100644
--- a/plugins/love-resources/src/components/RoomPopup.svelte
+++ b/plugins/love-resources/src/components/RoomPopup.svelte
@@ -23,10 +23,10 @@
   import { getClient } from '@hcengineering/presentation'
   import view from '@hcengineering/view'
   import { getObjectLinkFragment } from '@hcengineering/view-resources'
-  import { createEventDispatcher } from 'svelte'
+  import { createEventDispatcher, onMount } from 'svelte'
   import love from '../plugin'
   import { currentMeetingMinutes, infos, invites, myInfo, myRequests } from '../stores'
-  import { tryConnect } from '../utils'
+  import { prepareRoomConnection, tryConnect } from '../utils'
   import { lkSessionConnected } from '../liveKitClient'
   import MicrophoneButton from './meeting/controls/MicrophoneButton.svelte'
   import CameraButton from './meeting/controls/CameraButton.svelte'
@@ -45,6 +45,10 @@
     return await getPersonByPersonRef(info.person)
   }
 
+  onMount(() => {
+    prepareRoomConnection(room)
+  })
+
   let joined: boolean = false
   $: joined = $myInfo?.room === room._id
 
diff --git a/plugins/love-resources/src/liveKitClient.ts b/plugins/love-resources/src/liveKitClient.ts
index 680f2850a09..a98b6e03f87 100644
--- a/plugins/love-resources/src/liveKitClient.ts
+++ b/plugins/love-resources/src/liveKitClient.ts
@@ -24,8 +24,7 @@ const LAST_PARTICIPANT_NOTIFICATION_DELAY_MS = 2 * 60 * 1000
 const AUTO_DISCONNECT_DELAY_MS = 60 * 1000
 
 export function getLiveKitClient (): LiveKitClient {
-  const wsURL = getMetadata(love.metadata.WebSocketURL)
-  return new LiveKitClient(wsURL ?? '')
+  return new LiveKitClient()
 }
 
 const defaultCaptureOptions: VideoCaptureOptions = {
@@ -45,7 +44,7 @@ export class LiveKitClient {
   private lastParticipantNotificationTimeout: number = -1
   private lastParticipantDisconnectTimeout: number = -1
 
-  constructor (wsUrl: string) {
+  constructor () {
     const lkRoom = new LKRoom({
       adaptiveStream: true,
       dynacast: true,
@@ -67,12 +66,15 @@ export class LiveKitClient {
       },
       videoCaptureDefaults: defaultCaptureOptions
     })
-    void lkRoom.prepareConnection(wsUrl)
     lkRoom.on(RoomEvent.Connected, this.onConnected)
     lkRoom.on(RoomEvent.Disconnected, this.onDisconnected)
     this.liveKitRoom = lkRoom
   }
 
+  async prepareConnection (wsUrl: string, token:string): Promise<void> {
+    await this.liveKitRoom.prepareConnection(wsUrl, token)
+  }
+
   async connect (wsURL: string, token: string, withVideo: boolean): Promise<void> {
     this.currentSessionSupportsVideo = withVideo
     try {
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index b81e668ac5b..0bd7498fdd5 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -449,7 +449,9 @@ async function moveToRoom (
 
 async function connectLK (token: string, room: Room): Promise<void> {
   const wsURL = getLiveKitEndpoint()
-  await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
+  // await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
+  liveKitClient.liveKitRoom.simulateParticipants( { publish: {audio: true, video: true, useRealTracks: true}, participants: {count: 20, audio: true, video: true}}
+  )
 }
 
 async function navigateToOfficeDoc (hierarchy: Hierarchy, object: Doc): Promise<void> {
@@ -478,6 +480,11 @@ async function initMeetingMinutes (room: Room): Promise<void> {
   }
 }
 
+export async function prepareRoomConnection(room: Room): Promise<void> {
+  const roomToken = await loveClient.getRoomToken(room)
+  liveKitClient.prepareConnection(getLiveKitEndpoint(), roomToken)
+}
+
 export async function connectRoom (
   x: number,
   y: number,

From c5b8adcb100433f3e1ca54c5c757c45605a5be91 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Fri, 5 Sep 2025 12:48:13 +0700
Subject: [PATCH 03/25] Move track handlers to the livekit client

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../components/SharingStateIndicator.svelte   |  12 +-
 .../src/components/meeting/ControlBar.svelte  |   6 +-
 .../meeting/controls/ShareScreenButton.svelte |  16 ++-
 plugins/love-resources/src/liveKitClient.ts   | 135 +++++++++++++++---
 plugins/love-resources/src/loveClient.ts      |  29 ++--
 plugins/love-resources/src/utils.ts           | 113 +--------------
 6 files changed, 151 insertions(+), 160 deletions(-)

diff --git a/plugins/love-resources/src/components/SharingStateIndicator.svelte b/plugins/love-resources/src/components/SharingStateIndicator.svelte
index 5aab12e21ee..c6051609541 100644
--- a/plugins/love-resources/src/components/SharingStateIndicator.svelte
+++ b/plugins/love-resources/src/components/SharingStateIndicator.svelte
@@ -16,13 +16,12 @@
   import { tooltip, eventToHTMLElement, showPopup } from '@hcengineering/ui'
 
   import love from '../plugin'
-  import { isSharingEnabled, isShareWithSound, screenSharing, liveKitClient } from '../utils'
+  import { isShareWithSound, liveKitClient } from '../utils'
 
   import SharingStatePopup from './SharingStatePopup.svelte'
   import IconShare from './icons/Share.svelte'
-  import { lkSessionConnected } from '../liveKitClient'
+  import { lkSessionConnected, ScreenSharingState, screenSharingState } from '../liveKitClient'
 
-  let disabled: boolean = false
   let pressed: boolean = false
 
   function handleShowPopup (ev: MouseEvent): void {
@@ -33,15 +32,13 @@
   }
 
   function handleShare (): void {
-    if (disabled) return
+    if ($screenSharingState !== ScreenSharingState.Inactive) return
     void liveKitClient.setScreenShareEnabled(true, $isShareWithSound)
   }
-
-  $: disabled = !$screenSharing && !$lkSessionConnected
 </script>
 
 {#if $lkSessionConnected}
-  {#if $isSharingEnabled}
+  {#if $screenSharingState === ScreenSharingState.Local}
     <button
       class="hulyStatusBarButton mini positive positiveContent"
       class:pressed
@@ -54,7 +51,6 @@
     <button
       class="hulyStatusBarButton mini disabled"
       class:pressed
-      {disabled}
       use:tooltip={{ label: love.string.Share, direction: 'bottom' }}
       on:click={handleShare}
     >
diff --git a/plugins/love-resources/src/components/meeting/ControlBar.svelte b/plugins/love-resources/src/components/meeting/ControlBar.svelte
index 5f54b7e9589..4b1313d0da9 100644
--- a/plugins/love-resources/src/components/meeting/ControlBar.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlBar.svelte
@@ -18,7 +18,7 @@
 
   import love from '../../plugin'
   import { myInfo, myOffice } from '../../stores'
-  import { isFullScreen, screenSharing } from '../../utils'
+  import { isFullScreen } from '../../utils'
   import ControlBarContainer from './ControlBarContainer.svelte'
   import RoomModal from '../RoomModal.svelte'
   import { lkSessionConnected } from '../../liveKitClient'
@@ -42,8 +42,6 @@
 
   $: allowLeave = $myInfo?.room !== ($myOffice?._id ?? love.ids.Reception)
 
-  $: withVideo = $screenSharing || room.type === RoomType.Video
-
   function maximize (): void {
     showPopup(RoomModal, { room }, 'full-centered')
   }
@@ -69,7 +67,7 @@
       {/if}
     </svelte:fragment>
     <svelte:fragment slot="left">
-      {#if $lkSessionConnected && withVideo && onFullScreen}
+      {#if $lkSessionConnected && onFullScreen}
         <ModernButton
           icon={$isFullScreen ? love.icon.ExitFullScreen : love.icon.FullScreen}
           tooltip={{
diff --git a/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte b/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte
index 459926450fa..f26349304dc 100644
--- a/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { eventToHTMLElement, IconUpOutline, showPopup, SplitButton } from '@hcengineering/ui'
-  import { isShareWithSound, isSharingEnabled, liveKitClient, screenSharing } from '../../../utils'
+  import { isShareWithSound, liveKitClient } from '../../../utils'
   import ShareSettingPopup from '../../ShareSettingPopup.svelte'
   import love from '../../../plugin'
-  import { lkSessionConnected } from '../../../liveKitClient'
+  import { lkSessionConnected, ScreenSharingState, screenSharingState } from '../../../liveKitClient'
   import { createEventDispatcher } from 'svelte'
 
   export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
@@ -11,7 +11,7 @@
   const dispatch = createEventDispatcher()
 
   async function changeShare (): Promise<void> {
-    const newValue = !$isSharingEnabled
+    const newValue = $screenSharingState !== ScreenSharingState.Local
     const audio = newValue && $isShareWithSound
     await liveKitClient.setScreenShareEnabled(newValue, audio)
     dispatch('changeShare')
@@ -20,16 +20,18 @@
   function shareSettings (e: MouseEvent): void {
     showPopup(ShareSettingPopup, {}, eventToHTMLElement(e))
   }
+
+  $: localScreenShare = $screenSharingState === ScreenSharingState.Local 
 </script>
 
 <SplitButton
   {size}
-  icon={$isSharingEnabled ? love.icon.SharingEnabled : love.icon.SharingDisabled}
+  icon={localScreenShare ? love.icon.SharingEnabled : love.icon.SharingDisabled}
   iconProps={{
-    fill: $isSharingEnabled ? 'var(--bg-negative-default)' : 'var(--bg-positive-default)'
+    fill: localScreenShare ? 'var(--bg-negative-default)' : 'var(--bg-positive-default)'
   }}
-  showTooltip={{ label: $isSharingEnabled ? love.string.StopShare : love.string.Share }}
-  disabled={($screenSharing && !$isSharingEnabled) || !$lkSessionConnected}
+  showTooltip={{ label: localScreenShare ? love.string.StopShare : love.string.Share }}
+  disabled={$screenSharingState === ScreenSharingState.Remote || !$lkSessionConnected}
   action={changeShare}
   secondIcon={IconUpOutline}
   secondAction={shareSettings}
diff --git a/plugins/love-resources/src/liveKitClient.ts b/plugins/love-resources/src/liveKitClient.ts
index 1870519b57f..7a41c824582 100644
--- a/plugins/love-resources/src/liveKitClient.ts
+++ b/plugins/love-resources/src/liveKitClient.ts
@@ -3,9 +3,16 @@ import {
   type RemoteParticipant,
   Room as LKRoom,
   RoomEvent,
-  type VideoCaptureOptions
+  type VideoCaptureOptions,
+  RemoteTrack,
+  RemoteTrackPublication,
+  Track,
+  LocalTrackPublication,
+  LocalParticipant,
+  TrackPublication,
+  Participant
 } from 'livekit-client'
-import { getMetadata, translate } from '@hcengineering/platform'
+import { translate } from '@hcengineering/platform'
 import { getMediaDevices, getSelectedSpeakerId, type MediaSession } from '@hcengineering/media'
 import { LoveEvents } from '@hcengineering/love'
 import { useMedia } from '@hcengineering/media-resources'
@@ -18,12 +25,19 @@ import love from './plugin'
 import { leaveRoom } from './utils'
 import { $myPreferences, myInfo, myOffice } from './stores'
 
+export enum ScreenSharingState {
+  Inactive,
+  Local,
+  Remote
+}
+
+export const screenSharingState = writable<ScreenSharingState>(ScreenSharingState.Inactive)
 export const lkSessionConnected = writable<boolean>(false)
 
 const LAST_PARTICIPANT_NOTIFICATION_DELAY_MS = 2 * 60 * 1000
 const AUTO_DISCONNECT_DELAY_MS = 60 * 1000
 
-export function getLiveKitClient (): LiveKitClient {
+export function getLiveKitClient(): LiveKitClient {
   return new LiveKitClient()
 }
 
@@ -45,7 +59,7 @@ export class LiveKitClient {
   private lastParticipantNotificationTimeout: number = -1
   private lastParticipantDisconnectTimeout: number = -1
 
-  constructor () {
+  constructor() {
     const lkRoom = new LKRoom({
       adaptiveStream: true,
       dynacast: true,
@@ -72,11 +86,11 @@ export class LiveKitClient {
     this.liveKitRoom = lkRoom
   }
 
-  async prepareConnection (wsUrl: string, token:string): Promise<void> {
+  async prepareConnection(wsUrl: string, token: string): Promise<void> {
     await this.liveKitRoom.prepareConnection(wsUrl, token)
   }
 
-  async connect (wsURL: string, token: string, withVideo: boolean): Promise<void> {
+  async connect(wsURL: string, token: string, withVideo: boolean): Promise<void> {
     this.isConnecting = true
     this.currentSessionSupportsVideo = withVideo
     try {
@@ -128,7 +142,8 @@ export class LiveKitClient {
     }
   }
 
-  async disconnect (): Promise<void> {
+  async disconnect(): Promise<void> {
+    screenSharingState.set(ScreenSharingState.Inactive)
     clearTimeout(this.lastParticipantNotificationTimeout)
     const me = this.liveKitRoom.localParticipant
     await Promise.all([me.setScreenShareEnabled(false), me.setCameraEnabled(false), me.setMicrophoneEnabled(false)])
@@ -139,7 +154,7 @@ export class LiveKitClient {
     this.currentMediaSession = undefined
   }
 
-  async awaitConnect (): Promise<void> {
+  async awaitConnect(): Promise<void> {
     await new Promise<void>((resolve) => {
       if (this.liveKitRoom.state === ConnectionState.Connected) {
         resolve()
@@ -155,21 +170,33 @@ export class LiveKitClient {
     lkSessionConnected.set(true)
     this.liveKitRoom.on(RoomEvent.ParticipantConnected, this.onParticipantConnected)
     this.liveKitRoom.on(RoomEvent.ParticipantDisconnected, this.onParticipantDisconnected)
+    this.liveKitRoom.on(RoomEvent.TrackSubscribed, this.onTrackSubscribed)
+    this.liveKitRoom.on(RoomEvent.TrackUnsubscribed, this.onTrackUnsubscribed)
+    this.liveKitRoom.on(RoomEvent.LocalTrackPublished, this.onLocalTrackPublished)
+    this.liveKitRoom.on(RoomEvent.LocalTrackUnpublished, this.onLocalTrackUnpublished)
+    this.liveKitRoom.on(RoomEvent.TrackMuted, this.onTrackMuted)
+    this.liveKitRoom.on(RoomEvent.TrackUnmuted, this.onTrackUnmuted)
   }
 
   onDisconnected = (): void => {
     lkSessionConnected.set(false)
     this.liveKitRoom.off(RoomEvent.ParticipantConnected, this.onParticipantConnected)
     this.liveKitRoom.off(RoomEvent.ParticipantDisconnected, this.onParticipantDisconnected)
+    this.liveKitRoom.off(RoomEvent.TrackSubscribed, this.onTrackSubscribed)
+    this.liveKitRoom.off(RoomEvent.TrackUnsubscribed, this.onTrackUnsubscribed)
+    this.liveKitRoom.off(RoomEvent.LocalTrackPublished, this.onLocalTrackPublished)
+    this.liveKitRoom.off(RoomEvent.LocalTrackUnpublished, this.onLocalTrackUnpublished)
+    this.liveKitRoom.off(RoomEvent.TrackMuted, this.onTrackMuted)
+    this.liveKitRoom.off(RoomEvent.TrackUnmuted, this.onTrackUnmuted)
     Analytics.handleEvent(LoveEvents.DisconnectedFromRoom)
   }
 
-  onParticipantConnected = (participant: RemoteParticipant): void => {
+  onParticipantConnected = (_participant: RemoteParticipant): void => {
     clearTimeout(this.lastParticipantDisconnectTimeout)
     clearTimeout(this.lastParticipantNotificationTimeout)
   }
 
-  onParticipantDisconnected = (participant: RemoteParticipant): void => {
+  onParticipantDisconnected = (_participant: RemoteParticipant): void => {
     if (this.liveKitRoom.remoteParticipants.size === 0) {
       clearTimeout(this.lastParticipantDisconnectTimeout)
       clearTimeout(this.lastParticipantNotificationTimeout)
@@ -179,7 +206,79 @@ export class LiveKitClient {
     }
   }
 
-  async showLastParticipantNotification (): Promise<void> {
+  onTrackSubscribed = (
+    track: RemoteTrack,
+    _publication: RemoteTrackPublication,
+    _participant: RemoteParticipant
+  ): void => {
+    if (track.kind === Track.Kind.Video && track.source === Track.Source.ScreenShare) {
+      screenSharingState.set(ScreenSharingState.Remote)
+    }
+  }
+
+  onTrackUnsubscribed = (
+    track: RemoteTrack,
+    _publication: RemoteTrackPublication,
+    _participant: RemoteParticipant
+  ): void => {
+    if (track.kind === Track.Kind.Video && track.source === Track.Source.ScreenShare) {
+      screenSharingState.set(ScreenSharingState.Inactive)
+    }
+  }
+
+  onLocalTrackPublished = (publication: LocalTrackPublication, _participant: LocalParticipant) => {
+    const session = this.currentMediaSession
+    const track = publication.track?.mediaStreamTrack
+    const deviceId = track?.getSettings().deviceId
+    if (publication.track?.kind === Track.Kind.Video) {
+      if (publication.track.source === Track.Source.ScreenShare) {
+        session?.setFeature('sharing', { enabled: true, track, deviceId })
+        screenSharingState.set(ScreenSharingState.Local)
+      } else {
+        session?.setCamera({ enabled: true, track, deviceId })
+      }
+    } else if (publication.track?.kind === Track.Kind.Audio) {
+      session?.setMicrophone({ enabled: true, track, deviceId })
+    }
+  }
+  
+  onLocalTrackUnpublished = (publication: LocalTrackPublication, _participant: LocalParticipant) => {
+    const session = this.currentMediaSession
+    if (publication.track?.kind === Track.Kind.Video) {
+      if (publication.track.source === Track.Source.ScreenShare) {
+        session?.setFeature('sharing', { enabled: false })
+        screenSharingState.set(ScreenSharingState.Inactive)
+      } else {
+        session?.setCamera({ enabled: false })
+      }
+    } else if (publication.track?.kind === Track.Kind.Audio) {
+      session?.setMicrophone({ enabled: false })
+    }
+  }
+  
+  onTrackMuted = (publication: TrackPublication, participant: Participant) => {
+    if (!participant.isLocal) return
+    const session = this.currentMediaSession
+    if (publication.track?.kind === Track.Kind.Video && publication.track.source === Track.Source.Camera) {
+      session?.setCamera({ enabled: false })
+    } else if (publication.track?.kind === Track.Kind.Audio) {
+      session?.setMicrophone({ enabled: false })
+    }
+  }
+  
+  onTrackUnmuted = (publication: TrackPublication, participant: Participant) => {
+    if (!participant.isLocal) return
+    const session = this.currentMediaSession
+    const track = publication.track?.mediaStreamTrack
+    const deviceId = track?.getSettings().deviceId
+    if (publication.track?.kind === Track.Kind.Video && publication.track?.source === Track.Source.Camera) {
+      session?.setCamera({ enabled: true, track, deviceId })
+    } else if (publication.track?.kind === Track.Kind.Audio) {
+      session?.setMicrophone({ enabled: true, track, deviceId })
+    }
+  }
+
+  async showLastParticipantNotification(): Promise<void> {
     addNotification(
       await translate(love.string.MeetingEmptyTitle, {}, getCurrentLanguage()),
       await translate(love.string.MeetingEmptyMessage, {}, getCurrentLanguage()),
@@ -193,25 +292,25 @@ export class LiveKitClient {
     }, AUTO_DISCONNECT_DELAY_MS)
   }
 
-  async updateActiveDevices (): Promise<void> {
+  async updateActiveDevices(): Promise<void> {
     await this.setActiveCamera(this.currentMediaSession?.state.camera?.deviceId)
     await this.setActiveMicrophone(this.currentMediaSession?.state.microphone?.deviceId)
     await this.setCameraEnabled(this.currentMediaSession?.state.camera?.enabled ?? false)
     await this.setMicrophoneEnabled(this.currentMediaSession?.state.microphone?.enabled ?? false)
   }
 
-  async setActiveCamera (deviceId: string | undefined): Promise<void> {
+  async setActiveCamera(deviceId: string | undefined): Promise<void> {
     if (deviceId === undefined || deviceId === null) return
     if (!this.currentSessionSupportsVideo) return
     await this.liveKitRoom.switchActiveDevice('videoinput', deviceId, true)
   }
 
-  async setActiveMicrophone (deviceId: string | undefined): Promise<void> {
+  async setActiveMicrophone(deviceId: string | undefined): Promise<void> {
     if (deviceId === undefined || deviceId === null) return
     await this.liveKitRoom.switchActiveDevice('audioinput', deviceId, true)
   }
 
-  async setActiveSpeaker (deviceId: string | undefined): Promise<void> {
+  async setActiveSpeaker(deviceId: string | undefined): Promise<void> {
     if (deviceId === undefined || deviceId === null) return
     try {
       await this.liveKitRoom.switchActiveDevice('audiooutput', deviceId, true)
@@ -220,7 +319,7 @@ export class LiveKitClient {
     }
   }
 
-  async setCameraEnabled (value: boolean): Promise<void> {
+  async setCameraEnabled(value: boolean): Promise<void> {
     if (!this.currentSessionSupportsVideo) return
     try {
       await this.liveKitRoom.localParticipant.setCameraEnabled(value)
@@ -235,7 +334,7 @@ export class LiveKitClient {
     }
   }
 
-  async setMicrophoneEnabled (value: boolean): Promise<void> {
+  async setMicrophoneEnabled(value: boolean): Promise<void> {
     try {
       await this.liveKitRoom.localParticipant.setMicrophoneEnabled(value)
     } catch (e) {
@@ -249,7 +348,7 @@ export class LiveKitClient {
     }
   }
 
-  async setScreenShareEnabled (value: boolean, withAudio: boolean = false): Promise<void> {
+  async setScreenShareEnabled(value: boolean, withAudio: boolean = false): Promise<void> {
     try {
       await this.liveKitRoom.localParticipant.setScreenShareEnabled(value, { audio: withAudio })
     } catch (e) {
diff --git a/plugins/love-resources/src/loveClient.ts b/plugins/love-resources/src/loveClient.ts
index fcd567ec9d5..8249370024a 100644
--- a/plugins/love-resources/src/loveClient.ts
+++ b/plugins/love-resources/src/loveClient.ts
@@ -1,28 +1,27 @@
-import { concatLink, type Ref } from "@hcengineering/core"
-import love, { type Room } from "@hcengineering/love"
-import { getMetadata } from "@hcengineering/platform"
-import presentation from "@hcengineering/presentation"
-import { getPlatformToken, lk } from "./utils"
-import { getCurrentEmployee } from "@hcengineering/contact"
-import { getPersonByPersonRef } from "@hcengineering/contact-resources"
-import { Analytics } from "@hcengineering/analytics"
-import { currentMeetingMinutes } from "./stores"
-import { get } from "svelte/store"
+import { concatLink, type Ref } from '@hcengineering/core'
+import love, { type Room } from '@hcengineering/love'
+import { getMetadata } from '@hcengineering/platform'
+import presentation from '@hcengineering/presentation'
+import { getPlatformToken, lk } from './utils'
+import { getCurrentEmployee } from '@hcengineering/contact'
+import { getPersonByPersonRef } from '@hcengineering/contact-resources'
+import { Analytics } from '@hcengineering/analytics'
+import { currentMeetingMinutes } from './stores'
+import { get } from 'svelte/store'
 
 interface RoomToken {
   issuedOn: number
   token: string
 }
-export function getLoveClient() {
+export function getLoveClient () {
   return new LoveClient()
 }
 
 export class LoveClient {
-  private tokens: Map<Ref<Room>, RoomToken>
+  private readonly tokens: Map<Ref<Room>, RoomToken>
 
-  constructor() {
+  constructor () {
     this.tokens = new Map<Ref<Room>, RoomToken>()
-
   }
 
   async getRoomToken (room: Room): Promise<string> {
@@ -95,7 +94,7 @@ export class LoveClient {
     return endpoint
   }
 
-  private async refreshRoomToken(room: Room): Promise<string> {
+  private async refreshRoomToken (room: Room): Promise<string> {
     const sessionName = this.getTokenRoomName(room)
     const endpoint = this.getLoveEndpoint()
     if (endpoint === undefined) {
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index a52f59a33a5..304886dd1fb 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -86,101 +86,12 @@ export function setCustomCreateScreenTracks (value: () => Promise<Array<LocalTra
   lk.localParticipant.createScreenTracks = value
 }
 
-export const screenSharing = writable<boolean>(false)
 export const isRecording = writable<boolean>(false)
 export const isTranscription = writable<boolean>(false)
 export const isRecordingAvailable = writable<boolean>(false)
-export const isSharingEnabled = writable<boolean>(false)
 export const isFullScreen = writable<boolean>(false)
 export const isShareWithSound = writable<boolean>(false)
 
-function handleTrackSubscribed (
-  track: RemoteTrack,
-  publication: RemoteTrackPublication,
-  participant: RemoteParticipant
-): void {
-  if (track.kind === Track.Kind.Video && track.source === Track.Source.ScreenShare) {
-    screenSharing.set(true)
-  }
-}
-
-function handleTrackUnsubscribed (
-  track: RemoteTrack,
-  publication: RemoteTrackPublication,
-  participant: RemoteParticipant
-): void {
-  if (track.kind === Track.Kind.Video && track.source === Track.Source.ScreenShare) {
-    screenSharing.set(false)
-  }
-}
-
-lk.on(RoomEvent.TrackSubscribed, handleTrackSubscribed)
-lk.on(RoomEvent.LocalTrackPublished, (pub, part) => {
-  const session = liveKitClient.currentMediaSession
-  const track = pub.track?.mediaStreamTrack
-  const deviceId = track?.getSettings().deviceId
-  if (pub.track?.kind === Track.Kind.Video) {
-    if (pub.track.source === Track.Source.ScreenShare) {
-      session?.setFeature('sharing', { enabled: true, track, deviceId })
-      screenSharing.set(true)
-      isSharingEnabled.set(true)
-    } else {
-      session?.setCamera({ enabled: true, track, deviceId })
-    }
-  } else if (pub.track?.kind === Track.Kind.Audio) {
-    session?.setMicrophone({ enabled: true, track, deviceId })
-  }
-})
-lk.on(RoomEvent.LocalTrackUnpublished, (pub, part) => {
-  const session = liveKitClient.currentMediaSession
-  if (pub.track?.kind === Track.Kind.Video) {
-    if (pub.track.source === Track.Source.ScreenShare) {
-      session?.setFeature('sharing', { enabled: false })
-      screenSharing.set(false)
-      isSharingEnabled.set(false)
-    } else {
-      session?.setCamera({ enabled: false })
-    }
-  } else if (pub.track?.kind === Track.Kind.Audio) {
-    session?.setMicrophone({ enabled: false })
-  }
-})
-lk.on(RoomEvent.TrackUnsubscribed, handleTrackUnsubscribed)
-lk.on(RoomEvent.TrackMuted, (pub, participant) => {
-  if (participant.isLocal) {
-    const session = liveKitClient.currentMediaSession
-    if (pub.track?.kind === Track.Kind.Video) {
-      if (pub.track.source === Track.Source.ScreenShare) {
-        session?.setFeature('sharing', { enabled: false })
-        screenSharing.set(false)
-        isSharingEnabled.set(false)
-      } else {
-        session?.setCamera({ enabled: false })
-      }
-    } else if (pub.track?.kind === Track.Kind.Audio) {
-      session?.setMicrophone({ enabled: false })
-    }
-  }
-})
-lk.on(RoomEvent.TrackUnmuted, (pub, participant) => {
-  if (participant.isLocal) {
-    const session = liveKitClient.currentMediaSession
-    const track = pub.track?.mediaStreamTrack
-    const deviceId = track?.getSettings().deviceId
-    if (pub.track?.kind === Track.Kind.Video) {
-      if (pub.track.source === Track.Source.ScreenShare) {
-        session?.setFeature('sharing', { enabled: true })
-        screenSharing.set(true)
-        isSharingEnabled.set(true)
-      } else {
-        session?.setCamera({ enabled: true, track, deviceId })
-      }
-    } else if (pub.track?.kind === Track.Kind.Audio) {
-      session?.setMicrophone({ enabled: true, track, deviceId })
-    }
-  }
-})
-
 export const krispProcessor = KrispNoiseFilter()
 export let blurProcessor: ProcessorWrapper<BackgroundOptions> | undefined
 let localVideo: LocalVideoTrack | undefined
@@ -264,11 +175,6 @@ export async function updateBlurRadius (value: number): Promise<void> {
 }
 
 lk.on(RoomEvent.LocalTrackPublished, (pub) => {
-  if (pub.track?.kind === Track.Kind.Video && pub.track.source === Track.Source.ScreenShare) {
-    screenSharing.set(true)
-    isSharingEnabled.set(true)
-  }
-
   if (pub.source === Track.Source.Microphone) {
     void setKrispProcessor(pub)
   }
@@ -278,14 +184,9 @@ lk.on(RoomEvent.LocalTrackPublished, (pub) => {
   }
 })
 lk.on(RoomEvent.LocalTrackUnpublished, (pub) => {
-  if (pub.track?.kind === Track.Kind.Video) {
-    if (pub.track.source === Track.Source.ScreenShare) {
-      screenSharing.set(false)
-      isSharingEnabled.set(false)
-    } else if (pub.track.source === Track.Source.Camera) {
-      if (localVideo !== undefined) {
-        localVideo = undefined
-      }
+  if (pub.track?.kind === Track.Kind.Video && pub.track.source === Track.Source.Camera) {
+    if (localVideo !== undefined) {
+      localVideo = undefined
     }
   }
 })
@@ -345,8 +246,6 @@ function parseMetadata (metadata: string | undefined): RoomMetadata {
 
 export async function disconnect (): Promise<void> {
   await liveKitClient.disconnect()
-  screenSharing.set(false)
-  isSharingEnabled.set(false)
 }
 
 export async function leaveRoom (ownInfo: ParticipantInfo | undefined, ownOffice: Office | undefined): Promise<void> {
@@ -449,9 +348,7 @@ async function moveToRoom (
 
 async function connectLK (token: string, room: Room): Promise<void> {
   const wsURL = getLiveKitEndpoint()
-  // await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
-  liveKitClient.liveKitRoom.simulateParticipants( { publish: {audio: true, video: true, useRealTracks: true}, participants: {count: 20, audio: true, video: true}}
-  )
+  await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
 }
 
 async function navigateToOfficeDoc (hierarchy: Hierarchy, object: Doc): Promise<void> {
@@ -480,7 +377,7 @@ async function initMeetingMinutes (room: Room): Promise<void> {
   }
 }
 
-export async function prepareRoomConnection(room: Room): Promise<void> {
+export async function prepareRoomConnection (room: Room): Promise<void> {
   const roomToken = await loveClient.getRoomToken(room)
   liveKitClient.prepareConnection(getLiveKitEndpoint(), roomToken)
 }

From 3e4db61ec9b3b11165a2f6000136039c5d2a2db6 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Mon, 8 Sep 2025 09:39:24 +0700
Subject: [PATCH 04/25] Minor fixes

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../love-resources/src/components/Room.svelte | 19 ++++++--------
 .../src/components/RoomModal.svelte           |  2 +-
 .../src/components/WorkbenchExtension.svelte  |  8 +++---
 .../src/components/meeting/ControlExt.svelte  | 10 +++++---
 plugins/love-resources/src/utils.ts           | 25 +++----------------
 5 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/plugins/love-resources/src/components/Room.svelte b/plugins/love-resources/src/components/Room.svelte
index a1c769a54eb..60659776a76 100644
--- a/plugins/love-resources/src/components/Room.svelte
+++ b/plugins/love-resources/src/components/Room.svelte
@@ -27,7 +27,6 @@
   import ParticipantsListView from './meeting/ParticipantsListView.svelte'
   import ScreenSharingView from './meeting/ScreenSharingView.svelte'
 
-  export let withVideo: boolean
   export let canMaximize: boolean = true
   export let room: TypeRoom
 
@@ -147,16 +146,14 @@
     <div class="screenContainer">
       <ScreenSharingView bind:hasActiveTrack={withScreenSharing} />
     </div>
-    {#if withVideo}
-      <div class="videoGrid" style={withScreenSharing ? '' : gridStyle} class:scroll-m-0={withScreenSharing}>
-        <ParticipantsListView
-          room={room._id}
-          on:participantsCount={(evt) => {
-            updateStyle(evt.detail, withScreenSharing)
-          }}
-        />
-      </div>
-    {/if}
+    <div class="videoGrid" style={withScreenSharing ? '' : gridStyle} class:scroll-m-0={withScreenSharing}>
+      <ParticipantsListView
+        room={room._id}
+        on:participantsCount={(evt) => {
+          updateStyle(evt.detail, withScreenSharing)
+        }}
+      />
+    </div>
   </div>
   {#if $currentRoom}
     <ControlBar room={$currentRoom} fullScreen={$isFullScreen} {onFullScreen} {canMaximize} />
diff --git a/plugins/love-resources/src/components/RoomModal.svelte b/plugins/love-resources/src/components/RoomModal.svelte
index 1abb647e0a3..5b2020e18c8 100644
--- a/plugins/love-resources/src/components/RoomModal.svelte
+++ b/plugins/love-resources/src/components/RoomModal.svelte
@@ -39,6 +39,6 @@
     <svelte:fragment slot="title">
       {$currentRoom.name}
     </svelte:fragment>
-    <RoomComponent withVideo={$currentRoom.type === RoomType.Video} room={$currentRoom} canMaximize={false} />
+    <RoomComponent room={$currentRoom} canMaximize={false} />
   </Modal>
 {/if}
diff --git a/plugins/love-resources/src/components/WorkbenchExtension.svelte b/plugins/love-resources/src/components/WorkbenchExtension.svelte
index 6d3c36e3071..0091f5e31f2 100644
--- a/plugins/love-resources/src/components/WorkbenchExtension.svelte
+++ b/plugins/love-resources/src/components/WorkbenchExtension.svelte
@@ -3,7 +3,7 @@
   import { RemoteParticipant, RemoteTrack, RemoteTrackPublication, RoomEvent, Track } from 'livekit-client'
   import { onDestroy, onMount } from 'svelte'
   import love from '../plugin'
-  import { disconnect, lk } from '../utils'
+  import { liveKitClient, lk } from '../utils'
   import { lkSessionConnected } from '../liveKitClient'
 
   let parentElement: HTMLDivElement
@@ -11,7 +11,7 @@
   function handleTrackSubscribed (
     track: RemoteTrack,
     publication: RemoteTrackPublication,
-    participant: RemoteParticipant
+    _participant: RemoteParticipant
   ): void {
     if (track.kind === Track.Kind.Audio) {
       const element = track.attach()
@@ -23,7 +23,7 @@
   function handleTrackUnsubscribed (
     track: RemoteTrack,
     publication: RemoteTrackPublication,
-    participant: RemoteParticipant
+    _participant: RemoteParticipant
   ): void {
     if (track.kind === Track.Kind.Audio) {
       const element = document.getElementById(publication.trackSid)
@@ -43,7 +43,7 @@
     lk.off(RoomEvent.TrackSubscribed, handleTrackSubscribed)
     lk.off(RoomEvent.TrackUnsubscribed, handleTrackUnsubscribed)
     if ($lkSessionConnected) {
-      await disconnect()
+      await liveKitClient.disconnect()
     }
   })
 </script>
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index 190528e01c8..1d1a04cddaf 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -36,10 +36,12 @@
     connectRoom,
     createMeetingVideoWidgetTab,
     createMeetingWidget,
-    disconnect,
     endMeeting,
     getRoomName,
-    leaveRoom
+    leaveRoom,
+
+    liveKitClient
+
   } from '../../utils'
   import ActiveInvitesPopup from '../ActiveInvitesPopup.svelte'
   import InvitePopup from '../InvitePopup.svelte'
@@ -168,13 +170,13 @@
   ): Promise<void> {
     if (myInfo !== undefined && myInfo.room === (myOffice?._id ?? love.ids.Reception)) {
       if (myOffice === undefined) {
-        await disconnect()
+        await liveKitClient.disconnect()
         return
       }
       const filtered = infos.filter((p) => p.room === myOffice._id && p.person !== myInfo.person)
       if (filtered.length === 0) {
         if (isConnected) {
-          await disconnect()
+          await liveKitClient.disconnect()
         }
       } else if (!isConnected) {
         const myPerson = await getPersonByPersonRef(getCurrentEmployee())
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index 304886dd1fb..17d7a3c14b8 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -60,9 +60,6 @@ import {
   type LocalTrack,
   type LocalTrackPublication,
   LocalVideoTrack,
-  type RemoteParticipant,
-  type RemoteTrack,
-  type RemoteTrackPublication,
   type Room as LKRoom,
   RoomEvent,
   Track
@@ -244,17 +241,7 @@ function parseMetadata (metadata: string | undefined): RoomMetadata {
   }
 }
 
-export async function disconnect (): Promise<void> {
-  await liveKitClient.disconnect()
-}
-
 export async function leaveRoom (ownInfo: ParticipantInfo | undefined, ownOffice: Office | undefined): Promise<void> {
-  const me = lk.localParticipant
-  try {
-    await Promise.all([me.setScreenShareEnabled(false), me.setCameraEnabled(false), me.setMicrophoneEnabled(false)])
-  } catch (err: any) {
-    console.error(err)
-  }
   if (ownInfo !== undefined) {
     const client = getClient()
     if (ownOffice !== undefined && ownInfo.room !== ownOffice._id) {
@@ -263,7 +250,7 @@ export async function leaveRoom (ownInfo: ParticipantInfo | undefined, ownOffice
       await client.update(ownInfo, { room: love.ids.Reception, x: 0, y: 0 })
     }
   }
-  await disconnect()
+  await liveKitClient.disconnect()
   closeMeetingMinutes()
 }
 
@@ -346,11 +333,6 @@ async function moveToRoom (
   }
 }
 
-async function connectLK (token: string, room: Room): Promise<void> {
-  const wsURL = getLiveKitEndpoint()
-  await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
-}
-
 async function navigateToOfficeDoc (hierarchy: Hierarchy, object: Doc): Promise<void> {
   const panelComponent = hierarchy.classHierarchyMixin(object._class, view.mixin.ObjectPanel)
   const comp = panelComponent?.component ?? view.component.EditDoc
@@ -395,10 +377,11 @@ export async function connectRoom (
   if (getCurrentAccount().role === AccountRole.ReadOnlyGuest) {
     return
   }
-  await disconnect()
+  await liveKitClient.disconnect()
   const token = await loveClient.getRoomToken(room)
   try {
-    await connectLK(token, room)
+    const wsURL = getLiveKitEndpoint()
+    await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
   } catch (err) {
     console.error(err)
     await leaveRoom(currentInfo, get(myOffice))

From 49b241c79b8a09564aa45429c455d04f1c810f87 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Wed, 10 Sep 2025 16:15:31 +0700
Subject: [PATCH 05/25] Move meetings related logic to meetingController

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../src/components/ActiveInvitesPopup.svelte  |  12 +-
 .../src/components/EditRoom.svelte            |  18 +-
 .../love-resources/src/components/Hall.svelte |  42 +--
 .../src/components/InvitePopup.svelte         |  26 +-
 .../love-resources/src/components/Main.svelte |  31 +-
 .../src/components/MediaPopupItemExt.svelte   |  18 +-
 .../src/components/PersonActionPopup.svelte   |  12 +-
 .../src/components/RequestPopup.svelte        |  22 +-
 .../src/components/RequestingPopup.svelte     |   9 +-
 .../love-resources/src/components/Room.svelte |   8 +-
 .../components/RoomLanguageSelector.svelte    |   3 +-
 .../src/components/RoomPopup.svelte           |   7 +-
 .../src/components/ShareSettingPopup.svelte   |   7 +-
 .../src/components/meeting/ControlExt.svelte  |  45 +--
 .../LastParticipantNotification.svelte        |  11 +-
 .../meeting/controls/LeaveRoomButton.svelte   |  10 +-
 .../meeting/controls/RecordingButton.svelte   |   5 +-
 .../meeting/widget/WidgetSwitcher.svelte      |   7 +-
 plugins/love-resources/src/liveKitClient.ts   |   8 +-
 .../love-resources/src/meetingController.ts   | 256 +++++++++++++++++
 plugins/love-resources/src/utils.ts           | 270 +-----------------
 21 files changed, 336 insertions(+), 491 deletions(-)
 create mode 100644 plugins/love-resources/src/meetingController.ts

diff --git a/plugins/love-resources/src/components/ActiveInvitesPopup.svelte b/plugins/love-resources/src/components/ActiveInvitesPopup.svelte
index 1a1b0daab39..8edab990c09 100644
--- a/plugins/love-resources/src/components/ActiveInvitesPopup.svelte
+++ b/plugins/love-resources/src/components/ActiveInvitesPopup.svelte
@@ -15,23 +15,17 @@
 <script lang="ts">
   import contact from '@hcengineering/contact'
   import { CombineAvatars } from '@hcengineering/contact-resources'
-  import { getClient } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
-  import { Invite, RequestStatus } from '@hcengineering/love'
+  import { Invite } from '@hcengineering/love'
   import love from '../plugin'
+  import { cancelInvites } from '../meetingController'
 
   export let invites: Invite[]
 
   $: persons = invites.map((p) => p.target)
 
-  const client = getClient()
-
   async function cancel () {
-    for (const invite of invites) {
-      if (invite.status === RequestStatus.Pending) {
-        await client.remove(invite)
-      }
-    }
+    await cancelInvites(invites)
   }
 </script>
 
diff --git a/plugins/love-resources/src/components/EditRoom.svelte b/plugins/love-resources/src/components/EditRoom.svelte
index 0f1dc59ea9c..d7dec21bc5f 100644
--- a/plugins/love-resources/src/components/EditRoom.svelte
+++ b/plugins/love-resources/src/components/EditRoom.svelte
@@ -19,9 +19,10 @@
   import { IntlString } from '@hcengineering/platform'
 
   import love from '../plugin'
-  import { getRoomName, prepareRoomConnection, tryConnect } from '../utils'
-  import { infos, invites, myInfo, myRequests, selectedRoomPlace, myOffice, currentRoom } from '../stores'
+  import { getRoomName, prepareRoomConnection } from '../utils'
+  import { infos, myOffice, currentRoom } from '../stores'
   import { lkSessionConnected } from '../liveKitClient'
+  import { createMeeting } from '../meetingController'
 
   export let object: Room
 
@@ -42,18 +43,7 @@
   let tryConnecting = false
 
   async function connect (): Promise<void> {
-    tryConnecting = true
-    const place = $selectedRoomPlace
-    await tryConnect(
-      $myInfo,
-      object,
-      $infos,
-      $myRequests,
-      $invites,
-      place?._id === object._id ? { x: place.x, y: place.y } : undefined
-    )
-    tryConnecting = false
-    selectedRoomPlace.set(undefined)
+    await createMeeting(object)
   }
 
   $: connecting = tryConnecting || ($currentRoom?._id === object._id && !$lkSessionConnected)
diff --git a/plugins/love-resources/src/components/Hall.svelte b/plugins/love-resources/src/components/Hall.svelte
index 88437afec31..405355ff9bf 100644
--- a/plugins/love-resources/src/components/Hall.svelte
+++ b/plugins/love-resources/src/components/Hall.svelte
@@ -15,22 +15,15 @@
 <script lang="ts">
   import { Contact, Person } from '@hcengineering/contact'
   import { Ref } from '@hcengineering/core'
-  import love, { Floor as FloorType, Office, Room, RoomInfo, isOffice } from '@hcengineering/love'
-  import { getClient } from '@hcengineering/presentation'
-  import { deviceOptionsStore as deviceInfo, getCurrentLocation, navigate } from '@hcengineering/ui'
-  import { onDestroy, onMount } from 'svelte'
+  import { Floor as FloorType, Office, Room, isOffice } from '@hcengineering/love'
+  import { deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
+  import { onDestroy } from 'svelte'
   import {
     activeFloor,
     floors,
-    infos,
-    invites,
-    myInfo,
-    myRequests,
     rooms,
     selectedFloor,
-    waitForOfficeLoaded
   } from '../stores'
-  import { connectToMeeting, tryConnect } from '../utils'
   import Floor from './Floor.svelte'
   import FloorConfigure from './FloorConfigure.svelte'
 
@@ -49,35 +42,6 @@
 
   $: $deviceInfo.replacedPanel = replacedPanel
   onDestroy(() => ($deviceInfo.replacedPanel = undefined))
-
-  async function connectToSession (sessionId: string): Promise<void> {
-    const client = getClient()
-    const info = await client.findOne(love.class.RoomInfo, { _id: sessionId as Ref<RoomInfo> })
-    if (info === undefined) return
-    const room = $rooms.find((p) => p._id === info.room)
-    if (room === undefined) return
-    await tryConnect(
-      $myInfo,
-      room,
-      $infos.filter((p) => p.room === room._id),
-      $myRequests,
-      $invites
-    )
-  }
-
-  onMount(async () => {
-    const loc = getCurrentLocation()
-    const { sessionId, meetId, ...query } = loc.query ?? {}
-    loc.query = Object.keys(query).length === 0 ? undefined : query
-    navigate(loc, true)
-    if (sessionId) {
-      await waitForOfficeLoaded()
-      await connectToSession(sessionId)
-    } else if (meetId) {
-      await waitForOfficeLoaded()
-      await connectToMeeting($myInfo, $infos, $myRequests, $invites, meetId)
-    }
-  })
 </script>
 
 <div class="antiPanel-component filledNav" bind:this={replacedPanel}>
diff --git a/plugins/love-resources/src/components/InvitePopup.svelte b/plugins/love-resources/src/components/InvitePopup.svelte
index 37168b222c2..9198f9d43a0 100644
--- a/plugins/love-resources/src/components/InvitePopup.svelte
+++ b/plugins/love-resources/src/components/InvitePopup.svelte
@@ -14,15 +14,14 @@
 -->
 <script lang="ts">
   import { formatName, Person } from '@hcengineering/contact'
-  import { Avatar, getPersonByPersonRef, getPersonByPersonRefCb } from '@hcengineering/contact-resources'
-  import { getClient, playNotificationSound } from '@hcengineering/presentation'
+  import { Avatar, getPersonByPersonRefCb } from '@hcengineering/contact-resources'
+  import { playNotificationSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
-  import { Invite, RequestStatus, getFreeRoomPlace } from '@hcengineering/love'
+  import { Invite } from '@hcengineering/love'
   import { onDestroy, onMount } from 'svelte'
 
   import love from '../plugin'
-  import { infos, myInfo, rooms } from '../stores'
-  import { connectRoom } from '../utils'
+  import { acceptInvite, rejectInvite } from '../meetingController'
 
   export let invite: Invite
 
@@ -31,25 +30,14 @@
     person = p ?? undefined
   })
 
-  const client = getClient()
   let stopSound: (() => void) | null = null
 
   async function accept (): Promise<void> {
-    const room = $rooms.find((p) => p._id === invite.room)
-    if (room === undefined) return
-    const myPerson = await getPersonByPersonRef(invite.target)
-    if (myPerson == null) return
-    if ($myInfo === undefined) return
-    await client.update(invite, { status: RequestStatus.Approved })
-    const place = getFreeRoomPlace(
-      room,
-      $infos.filter((p) => p.room === room?._id),
-      myPerson._id
-    )
-    await connectRoom(place.x, place.y, $myInfo, myPerson, room)
+    await acceptInvite(invite)
   }
+
   async function decline (): Promise<void> {
-    await client.update(invite, { status: RequestStatus.Rejected })
+    await rejectInvite(invite)
   }
 
   onMount(async () => {
diff --git a/plugins/love-resources/src/components/Main.svelte b/plugins/love-resources/src/components/Main.svelte
index 27d7e6703b1..ae87fec6155 100644
--- a/plugins/love-resources/src/components/Main.svelte
+++ b/plugins/love-resources/src/components/Main.svelte
@@ -14,15 +14,8 @@
 -->
 <script lang="ts">
   import { deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
-  import { onDestroy, onMount } from 'svelte'
-  import presentation from '@hcengineering/presentation'
-
+  import { onDestroy } from 'svelte'
   import Hall from './Hall.svelte'
-  import { getMetadata } from '@hcengineering/platform'
-  import love from '../plugin'
-  import { tryConnect } from '../utils'
-  import { infos, invites, myInfo, myRequests, waitForOfficeLoaded, currentRoom } from '../stores'
-  import { lkSessionConnected } from '../liveKitClient'
 
   const localNav: boolean = $deviceInfo.navigator.visible
   const savedNav = localStorage.getItem('love-visibleNav')
@@ -32,28 +25,6 @@
   onDestroy(() => {
     $deviceInfo.navigator.visible = localNav
   })
-
-  onMount(async () => {
-    const wsURL = getMetadata(love.metadata.WebSocketURL)
-
-    if (wsURL === undefined) {
-      return
-    }
-
-    await waitForOfficeLoaded()
-    const room = $currentRoom
-
-    if (room === undefined) return
-
-    if (
-      !$lkSessionConnected &&
-      $myInfo?.sessionId !== undefined &&
-      $myInfo.sessionId === getMetadata(presentation.metadata.SessionId)
-    ) {
-      const info = $infos.filter((p) => p.room === room._id)
-      await tryConnect($myInfo, room, info, $myRequests, $invites)
-    }
-  })
 </script>
 
 <div class="hulyPanels-container">
diff --git a/plugins/love-resources/src/components/MediaPopupItemExt.svelte b/plugins/love-resources/src/components/MediaPopupItemExt.svelte
index fe7d6c0cd95..a8258e12040 100644
--- a/plugins/love-resources/src/components/MediaPopupItemExt.svelte
+++ b/plugins/love-resources/src/components/MediaPopupItemExt.svelte
@@ -6,9 +6,10 @@
   import { createEventDispatcher } from 'svelte'
   import love from '../plugin'
   import { currentRoom, infos, myInfo, myOffice, rooms } from '../stores'
-  import { endMeeting, isSharingEnabled, leaveRoom, liveKitClient } from '../utils'
-  import { lkSessionConnected } from '../liveKitClient'
+  import { liveKitClient } from '../utils'
+  import { lkSessionConnected, ScreenSharingState, screenSharingState } from '../liveKitClient'
   import MeetingHeader from './meeting/MeetingHeader.svelte'
+  import { leaveMeeting } from '../meetingController'
 
   export let limit: number = 4
 
@@ -20,17 +21,14 @@
   let leaving = false
   async function handleLeaveClick (): Promise<void> {
     leaving = true
-    await leaveRoom($myInfo, $myOffice)
+    await leaveMeeting()
     dispatch('close')
   }
 
   let ending = false
   async function handleEndMeetingClick (): Promise<void> {
     ending = true
-    const room = $currentRoom
-    if (room !== undefined && isOffice(room) && $myInfo !== undefined) {
-      await endMeeting(room, $rooms, $infos, $myInfo)
-    }
+    await leaveMeeting()
     dispatch('close')
   }
 
@@ -82,7 +80,7 @@
           {#if allowLeave || leaving}
             <Button
               icon={love.icon.LeaveRoom}
-              kind={$isSharingEnabled ? 'regular' : 'dangerous'}
+              kind={$screenSharingState === ScreenSharingState.Local ? 'regular' : 'dangerous'}
               size={'x-small'}
               label={view.string.Leave}
               showTooltip={{ label: love.string.LeaveRoom }}
@@ -92,7 +90,7 @@
           {:else if isMyOffice || ending}
             <Button
               icon={love.icon.LeaveRoom}
-              kind={$isSharingEnabled ? 'regular' : 'dangerous'}
+              kind={$screenSharingState === ScreenSharingState.Local ? 'regular' : 'dangerous'}
               size={'x-small'}
               label={love.string.EndMeeting}
               showTooltip={{ label: love.string.EndMeeting }}
@@ -100,7 +98,7 @@
               on:click={handleEndMeetingClick}
             />
           {/if}
-          {#if $isSharingEnabled}
+          {#if $screenSharingState === ScreenSharingState.Local}
             <Button
               icon={love.icon.SharingEnabled}
               kind="dangerous"
diff --git a/plugins/love-resources/src/components/PersonActionPopup.svelte b/plugins/love-resources/src/components/PersonActionPopup.svelte
index de68b16aca9..e2a599f0a9a 100644
--- a/plugins/love-resources/src/components/PersonActionPopup.svelte
+++ b/plugins/love-resources/src/components/PersonActionPopup.svelte
@@ -4,15 +4,13 @@
   import { isOffice, Room, RoomAccess } from '@hcengineering/love'
   import { ActionIcon } from '@hcengineering/ui'
   import love from '../plugin'
-  import { infos, invites, myInfo, myRequests, rooms } from '../stores'
-  import { invite, kick, tryConnect } from '../utils'
+  import { myInfo } from '../stores'
+  import { joinMeeting, kick, sendInvite } from '../meetingController'
 
   export let room: Room
   export let person: Ref<Person>
 
   $: isMyOffice = isOffice(room) && room.person === $myInfo?.person
-
-  $: info = $infos.filter((p) => p.room === room._id)
 </script>
 
 <div class="p-3 flex-gap-2 antiPopup">
@@ -22,7 +20,7 @@
       label={love.string.Kick}
       icon={love.icon.Kick}
       action={() => {
-        kick(person, $rooms, $infos)
+        kick(person)
       }}
     />
   {/if}
@@ -32,7 +30,7 @@
       label={love.string.Invite}
       icon={love.icon.Invite}
       action={() => {
-        invite(person, $myInfo?.room)
+        sendInvite(person, $myInfo?.room)
       }}
     />
     {#if room.access === RoomAccess.Knock}
@@ -41,7 +39,7 @@
         label={love.string.KnockAction}
         icon={love.icon.Knock}
         action={() => {
-          tryConnect($myInfo, room, info, $myRequests, $invites)
+          joinMeeting(room)
         }}
       />
     {/if}
diff --git a/plugins/love-resources/src/components/RequestPopup.svelte b/plugins/love-resources/src/components/RequestPopup.svelte
index 9ebcdfdaf63..e1fc4615c1c 100644
--- a/plugins/love-resources/src/components/RequestPopup.svelte
+++ b/plugins/love-resources/src/components/RequestPopup.svelte
@@ -13,36 +13,28 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { formatName, getCurrentEmployee } from '@hcengineering/contact'
-  import { Avatar, getPersonByPersonRef, getPersonByPersonRefStore } from '@hcengineering/contact-resources'
-  import { getClient, playNotificationSound } from '@hcengineering/presentation'
+  import { formatName } from '@hcengineering/contact'
+  import { Avatar, getPersonByPersonRefStore } from '@hcengineering/contact-resources'
+  import { playNotificationSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
-  import { JoinRequest, RequestStatus } from '@hcengineering/love'
+  import { JoinRequest } from '@hcengineering/love'
   import love from '../plugin'
-  import { myInfo, myOffice } from '../stores'
-  import { connectRoom } from '../utils'
   import { onDestroy, onMount } from 'svelte'
-  import { lkSessionConnected } from '../liveKitClient'
+  import { acceptJoinRequest, rejectJoinRequest } from '../meetingController'
 
   export let request: JoinRequest
 
   $: personByRefStore = getPersonByPersonRefStore([request.person])
   $: person = $personByRefStore.get(request.person)
 
-  const client = getClient()
   let stopSound: (() => void) | null = null
 
   async function accept (): Promise<void> {
-    await client.update(request, { status: RequestStatus.Approved })
-    if (request.room === $myOffice?._id && !$lkSessionConnected) {
-      const person = await getPersonByPersonRef(getCurrentEmployee())
-      if (person == null) return
-      await connectRoom(0, 0, $myInfo, person, $myOffice)
-    }
+    await acceptJoinRequest(request)
   }
 
   async function decline (): Promise<void> {
-    await client.update(request, { status: RequestStatus.Rejected })
+    await rejectJoinRequest(request)
   }
 
   onMount(async () => {
diff --git a/plugins/love-resources/src/components/RequestingPopup.svelte b/plugins/love-resources/src/components/RequestingPopup.svelte
index 241113e3135..d7ff2c6afe8 100644
--- a/plugins/love-resources/src/components/RequestingPopup.svelte
+++ b/plugins/love-resources/src/components/RequestingPopup.svelte
@@ -13,22 +13,19 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { getClient } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
-  import { JoinRequest, RequestStatus } from '@hcengineering/love'
+  import { JoinRequest } from '@hcengineering/love'
   import love from '../plugin'
   import { rooms } from '../stores'
   import { getRoomLabel } from '../utils'
+  import { cancelJoinRequest } from '../meetingController'
 
   export let request: JoinRequest
 
   $: room = $rooms.find((p) => p._id === request.room)
 
   async function cancel (): Promise<void> {
-    if (request.status === RequestStatus.Pending) {
-      const client = getClient()
-      await client.remove(request)
-    }
+    await cancelJoinRequest(request)
   }
 </script>
 
diff --git a/plugins/love-resources/src/components/Room.svelte b/plugins/love-resources/src/components/Room.svelte
index 60659776a76..093c89d11af 100644
--- a/plugins/love-resources/src/components/Room.svelte
+++ b/plugins/love-resources/src/components/Room.svelte
@@ -21,7 +21,7 @@
 
   import love from '../plugin'
   import { waitForOfficeLoaded, currentRoom, infos, invites, myInfo, myRequests } from '../stores'
-  import { isFullScreen, lk, tryConnect } from '../utils'
+  import { isFullScreen, lk } from '../utils'
   import ControlBar from './meeting/ControlBar.svelte'
   import { lkSessionConnected } from '../liveKitClient'
   import ParticipantsListView from './meeting/ParticipantsListView.svelte'
@@ -38,21 +38,15 @@
 
   onMount(async () => {
     loading = true
-
     const wsURL = getMetadata(love.metadata.WebSocketURL)
 
     if (wsURL === undefined) {
       return
     }
-
     configured = true
 
     await waitForOfficeLoaded()
 
-    if (!$lkSessionConnected && $myInfo?.sessionId === getMetadata(presentation.metadata.SessionId)) {
-      const info = $infos.filter((p) => p.room === room._id)
-      await tryConnect($myInfo, room, info, $myRequests, $invites)
-    }
     roomEl && roomEl.addEventListener('fullscreenchange', handleFullScreen)
     loading = false
   })
diff --git a/plugins/love-resources/src/components/RoomLanguageSelector.svelte b/plugins/love-resources/src/components/RoomLanguageSelector.svelte
index 4e0e527c606..fef754c3acf 100644
--- a/plugins/love-resources/src/components/RoomLanguageSelector.svelte
+++ b/plugins/love-resources/src/components/RoomLanguageSelector.svelte
@@ -21,7 +21,6 @@
 
   import { languagesDisplayData } from '../types'
   import LanguageIcon from './LanguageIcon.svelte'
-  import { updateSessionLanguage } from '../utils'
 
   export let room: Room
   export let kind: 'dropdown' | 'icon' = 'dropdown'
@@ -44,7 +43,7 @@
     if (newLang == null) return
 
     await client.diffUpdate(room, { language: newLang })
-    await updateSessionLanguage(room)
+    // await updateSessionLanguage(room)
   }
 
   function showLanguagesPopup (): void {
diff --git a/plugins/love-resources/src/components/RoomPopup.svelte b/plugins/love-resources/src/components/RoomPopup.svelte
index bb1c6d8223f..5d870ca16b6 100644
--- a/plugins/love-resources/src/components/RoomPopup.svelte
+++ b/plugins/love-resources/src/components/RoomPopup.svelte
@@ -25,14 +25,15 @@
   import { getObjectLinkFragment } from '@hcengineering/view-resources'
   import { createEventDispatcher, onMount } from 'svelte'
   import love from '../plugin'
-  import { currentMeetingMinutes, infos, invites, myInfo, myRequests } from '../stores'
-  import { prepareRoomConnection, tryConnect } from '../utils'
+  import { currentMeetingMinutes, infos, myInfo } from '../stores'
+  import { prepareRoomConnection } from '../utils'
   import { lkSessionConnected } from '../liveKitClient'
   import MicrophoneButton from './meeting/controls/MicrophoneButton.svelte'
   import CameraButton from './meeting/controls/CameraButton.svelte'
   import ShareScreenButton from './meeting/controls/ShareScreenButton.svelte'
   import LeaveRoomButton from './meeting/controls/LeaveRoomButton.svelte'
   import MeetingHeader from './meeting/MeetingHeader.svelte'
+  import { joinMeeting } from '../meetingController'
 
   export let room: Room
 
@@ -58,7 +59,7 @@
   const dispatch = createEventDispatcher()
 
   async function connect (): Promise<void> {
-    await tryConnect($myInfo, room, info, $myRequests, $invites)
+    await joinMeeting(room)
     dispatch('close')
   }
 
diff --git a/plugins/love-resources/src/components/ShareSettingPopup.svelte b/plugins/love-resources/src/components/ShareSettingPopup.svelte
index 91a5d97bc88..0b7a3e05e5c 100644
--- a/plugins/love-resources/src/components/ShareSettingPopup.svelte
+++ b/plugins/love-resources/src/components/ShareSettingPopup.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { Label, Toggle } from '@hcengineering/ui'
   import love from '../plugin'
-  import { isShareWithSound, isSharingEnabled, liveKitClient } from '../utils'
+  import { isShareWithSound, liveKitClient } from '../utils'
+  import { ScreenSharingState, screenSharingState } from '../liveKitClient'
 </script>
 
 <div class="antiPopup p-4 grid">
@@ -11,8 +12,8 @@
     on={$isShareWithSound}
     on:change={(e) => {
       $isShareWithSound = e.detail
-      if ($isSharingEnabled) {
-        void liveKitClient.setScreenShareEnabled($isSharingEnabled, e.detail)
+      if ($screenSharingState === ScreenSharingState.Local) {
+        void liveKitClient.setScreenShareEnabled(true, e.detail)
       }
     }}
   />
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index 1d1a04cddaf..70bfc87f61a 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -14,8 +14,7 @@
 -->
 <script lang="ts">
   import { IdMap, Ref, toIdMap } from '@hcengineering/core'
-  import { getCurrentEmployee } from '@hcengineering/contact'
-  import { Invite, isOffice, JoinRequest, Office, ParticipantInfo, RequestStatus, Room } from '@hcengineering/love'
+  import { Invite, isOffice, JoinRequest, ParticipantInfo, RequestStatus, Room } from '@hcengineering/love'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import {
     closePopup,
@@ -31,17 +30,11 @@
   import { closeWidget, closeWidgetTab, sidebarStore } from '@hcengineering/workbench-resources'
 
   import love from '../../plugin'
-  import { activeInvites, currentRoom, infos, myInfo, myInvites, myOffice, myRequests, rooms } from '../../stores'
+  import { activeInvites, currentRoom, infos, myInfo, myInvites, myRequests, rooms } from '../../stores'
   import {
-    connectRoom,
     createMeetingVideoWidgetTab,
     createMeetingWidget,
-    endMeeting,
     getRoomName,
-    leaveRoom,
-
-    liveKitClient
-
   } from '../../utils'
   import ActiveInvitesPopup from '../ActiveInvitesPopup.svelte'
   import InvitePopup from '../InvitePopup.svelte'
@@ -50,7 +43,7 @@
   import RequestingPopup from '../RequestingPopup.svelte'
   import RoomPopup from '../RoomPopup.svelte'
   import RoomButton from '../RoomButton.svelte'
-  import { getPersonByPersonRef } from '@hcengineering/contact-resources'
+  import { leaveMeeting } from '../../meetingController'
   import { lkSessionConnected } from '../../liveKitClient'
 
   const client = getClient()
@@ -162,32 +155,6 @@
 
   $: checkInvites($myInvites)
 
-  async function checkOwnRoomConnection (
-    infos: ParticipantInfo[],
-    myInfo: ParticipantInfo | undefined,
-    myOffice: Office | undefined,
-    isConnected: boolean
-  ): Promise<void> {
-    if (myInfo !== undefined && myInfo.room === (myOffice?._id ?? love.ids.Reception)) {
-      if (myOffice === undefined) {
-        await liveKitClient.disconnect()
-        return
-      }
-      const filtered = infos.filter((p) => p.room === myOffice._id && p.person !== myInfo.person)
-      if (filtered.length === 0) {
-        if (isConnected) {
-          await liveKitClient.disconnect()
-        }
-      } else if (!isConnected) {
-        const myPerson = await getPersonByPersonRef(getCurrentEmployee())
-        if (myPerson == null) return
-        await connectRoom(0, 0, myInfo, myPerson, myOffice)
-      }
-    }
-  }
-
-  $: checkOwnRoomConnection($infos, $myInfo, $myOffice, $lkSessionConnected)
-
   const myInvitesCategory = 'myInvites'
 
   let myInvitesPopup: PopupResult | undefined = undefined
@@ -272,11 +239,7 @@
 
   const beforeUnloadListener = () => {
     if ($myInfo !== undefined && $lkSessionConnected) {
-      if ($myOffice !== undefined && $myInfo.room === $myOffice._id) {
-        endMeeting($myOffice, $rooms, $infos, $myInfo)
-      } else {
-        leaveRoom($myInfo, $myOffice)
-      }
+      leaveMeeting()
     }
   }
 
diff --git a/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte b/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte
index eb794b1e158..01d959a9fcb 100644
--- a/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte
+++ b/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte
@@ -1,20 +1,19 @@
 <script lang="ts">
   import { Button, Notification, NotificationToast } from '@hcengineering/ui'
-  import { myInfo, myOffice } from '../../stores'
-  import { leaveRoom } from '../../utils'
   import love from '../../plugin'
   import { onMount } from 'svelte'
   import { playSound } from '@hcengineering/presentation'
+  import { leaveMeeting } from '../../meetingController'
 
   export let onRemove: () => void
   export let notification: Notification
 
-  function stayInMeeting (e: MouseEvent): void {
+  function stayInMeeting (_e: MouseEvent): void {
     onRemove()
   }
 
-  async function leaveMeeting (e: MouseEvent): Promise<void> {
-    await leaveRoom($myInfo, $myOffice)
+  async function leave (_e: MouseEvent): Promise<void> {
+    await leaveMeeting()
     onRemove()
   }
 
@@ -30,7 +29,7 @@
   <svelte:fragment slot="buttons">
     <div style="width: auto" />
     <div class="flex-between gap-2">
-      <Button label={love.string.LeaveRoom} stopPropagation={false} kind="negative" on:click={leaveMeeting} />
+      <Button label={love.string.LeaveRoom} stopPropagation={false} kind="negative" on:click={leave} />
       <Button label={love.string.StayInRoom} stopPropagation={false} kind="primary" on:click={stayInMeeting} />
     </div>
   </svelte:fragment>
diff --git a/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte b/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
index 10670403d73..8ce6a981eb2 100644
--- a/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import love from '../../../plugin'
   import { ModernButton } from '@hcengineering/ui'
-  import { endMeeting, leaveRoom } from '../../../utils'
-  import { infos, myInfo, myOffice, rooms } from '../../../stores'
+  import { myInfo, myOffice} from '../../../stores'
   import { isOffice, Room } from '@hcengineering/love'
   import { createEventDispatcher } from 'svelte'
+  import { leaveMeeting } from '../../../meetingController'
 
   export let room: Room
   export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
@@ -15,11 +15,7 @@
   $: isMyOffice = isOffice(room) && $myInfo?.room === $myOffice?._id
 
   async function leave (): Promise<void> {
-    if (isMyOffice && isOffice(room) && $myInfo !== undefined) {
-      await endMeeting(room, $rooms, $infos, $myInfo)
-    } else {
-      await leaveRoom($myInfo, $myOffice)
-    }
+    await leaveMeeting()
     dispatch('leave')
   }
 </script>
diff --git a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
index f790bf1c599..c06f30a9a1c 100644
--- a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { AccountRole, getCurrentAccount, hasAccountRole } from '@hcengineering/core'
   import { ModernButton } from '@hcengineering/ui'
-  import { isRecording, isRecordingAvailable, record } from '../../../utils'
+  import { isRecording, isRecordingAvailable, loveClient } from '../../../utils'
   import love from '../../../plugin'
   import { lkSessionConnected } from '../../../liveKitClient'
   import { Room } from '@hcengineering/love'
 
   export let room: Room
   export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
+
 </script>
 
 {#if hasAccountRole(getCurrentAccount(), AccountRole.User) && $isRecordingAvailable}
@@ -17,6 +18,6 @@
     disabled={!$lkSessionConnected}
     kind={'secondary'}
     {size}
-    on:click={() => record(room)}
+    on:click={() => loveClient.record(room)}
   />
 {/if}
diff --git a/plugins/love-resources/src/components/meeting/widget/WidgetSwitcher.svelte b/plugins/love-resources/src/components/meeting/widget/WidgetSwitcher.svelte
index b3c87ce2673..2c6a768411b 100644
--- a/plugins/love-resources/src/components/meeting/widget/WidgetSwitcher.svelte
+++ b/plugins/love-resources/src/components/meeting/widget/WidgetSwitcher.svelte
@@ -18,10 +18,9 @@
   import { AppItem } from '@hcengineering/workbench-resources'
   import { RoomType } from '@hcengineering/love'
   import { currentRoom } from '../../../stores'
-  import { isSharingEnabled } from '../../../utils'
   import { state } from '@hcengineering/media-resources'
   import love from '../../../plugin'
-  import { lkSessionConnected } from '../../../liveKitClient'
+  import { lkSessionConnected, ScreenSharingState, screenSharingState } from '../../../liveKitClient'
 
   export let label: IntlString
   export let icon: Asset | AnySvelteComponent
@@ -35,7 +34,7 @@
 
 <AppItem
   {label}
-  icon={$isSharingEnabled
+  icon={$screenSharingState === ScreenSharingState.Local
     ? love.icon.SharingDisabled
     : $lkSessionConnected && allowCam && !isCamEnabled && !isMicEnabled
       ? love.icon.CamDisabled
@@ -46,7 +45,7 @@
             : icon}
   {selected}
   {size}
-  kind={$isSharingEnabled
+  kind={$screenSharingState === ScreenSharingState.Local
     ? 'negative'
     : $lkSessionConnected && isCamEnabled
       ? 'positive'
diff --git a/plugins/love-resources/src/liveKitClient.ts b/plugins/love-resources/src/liveKitClient.ts
index 7a41c824582..c276e1ba606 100644
--- a/plugins/love-resources/src/liveKitClient.ts
+++ b/plugins/love-resources/src/liveKitClient.ts
@@ -16,14 +16,14 @@ import { translate } from '@hcengineering/platform'
 import { getMediaDevices, getSelectedSpeakerId, type MediaSession } from '@hcengineering/media'
 import { LoveEvents } from '@hcengineering/love'
 import { useMedia } from '@hcengineering/media-resources'
-import { get, writable } from 'svelte/store'
+import { writable } from 'svelte/store'
 import { Analytics } from '@hcengineering/analytics'
 import { addNotification, NotificationSeverity } from '@hcengineering/ui'
 import { getCurrentLanguage } from '@hcengineering/theme'
 import LastParticipantNotification from './components/meeting/LastParticipantNotification.svelte'
 import love from './plugin'
-import { leaveRoom } from './utils'
-import { $myPreferences, myInfo, myOffice } from './stores'
+import { $myPreferences } from './stores'
+import { leaveMeeting } from './meetingController'
 
 export enum ScreenSharingState {
   Inactive,
@@ -288,7 +288,7 @@ export class LiveKitClient {
       'love'
     )
     this.lastParticipantDisconnectTimeout = window.setTimeout(() => {
-      void leaveRoom(get(myInfo), get(myOffice))
+      void leaveMeeting()
     }, AUTO_DISCONNECT_DELAY_MS)
   }
 
diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetingController.ts
new file mode 100644
index 00000000000..00128e0da22
--- /dev/null
+++ b/plugins/love-resources/src/meetingController.ts
@@ -0,0 +1,256 @@
+import core, { AccountRole, getCurrentAccount, type Ref } from "@hcengineering/core";
+import love, { getFreeRoomPlace, MeetingStatus, type Room, RoomType, isOffice, RoomAccess, RequestStatus, type JoinRequest, type Invite } from "@hcengineering/love";
+import presentation, { createQuery, getClient } from "@hcengineering/presentation";
+import { closeMeetingMinutes, getLiveKitEndpoint, getRoomName, liveKitClient, loveClient, navigateToOfficeDoc } from "./utils";
+import { get } from "svelte/store";
+import { infos, myInfo, myOffice, rooms } from "./stores";
+import { getCurrentEmployee, type Person } from "@hcengineering/contact";
+import { getPersonByPersonRef } from '@hcengineering/contact-resources'
+import { getMetadata } from "@hcengineering/platform";
+
+const requestsQuery = createQuery(true)
+
+export async function createMeeting(room: Room) {
+  if (room.access === RoomAccess.DND) return
+
+  const me = getCurrentEmployee()
+  const currentPerson = await getPersonByPersonRef(me)
+
+  if (isOffice(room) && room.person !== currentPerson?._id) {
+    sendJoinRequest(room)
+    return
+  }
+
+  const client = getClient()
+  let meeting = await client.findOne(love.class.MeetingMinutes, {
+    attachedTo: room._id,
+    status: MeetingStatus.Active
+  })
+
+  if (meeting !== undefined) {
+    await joinMeeting(room)
+    return
+  }
+
+  await createMeetingDocument(room)
+  await connectToMeeting(room)
+}
+
+export async function leaveMeeting (): Promise<void> {
+  const client = getClient()
+  const currentParticipationInfo = get(myInfo)
+  const office = get(myOffice)
+  if (currentParticipationInfo === undefined) return
+
+  if (office === undefined) {
+    await client.update(currentParticipationInfo, { room: love.ids.Reception, x: 0, y: 0 })
+  } else {
+    if (currentParticipationInfo.room !== office._id) {
+      await client.update(currentParticipationInfo, { room: office._id, x: 0, y: 0 })
+    } else {
+      //kick all participants in case of own office
+      const allRooms = get(rooms)
+      const participantsInfo = get(infos)
+      const otherParticipants = participantsInfo.filter((p) => p.room === office._id && p !== currentParticipationInfo)
+      for (const participantInfo of otherParticipants) {
+        const participantOffice = allRooms.find((r) => isOffice(r) && r.person === participantInfo.person)
+        await client.update(participantInfo, { room: participantOffice?._id ?? love.ids.Reception, x: 0, y: 0 })
+      }
+    }
+  }
+  await liveKitClient.disconnect()
+  closeMeetingMinutes()
+
+}
+
+export async function joinMeeting (room: Room) {
+  if (room.access === RoomAccess.DND) return
+
+  const isGuest = getCurrentAccount().role === AccountRole.Guest
+  if (room.access === RoomAccess.Knock || isOffice(room) || isGuest) {
+    sendJoinRequest(room)
+    return
+  }
+
+  connectToMeeting(room)
+}
+
+export async function acceptInvite (invite: Invite) {
+  const client = getClient()
+  await client.update(invite, { status: RequestStatus.Approved })
+  const room = getRoomById(invite.room)
+
+  if (room === undefined) return
+
+  connectToMeeting(room)
+}
+
+export async function rejectInvite (invite: Invite): Promise<void> {
+  const client = getClient()
+  await client.update(invite, { status: RequestStatus.Rejected })
+}
+
+export async function cancelInvites (invites: Invite[]): Promise<void> {
+  const client = getClient()
+  for (const invite of invites) {
+    if (invite.status === RequestStatus.Pending) {
+      await client.remove(invite)
+    }
+  }
+}
+
+export async function sendInvite (person: Ref<Person>, room: Ref<Room> | undefined): Promise<void> {
+  if (room === undefined || room === love.ids.Reception) return
+  const client = getClient()
+  const me = getCurrentEmployee()
+  await client.createDoc(love.class.Invite, core.space.Workspace, {
+    target: person,
+    room,
+    status: RequestStatus.Pending,
+    from: me
+  })
+}
+
+export async function acceptJoinRequest (request: JoinRequest) {
+  const client = getClient()
+  const room = getRoomById(request.room) 
+
+  if (room === undefined) return
+
+  const meeting = await client.findOne(love.class.MeetingMinutes, {
+    attachedTo: room._id,
+    status: MeetingStatus.Active
+  })
+  if (meeting !== undefined) {
+    await createMeetingDocument(room)
+  }
+
+  await client.update(request, { status: RequestStatus.Approved })
+  await connectToMeeting(room)
+}
+
+export async function rejectJoinRequest (request: JoinRequest): Promise<void> {
+  const client = getClient() 
+  await client.update(request, { status: RequestStatus.Rejected })
+}
+
+export async function cancelJoinRequest (request: JoinRequest): Promise<void> {
+  if (request.status === RequestStatus.Pending) {
+    const client = getClient()
+    await client.remove(request)
+  }
+}
+
+async function sendJoinRequest (room: Room) {
+  if (room.access === RoomAccess.DND) return
+
+  const me = getCurrentEmployee()
+  const currentPerson = await getPersonByPersonRef(me)
+
+  if (currentPerson == null) {
+    return
+  }
+
+  if (isOffice(room) && room.person === currentPerson._id) {
+    return
+  }
+
+  const client = getClient()
+  const _id = await client.createDoc(love.class.JoinRequest, core.space.Workspace, {
+    person: currentPerson._id,
+    room: room._id,
+    status: RequestStatus.Pending
+  })
+  requestsQuery.query(love.class.JoinRequest, { person: me, _id }, (res) => {
+    const req = res[0]
+    if (req === undefined) return
+    if (req.status === RequestStatus.Pending) return
+    requestsQuery.unsubscribe()
+    if (req.status === RequestStatus.Approved) {
+      connectToMeeting(room)
+    }
+  })
+}
+
+export async function kick (person: Ref<Person>): Promise<void> {
+  //TODO: Office kick participant
+}
+
+async function connectToMeeting (room: Room): Promise<void> {
+  if (getCurrentAccount().role === AccountRole.ReadOnlyGuest) return
+
+  await navigateToOfficeDoc(room)
+  await moveToMeetingRoom(room)
+
+  const token = await loveClient.getRoomToken(room)
+  try {
+    const wsURL = getLiveKitEndpoint()
+    await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
+  } catch (err) {
+    console.error(err)
+    await leaveMeeting()
+  }
+}
+
+async function moveToMeetingRoom (room: Room): Promise<void> {
+  const me = getCurrentEmployee()
+  const currentPerson = await getPersonByPersonRef(me)
+  const client = getClient()
+  const myParticipation = get(myInfo)
+  if (myParticipation?.room === room._id) return
+  if (room === undefined || currentPerson == null) return
+  const roomParticipants = get(infos).filter((p) => p.room === room._id)
+  const place = getFreeRoomPlace(room, roomParticipants, me)
+  const sessionId = getMetadata(presentation.metadata.SessionId) ?? null
+
+  const currentInfo = get(myInfo)
+  if (currentInfo !== undefined) {
+    await client.diffUpdate(currentInfo, {
+      x: place.x,
+      y: place.y,
+      room: room._id,
+      sessionId
+    })
+  } else {
+    await client.createDoc(love.class.ParticipantInfo, core.space.Workspace, {
+      x: place.x,
+      y: place.y,
+      room: room._id,
+      person: currentPerson._id,
+      name: currentPerson.name,
+      account: getCurrentAccount().uuid,
+      sessionId
+    })
+  }
+}
+
+async function createMeetingDocument (room: Room): Promise<void> {
+  const client = getClient()
+  await client.createDoc(
+    love.class.MeetingMinutes,
+    core.space.Workspace,
+    {
+      description: null,
+      attachedTo: room._id,
+      status: MeetingStatus.Active,
+      title: await getNewMeetingTitle(room),
+      attachedToClass: love.class.Room,
+      collection: 'meetings'
+    })
+}
+
+async function getNewMeetingTitle (room: Room): Promise<string> { 
+  const date = new Date()
+    .toLocaleDateString('en-GB', {
+      day: 'numeric',
+      month: 'long',
+      year: 'numeric'
+    })
+    .replace(',', ' at')
+  return `${await getRoomName(room)} ${date}`
+}
+
+function getRoomById (roomId: Ref<Room>): Room | undefined {
+  const allRooms = get(rooms)
+  return allRooms.find((p) => p._id === roomId)
+}
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index 17d7a3c14b8..66b8a71ca80 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -3,7 +3,7 @@ import { connectMeeting, disconnectMeeting } from '@hcengineering/ai-bot-resourc
 import { Analytics } from '@hcengineering/analytics'
 import calendar, { type Event, getAllEvents, type Schedule } from '@hcengineering/calendar'
 import chunter from '@hcengineering/chunter'
-import contact, { getCurrentEmployee, getName, type Person } from '@hcengineering/contact'
+import { getName } from '@hcengineering/contact'
 import core, {
   AccountRole,
   type Client,
@@ -12,7 +12,6 @@ import core, {
   type Doc,
   type DocumentQuery,
   getCurrentAccount,
-  type Hierarchy,
   type Ref,
   type RelatedDocument,
   type Space,
@@ -21,7 +20,6 @@ import core, {
 } from '@hcengineering/core'
 import login from '@hcengineering/login'
 import {
-  getFreeRoomPlace,
   type Invite,
   isOffice,
   type JoinRequest,
@@ -30,14 +28,9 @@ import {
   type Meeting,
   type MeetingMinutes,
   type MeetingSchedule,
-  MeetingStatus,
-  type Office,
   type ParticipantInfo,
-  RequestStatus,
   type Room,
-  RoomAccess,
   type RoomMetadata,
-  RoomType,
   TranscriptionStatus
 } from '@hcengineering/love'
 import { getEmbeddedLabel, getMetadata, getResource, type IntlString } from '@hcengineering/platform'
@@ -70,14 +63,14 @@ import { getPersonByPersonRef } from '@hcengineering/contact-resources'
 import MeetingMinutesSearchItem from './components/MeetingMinutesSearchItem.svelte'
 import RoomSettingsPopup from './components/RoomSettingsPopup.svelte'
 import love from './plugin'
-import { $myPreferences, currentMeetingMinutes, currentRoom, myOffice, selectedRoomPlace } from './stores'
+import { $myPreferences, currentMeetingMinutes, currentRoom } from './stores'
 import { getLiveKitClient } from './liveKitClient'
 import { getLoveClient } from './loveClient'
 
 export const liveKitClient = getLiveKitClient()
 export const lk: LKRoom = liveKitClient.liveKitRoom
 
-const loveClient = getLoveClient()
+export const loveClient = getLoveClient()
 
 export function setCustomCreateScreenTracks (value: () => Promise<Array<LocalTrack<Track.Kind>>>): void {
   lk.localParticipant.createScreenTracks = value
@@ -202,18 +195,10 @@ lk.on(RoomEvent.RoomMetadataChanged, (metadata) => {
 
 lk.on(RoomEvent.Connected, () => {
   isRecording.set(lk.isRecording)
-  void initRoom()
+  initRoomMetadata(lk.metadata)
   Analytics.handleEvent(LoveEvents.ConnectedToRoom)
 })
 
-async function initRoom (): Promise<void> {
-  const room = get(currentRoom)
-  if (room !== undefined) {
-    await initMeetingMinutes(room)
-  }
-  await initRoomMetadata(lk.metadata)
-}
-
 async function initRoomMetadata (metadata: string | undefined): Promise<void> {
   const room = get(currentRoom)
   const data: RoomMetadata = parseMetadata(metadata)
@@ -241,20 +226,7 @@ function parseMetadata (metadata: string | undefined): RoomMetadata {
   }
 }
 
-export async function leaveRoom (ownInfo: ParticipantInfo | undefined, ownOffice: Office | undefined): Promise<void> {
-  if (ownInfo !== undefined) {
-    const client = getClient()
-    if (ownOffice !== undefined && ownInfo.room !== ownOffice._id) {
-      await client.update(ownInfo, { room: ownOffice._id, x: 0, y: 0 })
-    } else if (ownOffice === undefined) {
-      await client.update(ownInfo, { room: love.ids.Reception, x: 0, y: 0 })
-    }
-  }
-  await liveKitClient.disconnect()
-  closeMeetingMinutes()
-}
-
-function closeMeetingMinutes (): void {
+export function closeMeetingMinutes (): void {
   const loc = getCurrentLocation()
 
   if (loc.path[2] === loveId) {
@@ -269,20 +241,6 @@ function closeMeetingMinutes (): void {
   currentMeetingMinutes.set(undefined)
 }
 
-function isRoomOpened (room: Room): boolean {
-  const loc = getCurrentLocation()
-
-  if (loc.path[2] === loveId) {
-    const panel = get(panelstore).panel
-    const { _id } = panel ?? {}
-
-    if (_id !== undefined && room._id !== undefined && _id === room._id) {
-      return true
-    }
-  }
-  return false
-}
-
 export async function getRoomName (room: Room): Promise<string> {
   if (isOffice(room) && room.person !== null && room.name === '') {
     const employee = await getPersonByPersonRef(room.person)
@@ -300,40 +258,8 @@ export async function getRoomLabel (room: Room): Promise<IntlString> {
   return isOffice(room) ? love.string.Office : love.string.Room
 }
 
-async function moveToRoom (
-  x: number,
-  y: number,
-  currentInfo: ParticipantInfo | undefined,
-  currentPerson: Person,
-  room: Room,
-  sessionId: string | null
-): Promise<void> {
-  const client = getClient()
-  if (currentInfo !== undefined) {
-    await client.diffUpdate(currentInfo, {
-      x,
-      y,
-      room: room._id,
-      sessionId
-    })
-  } else {
-    await client.createDoc(love.class.ParticipantInfo, core.space.Workspace, {
-      x,
-      y,
-      room: room._id,
-      person: currentPerson._id,
-      name: currentPerson.name,
-      account: getCurrentAccount().uuid,
-      sessionId
-    })
-  }
-
-  if (!isRoomOpened(room)) {
-    await navigateToOfficeDoc(client.getHierarchy(), room)
-  }
-}
-
-async function navigateToOfficeDoc (hierarchy: Hierarchy, object: Doc): Promise<void> {
+export async function navigateToOfficeDoc (object: Doc): Promise<void> {
+  const hierarchy = getClient().getHierarchy()
   const panelComponent = hierarchy.classHierarchyMixin(object._class, view.mixin.ObjectPanel)
   const comp = panelComponent?.component ?? view.component.EditDoc
   const loc = await getObjectLinkFragment(hierarchy, object, {}, comp)
@@ -343,53 +269,12 @@ async function navigateToOfficeDoc (hierarchy: Hierarchy, object: Doc): Promise<
   navigate(loc)
 }
 
-async function initMeetingMinutes (room: Room): Promise<void> {
-  const client = getClient()
-  const doc = await client.findOne(love.class.MeetingMinutes, {
-    attachedTo: room._id,
-    status: MeetingStatus.Active
-  })
-
-  if (doc !== undefined) {
-    currentMeetingMinutes.set(doc)
-    const loc = getCurrentLocation()
-    if (loc.path[2] === loveId || room.type === RoomType.Video) {
-      await navigateToOfficeDoc(client.getHierarchy(), doc)
-    }
-  }
-}
-
 export async function prepareRoomConnection (room: Room): Promise<void> {
   const roomToken = await loveClient.getRoomToken(room)
   liveKitClient.prepareConnection(getLiveKitEndpoint(), roomToken)
 }
 
-export async function connectRoom (
-  x: number,
-  y: number,
-  currentInfo: ParticipantInfo | undefined,
-  currentPerson: Person,
-  room: Room
-): Promise<void> {
-  liveKitClient.isConnecting = true
-  await moveToRoom(x, y, currentInfo, currentPerson, room, getMetadata(presentation.metadata.SessionId) ?? null)
-  selectedRoomPlace.set(undefined)
-  if (getCurrentAccount().role === AccountRole.ReadOnlyGuest) {
-    return
-  }
-  await liveKitClient.disconnect()
-  const token = await loveClient.getRoomToken(room)
-  try {
-    const wsURL = getLiveKitEndpoint()
-    await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
-  } catch (err) {
-    console.error(err)
-    await leaveRoom(currentInfo, get(myOffice))
-  }
-}
-
 export const joinRequest: Ref<JoinRequest> | undefined = undefined
-const requestsQuery = createQuery(true)
 
 export function calculateFloorSize (_rooms: Room[], preview?: boolean): number {
   let fH: number = 5
@@ -399,147 +284,6 @@ export function calculateFloorSize (_rooms: Room[], preview?: boolean): number {
   return fH
 }
 
-function checkPlace (room: Room, info: ParticipantInfo[], x: number, y: number): boolean {
-  return !isOffice(room) && info.find((p) => p.x === x && p.y === y) === undefined
-}
-
-export async function connectToMeeting (
-  currentInfo: ParticipantInfo | undefined,
-  info: ParticipantInfo[],
-  currentRequests: JoinRequest[],
-  currentInvites: Invite[],
-  meetId: string
-): Promise<void> {
-  const client = getClient()
-  const meeting = await client.findOne(love.mixin.Meeting, { _id: meetId as Ref<Meeting> })
-  if (meeting === undefined) return
-  const room = await client.findOne(love.class.Room, { _id: meeting.room })
-  if (room === undefined) return
-
-  // check time (it should be 10 minutes before the meeting or active in roomInfo)
-  const now = new Date()
-  const res = getAllEvents([meeting], now.setMinutes(now.getMinutes() - 10), new Date().getTime())
-  if (res.length === 0) {
-    console.log('Meeting is not active')
-    return
-  }
-
-  await tryConnect(
-    currentInfo,
-    room,
-    info.filter((p) => p.room === room._id),
-    currentRequests,
-    currentInvites
-  )
-}
-
-export async function tryConnect (
-  currentInfo: ParticipantInfo | undefined,
-  room: Room,
-  info: ParticipantInfo[],
-  currentRequests: JoinRequest[],
-  currentInvites: Invite[],
-  place?: { x: number, y: number }
-): Promise<void> {
-  if (liveKitClient.isConnecting) return
-  const me = getCurrentEmployee()
-  const currentPerson = await getPersonByPersonRef(me)
-  if (currentPerson == null) return
-  const client = getClient()
-
-  // guests can't join without invite
-  if (!client.getHierarchy().hasMixin(currentPerson, contact.mixin.Employee)) return
-
-  if (room._id === currentInfo?.room) return
-  if (room.access === RoomAccess.DND) return
-  for (const req of currentRequests) {
-    await client.remove(req)
-  }
-  if (place !== undefined && !checkPlace(room, info, place.x, place.y)) {
-    place = undefined
-  }
-  if (place === undefined) {
-    place = getFreeRoomPlace(room, info, me)
-  }
-  const x: number = place.x
-  const y: number = place.y
-  if (isOffice(room)) {
-    if (room.person === null) return
-    // we should check that office owner in office
-    const owner = room.person
-    if (owner === currentPerson._id) {
-      // it's our office if it's empty let's disconnect
-      if (info.length === 0) {
-        await leaveRoom(currentInfo, room)
-        return
-      }
-    } else {
-      const ownerInfo = info.find((p) => p.person === owner)
-      if (ownerInfo?.room !== room._id) {
-        return
-      }
-    }
-  }
-
-  for (const invite of currentInvites) {
-    await client.update(invite, { status: invite.room === room._id ? RequestStatus.Approved : RequestStatus.Rejected })
-  }
-
-  const isGuest = getCurrentAccount().role === AccountRole.Guest
-  if ((room.access === RoomAccess.Knock || isGuest) && (!isOffice(room) || room.person !== currentPerson._id)) {
-    const _id = await client.createDoc(love.class.JoinRequest, core.space.Workspace, {
-      person: currentPerson._id,
-      room: room._id,
-      status: RequestStatus.Pending
-    })
-    requestsQuery.query(love.class.JoinRequest, { person: me, _id }, (res) => {
-      const req = res[0]
-      if (req === undefined) return
-      if (req.status === RequestStatus.Pending) return
-      requestsQuery.unsubscribe()
-      if (req.status === RequestStatus.Approved) {
-        void connectRoom(x, y, currentInfo, currentPerson, room)
-      }
-    })
-    // we should send request to room owner if it ouffice and all participants if not
-  } else {
-    await connectRoom(x, y, currentInfo, currentPerson, room)
-  }
-}
-
-export async function endMeeting (
-  room: Office,
-  rooms: Room[],
-  infos: ParticipantInfo[],
-  currentInfo: ParticipantInfo
-): Promise<void> {
-  const roomInfos = infos.filter((p) => p.room === room._id && room.person !== p.person)
-  for (const roomInfo of roomInfos) {
-    await kick(roomInfo.person, rooms, infos)
-  }
-  await leaveRoom(currentInfo, room)
-}
-
-export async function kick (person: Ref<Person>, rooms: Room[], infos: ParticipantInfo[]): Promise<void> {
-  const personInfo = infos.find((p) => p.person === person)
-  if (personInfo === undefined) return
-  const personOffice = rooms.find((r) => isOffice(r) && r.person === personInfo.person)
-  const client = getClient()
-  await client.update(personInfo, { room: personOffice?._id ?? love.ids.Reception, x: 0, y: 0 })
-}
-
-export async function invite (person: Ref<Person>, room: Ref<Room> | undefined): Promise<void> {
-  if (room === undefined || room === love.ids.Reception) return
-  const client = getClient()
-  const me = getCurrentEmployee()
-  await client.createDoc(love.class.Invite, core.space.Workspace, {
-    target: person,
-    room,
-    status: RequestStatus.Pending,
-    from: me
-  })
-}
-
 async function checkRecordAvailable (): Promise<void> {
   try {
     const endpoint = getMetadata(love.metadata.ServiceEnpdoint)

From 4206919c3ef3c8f0fb2b89f631e9559ae2fc6767 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Wed, 10 Sep 2025 20:52:01 +0700
Subject: [PATCH 06/25] Fix accepting invites

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../love-resources/src/meetingController.ts   | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetingController.ts
index 00128e0da22..582a3650fb3 100644
--- a/plugins/love-resources/src/meetingController.ts
+++ b/plugins/love-resources/src/meetingController.ts
@@ -9,6 +9,7 @@ import { getPersonByPersonRef } from '@hcengineering/contact-resources'
 import { getMetadata } from "@hcengineering/platform";
 
 const requestsQuery = createQuery(true)
+const invitesQuery = createQuery(true)
 
 export async function createMeeting(room: Room) {
   if (room.access === RoomAccess.DND) return
@@ -82,6 +83,14 @@ export async function acceptInvite (invite: Invite) {
 
   if (room === undefined) return
 
+  const meeting = await client.findOne(love.class.MeetingMinutes, {
+    attachedTo: room._id,
+    status: MeetingStatus.Active
+  })
+  if (meeting !== undefined) {
+    await createMeetingDocument(room)
+  }
+
   connectToMeeting(room)
 }
 
@@ -103,12 +112,23 @@ export async function sendInvite (person: Ref<Person>, room: Ref<Room> | undefin
   if (room === undefined || room === love.ids.Reception) return
   const client = getClient()
   const me = getCurrentEmployee()
-  await client.createDoc(love.class.Invite, core.space.Workspace, {
+  const _id = await client.createDoc(love.class.Invite, core.space.Workspace, {
     target: person,
     room,
     status: RequestStatus.Pending,
     from: me
   })
+  invitesQuery.query(love.class.Invite, { from: me, _id }, (res) => {
+    const invite = res[0]
+    if (invite === undefined) return
+    if (invite.status === RequestStatus.Pending) return
+    invitesQuery.unsubscribe()
+    if (invite.status === RequestStatus.Approved) {
+      const room = getRoomById(invite.room)
+      if (room === undefined) return
+      connectToMeeting(room)
+    }
+  })
 }
 
 export async function acceptJoinRequest (request: JoinRequest) {

From d4c2e798ed17d2f55c644051833aa0c38c4aa22d Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 11 Sep 2025 14:28:52 +0700
Subject: [PATCH 07/25] Add invite button to the employee popup

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 models/love/src/index.ts                      |  6 +++
 models/love/src/plugin.ts                     |  3 +-
 .../src/components/DirectMessageButton.svelte | 28 +++++++----
 .../person/EmployeePreviewPopup.svelte        | 12 ++---
 plugins/love-assets/assets/icons.svg          |  6 +--
 .../src/components/PersonActionPopup.svelte   |  2 +-
 .../src/components/meeting/ControlExt.svelte  |  8 +--
 .../invites}/ActiveInvitesPopup.svelte        |  4 +-
 .../invites/InviteEmployeeButton.svelte       | 50 +++++++++++++++++++
 .../{ => meeting/invites}/InvitePopup.svelte  |  4 +-
 .../{ => meeting/invites}/RequestPopup.svelte |  4 +-
 .../invites}/RequestingPopup.svelte           |  8 +--
 plugins/love-resources/src/index.ts           |  4 +-
 .../love-resources/src/meetingController.ts   |  4 +-
 14 files changed, 105 insertions(+), 38 deletions(-)
 rename plugins/love-resources/src/components/{ => meeting/invites}/ActiveInvitesPopup.svelte (93%)
 create mode 100644 plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
 rename plugins/love-resources/src/components/{ => meeting/invites}/InvitePopup.svelte (95%)
 rename plugins/love-resources/src/components/{ => meeting/invites}/RequestPopup.svelte (95%)
 rename plugins/love-resources/src/components/{ => meeting/invites}/RequestingPopup.svelte (88%)

diff --git a/models/love/src/index.ts b/models/love/src/index.ts
index b1855972082..775e5d556b4 100644
--- a/models/love/src/index.ts
+++ b/models/love/src/index.ts
@@ -719,6 +719,12 @@ export function createModel (builder: Builder): void {
     love.completion.MeetingMinutesCategory
   )
 
+  // Extensions
+  builder.createDoc(presentation.class.ComponentPointExtension, core.space.Model, {
+    extension: contact.extension.EmployeePopupActions,
+    component: love.component.InviteEmployeeButton
+  })
+
   createAttributePresenter(
     builder,
     view.component.DateTimePresenter,
diff --git a/models/love/src/plugin.ts b/models/love/src/plugin.ts
index e7ef3245487..9a00b3fc5af 100644
--- a/models/love/src/plugin.ts
+++ b/models/love/src/plugin.ts
@@ -32,7 +32,8 @@ export default mergeIds(loveId, love, {
     WidgetSwitcher: '' as AnyComponent,
     RoomLanguageEditor: '' as AnyComponent,
     MediaPopupItemExt: '' as AnyComponent,
-    SharingStateIndicator: '' as AnyComponent
+    SharingStateIndicator: '' as AnyComponent,
+    InviteEmployeeButton: '' as AnyComponent,
   },
   app: {
     Love: '' as Ref<Doc>
diff --git a/plugins/chunter-resources/src/components/DirectMessageButton.svelte b/plugins/chunter-resources/src/components/DirectMessageButton.svelte
index e0cfbff3dfa..dc10f34e69e 100644
--- a/plugins/chunter-resources/src/components/DirectMessageButton.svelte
+++ b/plugins/chunter-resources/src/components/DirectMessageButton.svelte
@@ -44,12 +44,22 @@
   }
 </script>
 
-<ModernButton
-  label={type === 'type-button-icon' ? undefined : chunter.string.Message}
-  icon={icon ?? view.icon.Bubble}
-  size="small"
-  iconSize="small"
-  {type}
-  {kind}
-  on:click={openDirect}
-/>
+<div class="button-container">
+  <ModernButton
+    label={type === 'type-button-icon' ? undefined : chunter.string.Message}
+    icon={icon ?? view.icon.Bubble}
+    size="small"
+    iconSize="small"
+    {type}
+    {kind}
+    on:click={openDirect}
+  />
+</div>
+
+<style lang="scss">
+  .button-container {
+    border-radius: var(--small-BorderRadius);
+    display: flex;
+    background-color: var(--theme-button-container-color);
+  }
+</style>
diff --git a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
index e2989784e95..d35e6bc2b65 100644
--- a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
+++ b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
@@ -40,7 +40,7 @@
   let isEmployee: boolean = false
 
   $: personByRefStore = getPersonByPersonRefStore([_id])
-  $: employee = $employeeByIdStore.get(_id) ?? $personByRefStore.get(_id)
+$: employee = $employeeByIdStore.get(_id) ?? $personByRefStore.get(_id)
   $: isEmployee = $employeeByIdStore.has(_id)
   $: void loadPersonTimezone(employee)
 
@@ -133,12 +133,10 @@
   <div slot="actions">
     {#if !disabled}
       <div class="flex-presenter flex-gap-2 flex-center">
-        <div class="button-container">
-          <ComponentExtensions
-            extension={contact.extension.EmployeePopupActions}
-            props={{ employee, icon: contact.icon.Chat, type: 'type-button-icon' }}
-          />
-        </div>
+        <ComponentExtensions
+          extension={contact.extension.EmployeePopupActions}
+          props={{ employee, icon: contact.icon.Chat, type: 'type-button-icon', class:'button-container' }}
+        />
         <div class="button-container">
           <ButtonIcon icon={contact.icon.User} size="small" iconSize="small" on:click={viewProfile} />
         </div>
diff --git a/plugins/love-assets/assets/icons.svg b/plugins/love-assets/assets/icons.svg
index 8d169371019..798e12b6518 100644
--- a/plugins/love-assets/assets/icons.svg
+++ b/plugins/love-assets/assets/icons.svg
@@ -82,10 +82,8 @@
   <symbol id="stopRecord" viewBox="0 0 256 256">
     <path d="M128,24A104,104,0,1,0,232,128,104.11791,104.11791,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.09957,88.09957,0,0,1,128,216Zm72-88a72,72,0,1,1-72-72A72.08124,72.08124,0,0,1,200,128Z" fill="#CB4B42"/>
   </symbol>
-  <symbol id="invite" viewBox="0 0 32 32">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M16 18C20.4183 18 24 14.4183 24 10C24 5.58172 20.4183 2 16 2C11.5817 2 8 5.58172 8 10C8 14.4183 11.5817 18 16 18ZM16 16C19.3137 16 22 13.3137 22 10C22 6.68629 19.3137 4 16 4C12.6863 4 10 6.68629 10 10C10 13.3137 12.6863 16 16 16Z" />
-    <path d="M24 21C24 20.4477 24.4477 20 25 20C25.5523 20 26 20.4477 26 21V24H29C29.5523 24 30 24.4477 30 25C30 25.5523 29.5523 26 29 26H26V29C26 29.5523 25.5523 30 25 30C24.4477 30 24 29.5523 24 29V26H21C20.4477 26 20 25.5523 20 25C20 24.4477 20.4477 24 21 24H24V21Z" />
-    <path d="M13 20C9.13401 20 6 23.134 6 27V29C6 29.5523 6.44772 30 7 30C7.55228 30 8 29.5523 8 29V27C8 24.2386 10.2386 22 13 22H17C17.5523 22 18 21.5523 18 21C18 20.4477 17.5523 20 17 20H13Z" />
+  <symbol id="invite" viewBox="0 0 24 24">
+<path fill-rule="evenodd" d="M10.9745053,6.25438069 C11.5604671,6.90391332 11.3746817,7.63976469 10.8565778,8.33797195 C10.7337406,8.50350982 10.5921521,8.6666145 10.4211441,8.84634226 C10.3390625,8.93260918 10.2750591,8.99748744 10.141183,9.13149508 C9.83714115,9.43583583 9.58155513,9.69156272 9.37441088,9.89868984 C9.27396046,9.99913195 9.95978257,11.3696024 11.2907766,12.7019048 C12.6210476,14.0334833 13.9914431,14.7197765 14.0923663,14.6187976 L14.8586096,13.852132 C15.2805737,13.4297532 15.5040355,13.2259664 15.8111037,13.0245121 C16.4494656,12.6057102 17.1457524,12.4919023 17.7329975,13.0170075 C19.6503895,14.3885354 20.7354185,15.2301771 21.2669798,15.782495 C22.303783,16.8597835 22.1679037,18.5180455 21.2728679,19.4640525 C20.9625009,19.7920945 20.5689704,20.1858419 20.1041752,20.6339203 C17.2926326,23.4470127 11.3589665,21.7350681 6.81145433,17.1830859 C2.26291105,12.6300716 0.5518801,6.69583839 3.35753082,3.88868121 C3.86122573,3.37707043 4.02729858,3.211082 4.51785466,2.72771931 C5.43117982,1.82778693 7.16594962,1.68687606 8.22050841,2.7286095 C8.77521019,3.27656509 9.65955176,4.41440275 10.9745053,6.25438069 Z M16.2721965,15.266193 L15.5058008,16.0330112 C14.203091,17.336439 11.9845452,16.2253927 9.8770373,14.1158132 C7.76808363,12.0047866 6.65827534,9.78706944 7.96142436,8.48402821 C8.16828995,8.27717972 8.42363443,8.0216945 8.72744369,7.71758662 C8.8500234,7.59488642 8.90609452,7.5380489 8.97339653,7.46731514 C9.06509326,7.37094278 9.1404434,7.28630078 9.20077275,7.211402 C8.03540499,5.58806095 7.24320651,4.57370892 6.8161396,4.15183592 C6.59558525,3.93396391 6.1017247,3.97407893 5.9204189,4.1527261 C5.43686641,4.6291879 5.27792422,4.78804929 4.77626041,5.29755675 C2.9719475,7.10286418 4.35321008,11.8933879 8.22519368,15.7691775 C12.0959638,19.6437524 16.8857659,21.0256764 18.7038097,19.2068681 C19.161375,18.7655298 19.5342402,18.3924591 19.8212354,18.08912 C20.0286173,17.8699279 20.0656783,17.4176384 19.8271235,17.1697684 C19.4297888,16.7569185 18.4570205,15.9984643 16.777362,14.7922626 C16.6549304,14.8908077 16.5044234,15.033738 16.2721965,15.266193 Z M17,5 L17,2 L19,2 L19,5 L22,5 L22,7 L19,7 L19,10 L17,10 L17,7 L14,7 L14,5 L17,5 Z"/>
   </symbol>
   <symbol id="kick" viewBox="0 0 32 32">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M24 10C24 14.4183 20.4183 18 16 18C11.5817 18 8 14.4183 8 10C8 5.58172 11.5817 2 16 2C20.4183 2 24 5.58172 24 10ZM16 16C19.3137 16 22 13.3137 22 10C22 6.68629 19.3137 4 16 4C12.6863 4 10 6.68629 10 10C10 13.3137 12.6863 16 16 16Z" />
diff --git a/plugins/love-resources/src/components/PersonActionPopup.svelte b/plugins/love-resources/src/components/PersonActionPopup.svelte
index e2a599f0a9a..0f6edeef557 100644
--- a/plugins/love-resources/src/components/PersonActionPopup.svelte
+++ b/plugins/love-resources/src/components/PersonActionPopup.svelte
@@ -30,7 +30,7 @@
       label={love.string.Invite}
       icon={love.icon.Invite}
       action={() => {
-        sendInvite(person, $myInfo?.room)
+        sendInvite(person)
       }}
     />
     {#if room.access === RoomAccess.Knock}
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index 70bfc87f61a..58663476b45 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -36,11 +36,11 @@
     createMeetingWidget,
     getRoomName,
   } from '../../utils'
-  import ActiveInvitesPopup from '../ActiveInvitesPopup.svelte'
-  import InvitePopup from '../InvitePopup.svelte'
+  import ActiveInvitesPopup from './invites/ActiveInvitesPopup.svelte'
+  import InvitePopup from './invites/InvitePopup.svelte'
   import PersonActionPopup from '../PersonActionPopup.svelte'
-  import RequestPopup from '../RequestPopup.svelte'
-  import RequestingPopup from '../RequestingPopup.svelte'
+  import RequestPopup from './invites/RequestPopup.svelte'
+  import RequestingPopup from './invites/RequestingPopup.svelte'
   import RoomPopup from '../RoomPopup.svelte'
   import RoomButton from '../RoomButton.svelte'
   import { leaveMeeting } from '../../meetingController'
diff --git a/plugins/love-resources/src/components/ActiveInvitesPopup.svelte b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
similarity index 93%
rename from plugins/love-resources/src/components/ActiveInvitesPopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
index 8edab990c09..f849398e605 100644
--- a/plugins/love-resources/src/components/ActiveInvitesPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
@@ -17,8 +17,8 @@
   import { CombineAvatars } from '@hcengineering/contact-resources'
   import { Button, Label } from '@hcengineering/ui'
   import { Invite } from '@hcengineering/love'
-  import love from '../plugin'
-  import { cancelInvites } from '../meetingController'
+  import love from '../../../plugin'
+  import { cancelInvites } from '../../../meetingController'
 
   export let invites: Invite[]
 
diff --git a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
new file mode 100644
index 00000000000..7ab4de345ed
--- /dev/null
+++ b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
@@ -0,0 +1,50 @@
+
+<!--
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { ModernButton } from '@hcengineering/ui'
+  import { Employee } from '@hcengineering/contact'
+  import { sendInvite } from '../../../meetingController'
+  import love from '../../../plugin'
+
+  export let employee: Employee
+  export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
+  export let type: 'type-button' | 'type-button-icon' = 'type-button'
+
+  async function invite(): Promise<void> {
+    await sendInvite(employee._id)
+  }
+</script>
+
+<div class="button-container">
+  <ModernButton
+    label={type === 'type-button-icon' ? undefined : love.string.Invite}
+    icon={love.icon.Invite}
+    size="small"
+    iconSize="small"
+    {type}
+    {kind}
+    on:click={invite}
+  />
+</div>
+
+<style lang="scss">
+  .button-container {
+    border-radius: var(--small-BorderRadius);
+    display: flex;
+    background-color: var(--theme-button-container-color);
+  }
+</style>
+
diff --git a/plugins/love-resources/src/components/InvitePopup.svelte b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
similarity index 95%
rename from plugins/love-resources/src/components/InvitePopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
index 9198f9d43a0..7d3e93f2ad5 100644
--- a/plugins/love-resources/src/components/InvitePopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
@@ -20,8 +20,8 @@
   import { Invite } from '@hcengineering/love'
   import { onDestroy, onMount } from 'svelte'
 
-  import love from '../plugin'
-  import { acceptInvite, rejectInvite } from '../meetingController'
+  import love from '../../../plugin'
+  import { acceptInvite, rejectInvite } from '../../../meetingController'
 
   export let invite: Invite
 
diff --git a/plugins/love-resources/src/components/RequestPopup.svelte b/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
similarity index 95%
rename from plugins/love-resources/src/components/RequestPopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
index e1fc4615c1c..97c66a5db73 100644
--- a/plugins/love-resources/src/components/RequestPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
@@ -18,9 +18,9 @@
   import { playNotificationSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
   import { JoinRequest } from '@hcengineering/love'
-  import love from '../plugin'
+  import love from '../../../plugin'
   import { onDestroy, onMount } from 'svelte'
-  import { acceptJoinRequest, rejectJoinRequest } from '../meetingController'
+  import { acceptJoinRequest, rejectJoinRequest } from '../../../meetingController'
 
   export let request: JoinRequest
 
diff --git a/plugins/love-resources/src/components/RequestingPopup.svelte b/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
similarity index 88%
rename from plugins/love-resources/src/components/RequestingPopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
index d7ff2c6afe8..4c0499a89cc 100644
--- a/plugins/love-resources/src/components/RequestingPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
@@ -15,10 +15,10 @@
 <script lang="ts">
   import { Button, Label } from '@hcengineering/ui'
   import { JoinRequest } from '@hcengineering/love'
-  import love from '../plugin'
-  import { rooms } from '../stores'
-  import { getRoomLabel } from '../utils'
-  import { cancelJoinRequest } from '../meetingController'
+  import love from '../../../plugin'
+  import { rooms } from '../../../stores'
+  import { getRoomLabel } from '../../../utils'
+  import { cancelJoinRequest } from '../../../meetingController'
 
   export let request: JoinRequest
 
diff --git a/plugins/love-resources/src/index.ts b/plugins/love-resources/src/index.ts
index 5a9d3066980..c541cb53968 100644
--- a/plugins/love-resources/src/index.ts
+++ b/plugins/love-resources/src/index.ts
@@ -27,6 +27,7 @@ import MediaPopupItemExt from './components/MediaPopupItemExt.svelte'
 import SharingStateIndicator from './components/SharingStateIndicator.svelte'
 import MeetingScheduleData from './components/MeetingScheduleData.svelte'
 import EditMeetingScheduleData from './components/EditMeetingScheduleData.svelte'
+import InviteEmployeeButton from './components/meeting/invites/InviteEmployeeButton.svelte'
 
 import {
   copyGuestLink,
@@ -68,7 +69,8 @@ export default async (): Promise<Resources> => ({
     MediaPopupItemExt,
     SharingStateIndicator,
     MeetingScheduleData,
-    EditMeetingScheduleData
+    EditMeetingScheduleData,
+    InviteEmployeeButton
   },
   function: {
     CreateMeeting: createMeeting,
diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetingController.ts
index 582a3650fb3..57c84af7ff8 100644
--- a/plugins/love-resources/src/meetingController.ts
+++ b/plugins/love-resources/src/meetingController.ts
@@ -108,7 +108,9 @@ export async function cancelInvites (invites: Invite[]): Promise<void> {
   }
 }
 
-export async function sendInvite (person: Ref<Person>, room: Ref<Room> | undefined): Promise<void> {
+export async function sendInvite (person: Ref<Person>): Promise<void> {
+  const myParticipation = get(myInfo)
+  const room = myParticipation?.room
   if (room === undefined || room === love.ids.Reception) return
   const client = getClient()
   const me = getCurrentEmployee()

From 40023fdc7d3b3449c2309a8f26a9148e8ddbf570 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Mon, 15 Sep 2025 11:12:04 +0700
Subject: [PATCH 08/25] Add Invite button to the meeting controls

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../src/components/EditRoom.svelte            |   2 +-
 .../love-resources/src/components/Hall.svelte |   7 +-
 .../src/components/PersonActionPopup.svelte   |   8 +-
 .../src/components/meeting/ControlBar.svelte  |  10 +-
 .../src/components/meeting/ControlExt.svelte  |   8 +-
 .../meeting/controls/LeaveRoomButton.svelte   |   2 +-
 .../meeting/controls/RecordingButton.svelte   |   1 -
 .../meeting/controls/ShareScreenButton.svelte |   2 +-
 .../meeting/invites/ActiveInvitesPopup.svelte |  10 +-
 .../invites/InviteEmployeeButton.svelte       |  49 ++++++--
 .../meeting/widget/MeetingWidget.svelte       |   8 ++
 plugins/love-resources/src/liveKitClient.ts   |  46 ++++----
 plugins/love-resources/src/loveClient.ts      |   2 +-
 .../love-resources/src/meetingController.ts   | 109 ++++++++++--------
 plugins/love-resources/src/utils.ts           |  15 +--
 15 files changed, 164 insertions(+), 115 deletions(-)

diff --git a/plugins/love-resources/src/components/EditRoom.svelte b/plugins/love-resources/src/components/EditRoom.svelte
index d7dec21bc5f..431a036f8c7 100644
--- a/plugins/love-resources/src/components/EditRoom.svelte
+++ b/plugins/love-resources/src/components/EditRoom.svelte
@@ -40,7 +40,7 @@
     dispatch('open', { ignoreKeys: ['name'] })
   })
 
-  let tryConnecting = false
+  const tryConnecting = false
 
   async function connect (): Promise<void> {
     await createMeeting(object)
diff --git a/plugins/love-resources/src/components/Hall.svelte b/plugins/love-resources/src/components/Hall.svelte
index 405355ff9bf..b57f95339e7 100644
--- a/plugins/love-resources/src/components/Hall.svelte
+++ b/plugins/love-resources/src/components/Hall.svelte
@@ -18,12 +18,7 @@
   import { Floor as FloorType, Office, Room, isOffice } from '@hcengineering/love'
   import { deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
-  import {
-    activeFloor,
-    floors,
-    rooms,
-    selectedFloor,
-  } from '../stores'
+  import { activeFloor, floors, rooms, selectedFloor } from '../stores'
   import Floor from './Floor.svelte'
   import FloorConfigure from './FloorConfigure.svelte'
 
diff --git a/plugins/love-resources/src/components/PersonActionPopup.svelte b/plugins/love-resources/src/components/PersonActionPopup.svelte
index 0f6edeef557..a33b8ac121a 100644
--- a/plugins/love-resources/src/components/PersonActionPopup.svelte
+++ b/plugins/love-resources/src/components/PersonActionPopup.svelte
@@ -5,7 +5,7 @@
   import { ActionIcon } from '@hcengineering/ui'
   import love from '../plugin'
   import { myInfo } from '../stores'
-  import { joinMeeting, kick, sendInvite } from '../meetingController'
+  import { joinMeeting, kick, sendInvites } from '../meetingController'
 
   export let room: Room
   export let person: Ref<Person>
@@ -20,7 +20,7 @@
       label={love.string.Kick}
       icon={love.icon.Kick}
       action={() => {
-        kick(person)
+        void kick(person)
       }}
     />
   {/if}
@@ -30,7 +30,7 @@
       label={love.string.Invite}
       icon={love.icon.Invite}
       action={() => {
-        sendInvite(person)
+        void sendInvites([person])
       }}
     />
     {#if room.access === RoomAccess.Knock}
@@ -39,7 +39,7 @@
         label={love.string.KnockAction}
         icon={love.icon.Knock}
         action={() => {
-          joinMeeting(room)
+          void joinMeeting(room)
         }}
       />
     {/if}
diff --git a/plugins/love-resources/src/components/meeting/ControlBar.svelte b/plugins/love-resources/src/components/meeting/ControlBar.svelte
index 4b1313d0da9..7443a95bcf3 100644
--- a/plugins/love-resources/src/components/meeting/ControlBar.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlBar.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Room, RoomType } from '@hcengineering/love'
+  import { Room } from '@hcengineering/love'
   import { IconMaximize, ModernButton, Popup, showPopup, TooltipInstance } from '@hcengineering/ui'
 
   import love from '../../plugin'
@@ -31,6 +31,7 @@
   import MicrophoneButton from './controls/MicrophoneButton.svelte'
   import CameraButton from './controls/CameraButton.svelte'
   import ShareScreenButton from './controls/ShareScreenButton.svelte'
+  import InviteEmployeeButton from './invites/InviteEmployeeButton.svelte'
 
   export let room: Room
   export let canMaximize: boolean = true
@@ -52,6 +53,13 @@
     <svelte:fragment slot="right">
       {#if room._id !== love.ids.Reception && $lkSessionConnected}
         <RoomAccessButton {room} />
+        <InviteEmployeeButton
+          kind={'secondary'}
+          type={'type-button-icon'}
+          size={'large'}
+          iconSize={'medium'}
+          withBackground={false}
+        />
       {/if}
     </svelte:fragment>
     <svelte:fragment slot="center">
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index 58663476b45..e30651187cf 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -31,11 +31,7 @@
 
   import love from '../../plugin'
   import { activeInvites, currentRoom, infos, myInfo, myInvites, myRequests, rooms } from '../../stores'
-  import {
-    createMeetingVideoWidgetTab,
-    createMeetingWidget,
-    getRoomName,
-  } from '../../utils'
+  import { createMeetingVideoWidgetTab, createMeetingWidget, getRoomName } from '../../utils'
   import ActiveInvitesPopup from './invites/ActiveInvitesPopup.svelte'
   import InvitePopup from './invites/InvitePopup.svelte'
   import PersonActionPopup from '../PersonActionPopup.svelte'
@@ -162,7 +158,7 @@
   function checkActiveInvites (invites: Invite[]): void {
     if (invites.length > 0) {
       if (myInvitesPopup === undefined) {
-        myInvitesPopup = showPopup(ActiveInvitesPopup, { invites }, undefined, undefined, undefined, {
+        myInvitesPopup = showPopup(ActiveInvitesPopup, {}, undefined, undefined, undefined, {
           category: myInvitesCategory,
           overlay: false,
           fixed: true
diff --git a/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte b/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
index 8ce6a981eb2..80cf2c219b7 100644
--- a/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import love from '../../../plugin'
   import { ModernButton } from '@hcengineering/ui'
-  import { myInfo, myOffice} from '../../../stores'
+  import { myInfo, myOffice } from '../../../stores'
   import { isOffice, Room } from '@hcengineering/love'
   import { createEventDispatcher } from 'svelte'
   import { leaveMeeting } from '../../../meetingController'
diff --git a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
index c06f30a9a1c..0a6faea3c43 100644
--- a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
@@ -8,7 +8,6 @@
 
   export let room: Room
   export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
-
 </script>
 
 {#if hasAccountRole(getCurrentAccount(), AccountRole.User) && $isRecordingAvailable}
diff --git a/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte b/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte
index f26349304dc..e53db1d9cbd 100644
--- a/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/ShareScreenButton.svelte
@@ -21,7 +21,7 @@
     showPopup(ShareSettingPopup, {}, eventToHTMLElement(e))
   }
 
-  $: localScreenShare = $screenSharingState === ScreenSharingState.Local 
+  $: localScreenShare = $screenSharingState === ScreenSharingState.Local
 </script>
 
 <SplitButton
diff --git a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
index f849398e605..0ac12e0f24e 100644
--- a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
@@ -16,16 +16,14 @@
   import contact from '@hcengineering/contact'
   import { CombineAvatars } from '@hcengineering/contact-resources'
   import { Button, Label } from '@hcengineering/ui'
-  import { Invite } from '@hcengineering/love'
   import love from '../../../plugin'
   import { cancelInvites } from '../../../meetingController'
+  import { activeInvites } from '../../../stores'
 
-  export let invites: Invite[]
+  $: persons = $activeInvites.map((p) => p.target)
 
-  $: persons = invites.map((p) => p.target)
-
-  async function cancel () {
-    await cancelInvites(invites)
+  async function cancel (): Promise<void> {
+    await cancelInvites($activeInvites)
   }
 </script>
 
diff --git a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
index 7ab4de345ed..36a231e60f9 100644
--- a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
@@ -1,4 +1,3 @@
-
 <!--
 // Copyright © 2025 Hardcore Engineering Inc.
 //
@@ -14,26 +13,57 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { ModernButton } from '@hcengineering/ui'
+  import { ButtonBaseSize, IconSize, ModernButton, showPopup } from '@hcengineering/ui'
   import { Employee } from '@hcengineering/contact'
-  import { sendInvite } from '../../../meetingController'
+  import { sendInvites } from '../../../meetingController'
   import love from '../../../plugin'
+  import { SelectUsersPopup } from '@hcengineering/contact-resources'
+  import { Ref } from '@hcengineering/core'
+  import { createEventDispatcher } from 'svelte'
 
-  export let employee: Employee
+  export let employee: Employee | undefined = undefined
   export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
   export let type: 'type-button' | 'type-button-icon' = 'type-button'
+  export let size: ButtonBaseSize = 'small'
+  export let iconSize: IconSize = 'small'
+  export let withBackground: boolean = true
+
+  const dispatch = createEventDispatcher()
 
-  async function invite(): Promise<void> {
-    await sendInvite(employee._id)
+  async function invite (): Promise<void> {
+    if (employee !== undefined) {
+      await sendInvites([employee._id])
+    } else {
+      openSelectUsersPopup()
+    }
+  }
+
+  function openSelectUsersPopup (): void {
+    showPopup(
+      SelectUsersPopup,
+      {
+        okLabel: love.string.Invite,
+        skipCurrentAccount: true,
+        skipInactive: true,
+        showStatus: true
+      },
+      'top',
+      (result?: Ref<Employee>[]) => {
+        if (result != null) {
+          void sendInvites(result)
+        }
+        dispatch('close')
+      }
+    )
   }
 </script>
 
-<div class="button-container">
+<div class:button-container={withBackground}>
   <ModernButton
     label={type === 'type-button-icon' ? undefined : love.string.Invite}
     icon={love.icon.Invite}
-    size="small"
-    iconSize="small"
+    {size}
+    {iconSize}
     {type}
     {kind}
     on:click={invite}
@@ -47,4 +77,3 @@
     background-color: var(--theme-button-container-color);
   }
 </style>
-
diff --git a/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte b/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
index 95a6157b92f..42783b0d702 100644
--- a/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
+++ b/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
@@ -31,6 +31,7 @@
   import ControlBarContainer from '../ControlBarContainer.svelte'
   import SendReactionButton from '../controls/SendReactionButton.svelte'
   import MeetingWidgetHeader from './MeetingWidgetHeader.svelte'
+  import InviteEmployeeButton from '../invites/InviteEmployeeButton.svelte'
 
   export let widgetState: WidgetState | undefined
   export let height: string
@@ -110,6 +111,13 @@
   <ControlBarContainer>
     <svelte:fragment slot="right">
       <RoomAccessButton {room} size="small" />
+      <InviteEmployeeButton
+        kind="secondary"
+        type="type-button-icon"
+        size="small"
+        iconSize="medium"
+        withBackground={false}
+      />
     </svelte:fragment>
     <svelte:fragment slot="center">
       <SendReactionButton size="small" />
diff --git a/plugins/love-resources/src/liveKitClient.ts b/plugins/love-resources/src/liveKitClient.ts
index c276e1ba606..7452afda29e 100644
--- a/plugins/love-resources/src/liveKitClient.ts
+++ b/plugins/love-resources/src/liveKitClient.ts
@@ -4,13 +4,13 @@ import {
   Room as LKRoom,
   RoomEvent,
   type VideoCaptureOptions,
-  RemoteTrack,
-  RemoteTrackPublication,
+  type RemoteTrack,
+  type RemoteTrackPublication,
   Track,
-  LocalTrackPublication,
-  LocalParticipant,
-  TrackPublication,
-  Participant
+  type LocalTrackPublication,
+  type LocalParticipant,
+  type TrackPublication,
+  type Participant
 } from 'livekit-client'
 import { translate } from '@hcengineering/platform'
 import { getMediaDevices, getSelectedSpeakerId, type MediaSession } from '@hcengineering/media'
@@ -37,7 +37,7 @@ export const lkSessionConnected = writable<boolean>(false)
 const LAST_PARTICIPANT_NOTIFICATION_DELAY_MS = 2 * 60 * 1000
 const AUTO_DISCONNECT_DELAY_MS = 60 * 1000
 
-export function getLiveKitClient(): LiveKitClient {
+export function getLiveKitClient (): LiveKitClient {
   return new LiveKitClient()
 }
 
@@ -59,7 +59,7 @@ export class LiveKitClient {
   private lastParticipantNotificationTimeout: number = -1
   private lastParticipantDisconnectTimeout: number = -1
 
-  constructor() {
+  constructor () {
     const lkRoom = new LKRoom({
       adaptiveStream: true,
       dynacast: true,
@@ -86,11 +86,11 @@ export class LiveKitClient {
     this.liveKitRoom = lkRoom
   }
 
-  async prepareConnection(wsUrl: string, token: string): Promise<void> {
+  async prepareConnection (wsUrl: string, token: string): Promise<void> {
     await this.liveKitRoom.prepareConnection(wsUrl, token)
   }
 
-  async connect(wsURL: string, token: string, withVideo: boolean): Promise<void> {
+  async connect (wsURL: string, token: string, withVideo: boolean): Promise<void> {
     this.isConnecting = true
     this.currentSessionSupportsVideo = withVideo
     try {
@@ -142,7 +142,7 @@ export class LiveKitClient {
     }
   }
 
-  async disconnect(): Promise<void> {
+  async disconnect (): Promise<void> {
     screenSharingState.set(ScreenSharingState.Inactive)
     clearTimeout(this.lastParticipantNotificationTimeout)
     const me = this.liveKitRoom.localParticipant
@@ -154,7 +154,7 @@ export class LiveKitClient {
     this.currentMediaSession = undefined
   }
 
-  async awaitConnect(): Promise<void> {
+  async awaitConnect (): Promise<void> {
     await new Promise<void>((resolve) => {
       if (this.liveKitRoom.state === ConnectionState.Connected) {
         resolve()
@@ -241,7 +241,7 @@ export class LiveKitClient {
       session?.setMicrophone({ enabled: true, track, deviceId })
     }
   }
-  
+
   onLocalTrackUnpublished = (publication: LocalTrackPublication, _participant: LocalParticipant) => {
     const session = this.currentMediaSession
     if (publication.track?.kind === Track.Kind.Video) {
@@ -255,7 +255,7 @@ export class LiveKitClient {
       session?.setMicrophone({ enabled: false })
     }
   }
-  
+
   onTrackMuted = (publication: TrackPublication, participant: Participant) => {
     if (!participant.isLocal) return
     const session = this.currentMediaSession
@@ -265,7 +265,7 @@ export class LiveKitClient {
       session?.setMicrophone({ enabled: false })
     }
   }
-  
+
   onTrackUnmuted = (publication: TrackPublication, participant: Participant) => {
     if (!participant.isLocal) return
     const session = this.currentMediaSession
@@ -278,7 +278,7 @@ export class LiveKitClient {
     }
   }
 
-  async showLastParticipantNotification(): Promise<void> {
+  async showLastParticipantNotification (): Promise<void> {
     addNotification(
       await translate(love.string.MeetingEmptyTitle, {}, getCurrentLanguage()),
       await translate(love.string.MeetingEmptyMessage, {}, getCurrentLanguage()),
@@ -292,25 +292,25 @@ export class LiveKitClient {
     }, AUTO_DISCONNECT_DELAY_MS)
   }
 
-  async updateActiveDevices(): Promise<void> {
+  async updateActiveDevices (): Promise<void> {
     await this.setActiveCamera(this.currentMediaSession?.state.camera?.deviceId)
     await this.setActiveMicrophone(this.currentMediaSession?.state.microphone?.deviceId)
     await this.setCameraEnabled(this.currentMediaSession?.state.camera?.enabled ?? false)
     await this.setMicrophoneEnabled(this.currentMediaSession?.state.microphone?.enabled ?? false)
   }
 
-  async setActiveCamera(deviceId: string | undefined): Promise<void> {
+  async setActiveCamera (deviceId: string | undefined): Promise<void> {
     if (deviceId === undefined || deviceId === null) return
     if (!this.currentSessionSupportsVideo) return
     await this.liveKitRoom.switchActiveDevice('videoinput', deviceId, true)
   }
 
-  async setActiveMicrophone(deviceId: string | undefined): Promise<void> {
+  async setActiveMicrophone (deviceId: string | undefined): Promise<void> {
     if (deviceId === undefined || deviceId === null) return
     await this.liveKitRoom.switchActiveDevice('audioinput', deviceId, true)
   }
 
-  async setActiveSpeaker(deviceId: string | undefined): Promise<void> {
+  async setActiveSpeaker (deviceId: string | undefined): Promise<void> {
     if (deviceId === undefined || deviceId === null) return
     try {
       await this.liveKitRoom.switchActiveDevice('audiooutput', deviceId, true)
@@ -319,7 +319,7 @@ export class LiveKitClient {
     }
   }
 
-  async setCameraEnabled(value: boolean): Promise<void> {
+  async setCameraEnabled (value: boolean): Promise<void> {
     if (!this.currentSessionSupportsVideo) return
     try {
       await this.liveKitRoom.localParticipant.setCameraEnabled(value)
@@ -334,7 +334,7 @@ export class LiveKitClient {
     }
   }
 
-  async setMicrophoneEnabled(value: boolean): Promise<void> {
+  async setMicrophoneEnabled (value: boolean): Promise<void> {
     try {
       await this.liveKitRoom.localParticipant.setMicrophoneEnabled(value)
     } catch (e) {
@@ -348,7 +348,7 @@ export class LiveKitClient {
     }
   }
 
-  async setScreenShareEnabled(value: boolean, withAudio: boolean = false): Promise<void> {
+  async setScreenShareEnabled (value: boolean, withAudio: boolean = false): Promise<void> {
     try {
       await this.liveKitRoom.localParticipant.setScreenShareEnabled(value, { audio: withAudio })
     } catch (e) {
diff --git a/plugins/love-resources/src/loveClient.ts b/plugins/love-resources/src/loveClient.ts
index 8249370024a..13052c53bf8 100644
--- a/plugins/love-resources/src/loveClient.ts
+++ b/plugins/love-resources/src/loveClient.ts
@@ -13,7 +13,7 @@ interface RoomToken {
   issuedOn: number
   token: string
 }
-export function getLoveClient () {
+export function getLoveClient (): LoveClient {
   return new LoveClient()
 }
 
diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetingController.ts
index 57c84af7ff8..7442b207be4 100644
--- a/plugins/love-resources/src/meetingController.ts
+++ b/plugins/love-resources/src/meetingController.ts
@@ -1,29 +1,46 @@
-import core, { AccountRole, getCurrentAccount, type Ref } from "@hcengineering/core";
-import love, { getFreeRoomPlace, MeetingStatus, type Room, RoomType, isOffice, RoomAccess, RequestStatus, type JoinRequest, type Invite } from "@hcengineering/love";
-import presentation, { createQuery, getClient } from "@hcengineering/presentation";
-import { closeMeetingMinutes, getLiveKitEndpoint, getRoomName, liveKitClient, loveClient, navigateToOfficeDoc } from "./utils";
-import { get } from "svelte/store";
-import { infos, myInfo, myOffice, rooms } from "./stores";
-import { getCurrentEmployee, type Person } from "@hcengineering/contact";
+import core, { AccountRole, getCurrentAccount, type Ref } from '@hcengineering/core'
+import love, {
+  getFreeRoomPlace,
+  MeetingStatus,
+  type Room,
+  RoomType,
+  isOffice,
+  RoomAccess,
+  RequestStatus,
+  type JoinRequest,
+  type Invite
+} from '@hcengineering/love'
+import presentation, { createQuery, getClient } from '@hcengineering/presentation'
+import {
+  closeMeetingMinutes,
+  getLiveKitEndpoint,
+  getRoomName,
+  liveKitClient,
+  loveClient,
+  navigateToOfficeDoc
+} from './utils'
+import { get } from 'svelte/store'
+import { infos, myInfo, myOffice, rooms } from './stores'
+import { getCurrentEmployee, type Person } from '@hcengineering/contact'
 import { getPersonByPersonRef } from '@hcengineering/contact-resources'
-import { getMetadata } from "@hcengineering/platform";
+import { getMetadata } from '@hcengineering/platform'
 
 const requestsQuery = createQuery(true)
 const invitesQuery = createQuery(true)
 
-export async function createMeeting(room: Room) {
+export async function createMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const me = getCurrentEmployee()
   const currentPerson = await getPersonByPersonRef(me)
 
   if (isOffice(room) && room.person !== currentPerson?._id) {
-    sendJoinRequest(room)
+    await sendJoinRequest(room)
     return
   }
 
   const client = getClient()
-  let meeting = await client.findOne(love.class.MeetingMinutes, {
+  const meeting = await client.findOne(love.class.MeetingMinutes, {
     attachedTo: room._id,
     status: MeetingStatus.Active
   })
@@ -49,7 +66,7 @@ export async function leaveMeeting (): Promise<void> {
     if (currentParticipationInfo.room !== office._id) {
       await client.update(currentParticipationInfo, { room: office._id, x: 0, y: 0 })
     } else {
-      //kick all participants in case of own office
+      // kick all participants in case of own office
       const allRooms = get(rooms)
       const participantsInfo = get(infos)
       const otherParticipants = participantsInfo.filter((p) => p.room === office._id && p !== currentParticipationInfo)
@@ -61,22 +78,21 @@ export async function leaveMeeting (): Promise<void> {
   }
   await liveKitClient.disconnect()
   closeMeetingMinutes()
-
 }
 
-export async function joinMeeting (room: Room) {
+export async function joinMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const isGuest = getCurrentAccount().role === AccountRole.Guest
   if (room.access === RoomAccess.Knock || isOffice(room) || isGuest) {
-    sendJoinRequest(room)
+    await sendJoinRequest(room)
     return
   }
 
-  connectToMeeting(room)
+  await connectToMeeting(room)
 }
 
-export async function acceptInvite (invite: Invite) {
+export async function acceptInvite (invite: Invite): Promise<void> {
   const client = getClient()
   await client.update(invite, { status: RequestStatus.Approved })
   const room = getRoomById(invite.room)
@@ -91,7 +107,7 @@ export async function acceptInvite (invite: Invite) {
     await createMeetingDocument(room)
   }
 
-  connectToMeeting(room)
+  await connectToMeeting(room)
 }
 
 export async function rejectInvite (invite: Invite): Promise<void> {
@@ -108,19 +124,24 @@ export async function cancelInvites (invites: Invite[]): Promise<void> {
   }
 }
 
-export async function sendInvite (person: Ref<Person>): Promise<void> {
+export async function sendInvites (persons: Array<Ref<Person>>): Promise<void> {
   const myParticipation = get(myInfo)
   const room = myParticipation?.room
   if (room === undefined || room === love.ids.Reception) return
   const client = getClient()
   const me = getCurrentEmployee()
-  const _id = await client.createDoc(love.class.Invite, core.space.Workspace, {
-    target: person,
-    room,
-    status: RequestStatus.Pending,
-    from: me
-  })
-  invitesQuery.query(love.class.Invite, { from: me, _id }, (res) => {
+  const inviteIds: Array<Ref<Invite>> = []
+  for (const person of persons) {
+    inviteIds.push(
+      await client.createDoc(love.class.Invite, core.space.Workspace, {
+        target: person,
+        room,
+        status: RequestStatus.Pending,
+        from: me
+      })
+    )
+  }
+  invitesQuery.query(love.class.Invite, { from: me, _id: { $in: inviteIds } }, (res) => {
     const invite = res[0]
     if (invite === undefined) return
     if (invite.status === RequestStatus.Pending) return
@@ -128,14 +149,14 @@ export async function sendInvite (person: Ref<Person>): Promise<void> {
     if (invite.status === RequestStatus.Approved) {
       const room = getRoomById(invite.room)
       if (room === undefined) return
-      connectToMeeting(room)
+      void connectToMeeting(room)
     }
   })
 }
 
-export async function acceptJoinRequest (request: JoinRequest) {
+export async function acceptJoinRequest (request: JoinRequest): Promise<void> {
   const client = getClient()
-  const room = getRoomById(request.room) 
+  const room = getRoomById(request.room)
 
   if (room === undefined) return
 
@@ -152,7 +173,7 @@ export async function acceptJoinRequest (request: JoinRequest) {
 }
 
 export async function rejectJoinRequest (request: JoinRequest): Promise<void> {
-  const client = getClient() 
+  const client = getClient()
   await client.update(request, { status: RequestStatus.Rejected })
 }
 
@@ -163,7 +184,7 @@ export async function cancelJoinRequest (request: JoinRequest): Promise<void> {
   }
 }
 
-async function sendJoinRequest (room: Room) {
+async function sendJoinRequest (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const me = getCurrentEmployee()
@@ -189,17 +210,18 @@ async function sendJoinRequest (room: Room) {
     if (req.status === RequestStatus.Pending) return
     requestsQuery.unsubscribe()
     if (req.status === RequestStatus.Approved) {
-      connectToMeeting(room)
+      void connectToMeeting(room)
     }
   })
 }
 
 export async function kick (person: Ref<Person>): Promise<void> {
-  //TODO: Office kick participant
+  // TODO: Office kick participant
 }
 
 async function connectToMeeting (room: Room): Promise<void> {
   if (getCurrentAccount().role === AccountRole.ReadOnlyGuest) return
+  if (get(myInfo)?.room === room._id) return
 
   await navigateToOfficeDoc(room)
   await moveToMeetingRoom(room)
@@ -248,20 +270,17 @@ async function moveToMeetingRoom (room: Room): Promise<void> {
 
 async function createMeetingDocument (room: Room): Promise<void> {
   const client = getClient()
-  await client.createDoc(
-    love.class.MeetingMinutes,
-    core.space.Workspace,
-    {
-      description: null,
-      attachedTo: room._id,
-      status: MeetingStatus.Active,
-      title: await getNewMeetingTitle(room),
-      attachedToClass: love.class.Room,
-      collection: 'meetings'
-    })
+  await client.createDoc(love.class.MeetingMinutes, core.space.Workspace, {
+    description: null,
+    attachedTo: room._id,
+    status: MeetingStatus.Active,
+    title: await getNewMeetingTitle(room),
+    attachedToClass: love.class.Room,
+    collection: 'meetings'
+  })
 }
 
-async function getNewMeetingTitle (room: Room): Promise<string> { 
+async function getNewMeetingTitle (room: Room): Promise<string> {
   const date = new Date()
     .toLocaleDateString('en-GB', {
       day: 'numeric',
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index 66b8a71ca80..c1a5e142cb5 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -1,7 +1,7 @@
 import aiBot from '@hcengineering/ai-bot'
 import { connectMeeting, disconnectMeeting } from '@hcengineering/ai-bot-resources'
 import { Analytics } from '@hcengineering/analytics'
-import calendar, { type Event, getAllEvents, type Schedule } from '@hcengineering/calendar'
+import calendar, { type Event, type Schedule } from '@hcengineering/calendar'
 import chunter from '@hcengineering/chunter'
 import { getName } from '@hcengineering/contact'
 import core, {
@@ -20,7 +20,6 @@ import core, {
 } from '@hcengineering/core'
 import login from '@hcengineering/login'
 import {
-  type Invite,
   isOffice,
   type JoinRequest,
   LoveEvents,
@@ -28,7 +27,6 @@ import {
   type Meeting,
   type MeetingMinutes,
   type MeetingSchedule,
-  type ParticipantInfo,
   type Room,
   type RoomMetadata,
   TranscriptionStatus
@@ -36,7 +34,6 @@ import {
 import { getEmbeddedLabel, getMetadata, getResource, type IntlString } from '@hcengineering/platform'
 import presentation, {
   copyTextToClipboard,
-  createQuery,
   type DocCreatePhase,
   getClient,
   type ObjectSearchResult
@@ -195,7 +192,7 @@ lk.on(RoomEvent.RoomMetadataChanged, (metadata) => {
 
 lk.on(RoomEvent.Connected, () => {
   isRecording.set(lk.isRecording)
-  initRoomMetadata(lk.metadata)
+  void initRoomMetadata(lk.metadata)
   Analytics.handleEvent(LoveEvents.ConnectedToRoom)
 })
 
@@ -271,12 +268,12 @@ export async function navigateToOfficeDoc (object: Doc): Promise<void> {
 
 export async function prepareRoomConnection (room: Room): Promise<void> {
   const roomToken = await loveClient.getRoomToken(room)
-  liveKitClient.prepareConnection(getLiveKitEndpoint(), roomToken)
+  await liveKitClient.prepareConnection(getLiveKitEndpoint(), roomToken)
 }
 
 export const joinRequest: Ref<JoinRequest> | undefined = undefined
 
-export function calculateFloorSize (_rooms: Room[], preview?: boolean): number {
+export function calculateFloorSize (_rooms: Room[], _preview?: boolean): number {
   let fH: number = 5
   _rooms.forEach((room) => {
     if (room.y + room.height + 2 > fH) fH = room.y + room.height + 2
@@ -308,7 +305,7 @@ export async function createMeeting (
   client: TxOperations,
   _id: Ref<Event>,
   space: Space,
-  data: Data<Event>,
+  _data: Data<Event>,
   store: Record<string, any>,
   phase: DocCreatePhase
 ): Promise<void> {
@@ -336,7 +333,7 @@ export async function createMeetingSchedule (
   client: TxOperations,
   _id: Ref<Schedule>,
   space: Space,
-  data: Data<Schedule>,
+  _data: Data<Schedule>,
   store: Record<string, any>,
   phase: DocCreatePhase
 ): Promise<void> {

From 69ea58ff29f41d54ec03c72447af8dae2454f1f1 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 18 Sep 2025 11:38:33 +0700
Subject: [PATCH 09/25] Minor fixes

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 models/love/src/plugin.ts                     |  2 +-
 .../person/EmployeePreviewPopup.svelte        |  4 +--
 plugins/love-resources/package.json           |  1 +
 .../src/components/EditRoom.svelte            | 12 +++++--
 .../src/components/meeting/ControlExt.svelte  | 23 ++++++-------
 plugins/love-resources/src/liveKitClient.ts   |  8 ++---
 plugins/love-resources/src/loveClient.ts      | 23 +++----------
 .../love-resources/src/meetingController.ts   | 32 +++++++++++++------
 plugins/love-resources/src/utils.ts           | 16 ++++++++--
 9 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/models/love/src/plugin.ts b/models/love/src/plugin.ts
index 9a00b3fc5af..1c549226796 100644
--- a/models/love/src/plugin.ts
+++ b/models/love/src/plugin.ts
@@ -33,7 +33,7 @@ export default mergeIds(loveId, love, {
     RoomLanguageEditor: '' as AnyComponent,
     MediaPopupItemExt: '' as AnyComponent,
     SharingStateIndicator: '' as AnyComponent,
-    InviteEmployeeButton: '' as AnyComponent,
+    InviteEmployeeButton: '' as AnyComponent
   },
   app: {
     Love: '' as Ref<Doc>
diff --git a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
index d35e6bc2b65..c94722ad8a4 100644
--- a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
+++ b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
@@ -40,7 +40,7 @@
   let isEmployee: boolean = false
 
   $: personByRefStore = getPersonByPersonRefStore([_id])
-$: employee = $employeeByIdStore.get(_id) ?? $personByRefStore.get(_id)
+  $: employee = $employeeByIdStore.get(_id) ?? $personByRefStore.get(_id)
   $: isEmployee = $employeeByIdStore.has(_id)
   $: void loadPersonTimezone(employee)
 
@@ -135,7 +135,7 @@ $: employee = $employeeByIdStore.get(_id) ?? $personByRefStore.get(_id)
       <div class="flex-presenter flex-gap-2 flex-center">
         <ComponentExtensions
           extension={contact.extension.EmployeePopupActions}
-          props={{ employee, icon: contact.icon.Chat, type: 'type-button-icon', class:'button-container' }}
+          props={{ employee, icon: contact.icon.Chat, type: 'type-button-icon', class: 'button-container' }}
         />
         <div class="button-container">
           <ButtonIcon icon={contact.icon.User} size="small" iconSize="small" on:click={viewProfile} />
diff --git a/plugins/love-resources/package.json b/plugins/love-resources/package.json
index 91ffd3b11db..e2621e45a26 100644
--- a/plugins/love-resources/package.json
+++ b/plugins/love-resources/package.json
@@ -64,6 +64,7 @@
     "@hcengineering/emoji": "^0.6.0",
     "@hcengineering/emoji-resources": "^0.6.0",
     "@hcengineering/theme": "^0.6.5",
+    "@hcengineering/account-client": "^0.6.0",
     "@livekit/krisp-noise-filter": "^0.3.0",
     "@livekit/track-processors": "^0.5.6",
     "livekit-client": "^2.15.6",
diff --git a/plugins/love-resources/src/components/EditRoom.svelte b/plugins/love-resources/src/components/EditRoom.svelte
index 431a036f8c7..1975dab1e50 100644
--- a/plugins/love-resources/src/components/EditRoom.svelte
+++ b/plugins/love-resources/src/components/EditRoom.svelte
@@ -22,7 +22,7 @@
   import { getRoomName, prepareRoomConnection } from '../utils'
   import { infos, myOffice, currentRoom } from '../stores'
   import { lkSessionConnected } from '../liveKitClient'
-  import { createMeeting } from '../meetingController'
+  import { createMeeting, joinMeeting } from '../meetingController'
 
   export let object: Room
 
@@ -36,14 +36,20 @@
   let connecting = false
 
   onMount(() => {
-    prepareRoomConnection(object)
+    void prepareRoomConnection(object)
     dispatch('open', { ignoreKeys: ['name'] })
   })
 
   const tryConnecting = false
 
   async function connect (): Promise<void> {
-    await createMeeting(object)
+    if ($infos.some(({ room }) => room === object._id)) {
+      console.log('join')
+      await joinMeeting(object)
+    } else {
+      console.log('create')
+      await createMeeting(object)
+    }
   }
 
   $: connecting = tryConnecting || ($currentRoom?._id === object._id && !$lkSessionConnected)
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index e30651187cf..8398398f08b 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -27,11 +27,11 @@
   } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
   import workbench from '@hcengineering/workbench'
-  import { closeWidget, closeWidgetTab, sidebarStore } from '@hcengineering/workbench-resources'
+  import { closeWidget, sidebarStore } from '@hcengineering/workbench-resources'
 
   import love from '../../plugin'
   import { activeInvites, currentRoom, infos, myInfo, myInvites, myRequests, rooms } from '../../stores'
-  import { createMeetingVideoWidgetTab, createMeetingWidget, getRoomName } from '../../utils'
+  import { createMeetingWidget, getRoomName } from '../../utils'
   import ActiveInvitesPopup from './invites/ActiveInvitesPopup.svelte'
   import InvitePopup from './invites/InvitePopup.svelte'
   import PersonActionPopup from '../PersonActionPopup.svelte'
@@ -39,7 +39,7 @@
   import RequestingPopup from './invites/RequestingPopup.svelte'
   import RoomPopup from '../RoomPopup.svelte'
   import RoomButton from '../RoomButton.svelte'
-  import { leaveMeeting } from '../../meetingController'
+  import { leaveMeeting, currentMeetingRoom } from '../../meetingController'
   import { lkSessionConnected } from '../../liveKitClient'
 
   const client = getClient()
@@ -176,7 +176,7 @@
 
   $: checkActiveInvites($activeInvites)
 
-  function checkActiveVideo (loc: Location, video: boolean, room: Ref<Room> | undefined): void {
+  function checkActiveMeeting (loc: Location, meetingSessionConnected: boolean, room: Ref<Room> | undefined): void {
     const meetingWidgetState = $sidebarStore.widgetsState.get(love.ids.MeetingWidget)
     const isMeetingWidgetCreated = meetingWidgetState !== undefined
 
@@ -186,17 +186,18 @@
       }
       return
     }
+    console.log(meetingSessionConnected, room, currentMeetingRoom, isMeetingWidgetCreated)
 
-    if ($lkSessionConnected) {
+    if (meetingSessionConnected) {
+      if (currentMeetingRoom !== undefined && room !== currentMeetingRoom) {
+        void leaveMeeting()
+        return
+      }
       const widget = client.getModel().findAllSync(workbench.class.Widget, { _id: love.ids.MeetingWidget })[0]
       if (widget === undefined) return
 
       if (!isMeetingWidgetCreated) {
-        createMeetingWidget(widget, room, video)
-      } else if (video && !meetingWidgetState.tabs.some(({ id }) => id === 'video')) {
-        createMeetingVideoWidgetTab(widget)
-      } else if (!video && meetingWidgetState.tabs.some(({ id }) => id === 'video')) {
-        void closeWidgetTab(widget, 'video')
+        createMeetingWidget(widget, room, meetingSessionConnected)
       }
     } else {
       if (isMeetingWidgetCreated) {
@@ -205,7 +206,7 @@
     }
   }
 
-  $: checkActiveVideo($location, $lkSessionConnected, $currentRoom?._id)
+  $: checkActiveMeeting($location, $lkSessionConnected, $currentRoom?._id)
 
   $: joined = activeRooms.filter((r) => $myInfo?.room === r._id)
 
diff --git a/plugins/love-resources/src/liveKitClient.ts b/plugins/love-resources/src/liveKitClient.ts
index 7452afda29e..c9401394d0f 100644
--- a/plugins/love-resources/src/liveKitClient.ts
+++ b/plugins/love-resources/src/liveKitClient.ts
@@ -226,7 +226,7 @@ export class LiveKitClient {
     }
   }
 
-  onLocalTrackPublished = (publication: LocalTrackPublication, _participant: LocalParticipant) => {
+  onLocalTrackPublished = (publication: LocalTrackPublication, _participant: LocalParticipant): void => {
     const session = this.currentMediaSession
     const track = publication.track?.mediaStreamTrack
     const deviceId = track?.getSettings().deviceId
@@ -242,7 +242,7 @@ export class LiveKitClient {
     }
   }
 
-  onLocalTrackUnpublished = (publication: LocalTrackPublication, _participant: LocalParticipant) => {
+  onLocalTrackUnpublished = (publication: LocalTrackPublication, _participant: LocalParticipant): void => {
     const session = this.currentMediaSession
     if (publication.track?.kind === Track.Kind.Video) {
       if (publication.track.source === Track.Source.ScreenShare) {
@@ -256,7 +256,7 @@ export class LiveKitClient {
     }
   }
 
-  onTrackMuted = (publication: TrackPublication, participant: Participant) => {
+  onTrackMuted = (publication: TrackPublication, participant: Participant): void => {
     if (!participant.isLocal) return
     const session = this.currentMediaSession
     if (publication.track?.kind === Track.Kind.Video && publication.track.source === Track.Source.Camera) {
@@ -266,7 +266,7 @@ export class LiveKitClient {
     }
   }
 
-  onTrackUnmuted = (publication: TrackPublication, participant: Participant) => {
+  onTrackUnmuted = (publication: TrackPublication, participant: Participant): void => {
     if (!participant.isLocal) return
     const session = this.currentMediaSession
     const track = publication.track?.mediaStreamTrack
diff --git a/plugins/love-resources/src/loveClient.ts b/plugins/love-resources/src/loveClient.ts
index 13052c53bf8..0ffd257b51e 100644
--- a/plugins/love-resources/src/loveClient.ts
+++ b/plugins/love-resources/src/loveClient.ts
@@ -1,4 +1,4 @@
-import { concatLink, type Ref } from '@hcengineering/core'
+import { concatLink } from '@hcengineering/core'
 import love, { type Room } from '@hcengineering/love'
 import { getMetadata } from '@hcengineering/platform'
 import presentation from '@hcengineering/presentation'
@@ -9,30 +9,13 @@ import { Analytics } from '@hcengineering/analytics'
 import { currentMeetingMinutes } from './stores'
 import { get } from 'svelte/store'
 
-interface RoomToken {
-  issuedOn: number
-  token: string
-}
 export function getLoveClient (): LoveClient {
   return new LoveClient()
 }
 
 export class LoveClient {
-  private readonly tokens: Map<Ref<Room>, RoomToken>
-
-  constructor () {
-    this.tokens = new Map<Ref<Room>, RoomToken>()
-  }
-
   async getRoomToken (room: Room): Promise<string> {
-    const currentTime = Date.now()
-    let roomToken: RoomToken | undefined = this.tokens.get(room._id)
-    // refresh token after 8 minutes, server sets token ttl to 10 minutes
-    if (roomToken === undefined || currentTime - roomToken.issuedOn >= 8 * 60 * 1000) {
-      roomToken = { issuedOn: currentTime, token: await this.refreshRoomToken(room) }
-      this.tokens.set(room._id, roomToken)
-    }
-    return roomToken.token
+    return await this.refreshRoomToken(room)
   }
 
   async updateSessionLanguage (room: Room): Promise<void> {
@@ -97,6 +80,7 @@ export class LoveClient {
   private async refreshRoomToken (room: Room): Promise<string> {
     const sessionName = this.getTokenRoomName(room)
     const endpoint = this.getLoveEndpoint()
+    console.log('refresh room token')
     if (endpoint === undefined) {
       throw new Error('Love service endpoint not found')
     }
@@ -105,6 +89,7 @@ export class LoveClient {
       throw new Error('Cannot find current person')
     }
     const platformToken = getPlatformToken()
+    console.log(platformToken)
     const res = await fetch(concatLink(endpoint, '/getToken'), {
       method: 'POST',
       headers: {
diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetingController.ts
index 7442b207be4..d4db236a669 100644
--- a/plugins/love-resources/src/meetingController.ts
+++ b/plugins/love-resources/src/meetingController.ts
@@ -27,6 +27,7 @@ import { getMetadata } from '@hcengineering/platform'
 
 const requestsQuery = createQuery(true)
 const invitesQuery = createQuery(true)
+export let currentMeetingRoom: Ref<Room> | undefined
 
 export async function createMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
@@ -78,6 +79,7 @@ export async function leaveMeeting (): Promise<void> {
   }
   await liveKitClient.disconnect()
   closeMeetingMinutes()
+  currentMeetingRoom = undefined
 }
 
 export async function joinMeeting (room: Room): Promise<void> {
@@ -103,7 +105,7 @@ export async function acceptInvite (invite: Invite): Promise<void> {
     attachedTo: room._id,
     status: MeetingStatus.Active
   })
-  if (meeting !== undefined) {
+  if (meeting === undefined) {
     await createMeetingDocument(room)
   }
 
@@ -142,11 +144,11 @@ export async function sendInvites (persons: Array<Ref<Person>>): Promise<void> {
     )
   }
   invitesQuery.query(love.class.Invite, { from: me, _id: { $in: inviteIds } }, (res) => {
-    const invite = res[0]
-    if (invite === undefined) return
-    if (invite.status === RequestStatus.Pending) return
-    invitesQuery.unsubscribe()
-    if (invite.status === RequestStatus.Approved) {
+    for (const invite of res) {
+      if (invite === undefined || invite.status !== RequestStatus.Approved) {
+        continue
+      }
+      invitesQuery.unsubscribe()
       const room = getRoomById(invite.room)
       if (room === undefined) return
       void connectToMeeting(room)
@@ -164,7 +166,7 @@ export async function acceptJoinRequest (request: JoinRequest): Promise<void> {
     attachedTo: room._id,
     status: MeetingStatus.Active
   })
-  if (meeting !== undefined) {
+  if (meeting === undefined) {
     await createMeetingDocument(room)
   }
 
@@ -216,12 +218,24 @@ async function sendJoinRequest (room: Room): Promise<void> {
 }
 
 export async function kick (person: Ref<Person>): Promise<void> {
-  // TODO: Office kick participant
+  const client = getClient()
+  const allRooms = get(rooms)
+  const participantsInfo = get(infos)
+  const participantInfo = participantsInfo.find((p) => p.person === person)
+  if (participantInfo === undefined) return
+  const participantOffice = allRooms.find((r) => isOffice(r) && r.person === person)
+  await client.update(participantInfo, { room: participantOffice?._id ?? love.ids.Reception, x: 0, y: 0 })
 }
 
 async function connectToMeeting (room: Room): Promise<void> {
   if (getCurrentAccount().role === AccountRole.ReadOnlyGuest) return
-  if (get(myInfo)?.room === room._id) return
+  if (currentMeetingRoom === room._id) return
+
+  if (currentMeetingRoom !== undefined) {
+    await leaveMeeting()
+  }
+
+  currentMeetingRoom = room._id
 
   await navigateToOfficeDoc(room)
   await moveToMeetingRoom(room)
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index c1a5e142cb5..13b4358c0c7 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -63,6 +63,7 @@ import love from './plugin'
 import { $myPreferences, currentMeetingMinutes, currentRoom } from './stores'
 import { getLiveKitClient } from './liveKitClient'
 import { getLoveClient } from './loveClient'
+import { getClient as getAccountClientRaw } from '@hcengineering/account-client'
 
 export const liveKitClient = getLiveKitClient()
 export const lk: LKRoom = liveKitClient.liveKitRoom
@@ -405,8 +406,19 @@ async function getRoomGuestLink (room: Room): Promise<string> {
       sessionId: roomInfo._id
     }
 
-    const func = await getResource(login.function.GetInviteLink)
-    return await func(24, '', -1, AccountRole.Guest, encodeURIComponent(JSON.stringify(navigateUrl)))
+    const accountsUrl = getMetadata(login.metadata.AccountsUrl)
+    const token = getMetadata(presentation.metadata.Token)
+
+    console.log('Create link')
+    const accountClient = getAccountClientRaw(accountsUrl, token)
+    return await accountClient.createAccessLink(
+      AccountRole.Guest,
+      undefined,
+      undefined,
+      encodeURIComponent(JSON.stringify(navigateUrl))
+    )
+    // const func = await getResource(login.function.GetInviteLink)
+    // return await func(24, '', -1, AccountRole.Guest, )
   }
   return ''
 }

From d792c7586f715fedd09e65c4cc206b3837b6e1ab Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Fri, 19 Sep 2025 11:25:49 +0700
Subject: [PATCH 10/25] Change widget control bar

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../src/components/meeting/ControlBar.svelte  |   4 +-
 .../meeting/ControlBarContainer.svelte        | 108 ++++++++++--------
 .../meeting/controls/RecordingButton.svelte   |  25 ++--
 .../meeting/controls/RoomAccessButton.svelte  |   7 +-
 .../controls/TranscriptionButton.svelte       |   7 +-
 .../meeting/widget/MeetingWidget.svelte       |  15 ++-
 .../meeting/widget/MeetingWidgetHeader.svelte |   8 +-
 .../love-resources/src/meetingController.ts   |   2 +-
 8 files changed, 98 insertions(+), 78 deletions(-)

diff --git a/plugins/love-resources/src/components/meeting/ControlBar.svelte b/plugins/love-resources/src/components/meeting/ControlBar.svelte
index 7443a95bcf3..eb86bfd22f1 100644
--- a/plugins/love-resources/src/components/meeting/ControlBar.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlBar.svelte
@@ -50,7 +50,7 @@
 
 <div class="control-bar">
   <ControlBarContainer bind:noLabel>
-    <svelte:fragment slot="right">
+    <svelte:fragment slot="left">
       {#if room._id !== love.ids.Reception && $lkSessionConnected}
         <RoomAccessButton {room} />
         <InviteEmployeeButton
@@ -74,7 +74,7 @@
         <RoomAccessButton {room} />
       {/if}
     </svelte:fragment>
-    <svelte:fragment slot="left">
+    <svelte:fragment slot="right">
       {#if $lkSessionConnected && onFullScreen}
         <ModernButton
           icon={$isFullScreen ? love.icon.ExitFullScreen : love.icon.FullScreen}
diff --git a/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte b/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte
index bca46de7a5f..44b78ed4ec0 100644
--- a/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte
@@ -13,72 +13,80 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { resizeObserver } from '@hcengineering/ui'
-  import { afterUpdate } from 'svelte'
-
-  export let noLabel: boolean = false
-
-  let grow: HTMLElement
-  let leftPanel: HTMLElement
-  let leftPanelSize: number = 0
-
-  let combinePanel: boolean = false
-
-  const checkBar = (): void => {
-    if (grow === undefined || leftPanel === undefined) return
-    if (!noLabel && leftPanel.clientWidth > leftPanelSize) leftPanelSize = leftPanel.clientWidth
-    if (grow.clientWidth - 16 < leftPanel.clientWidth && !noLabel && !combinePanel) noLabel = true
-    else if (grow.clientWidth - 16 < leftPanel.clientWidth && noLabel && !combinePanel) combinePanel = true
-    else if (grow.clientWidth * 2 - 32 > leftPanel.clientWidth && noLabel && combinePanel) combinePanel = false
-    else if (grow.clientWidth - 32 >= leftPanelSize && noLabel && !combinePanel) noLabel = false
-  }
-  afterUpdate(() => {
-    checkBar()
-  })
+  export let size: 'small' | 'big' = 'big'
 </script>
 
-<div class="bar w-full flex-center flex-gap-2 flex-no-shrink" class:combinePanel use:resizeObserver={checkBar}>
-  <div class="bar__right-panel flex-gap-2 flex-center">
-    <slot name="right" />
-  </div>
-  <div bind:this={grow} class="flex-grow" />
-  <slot name="center" />
-  <div bind:this={leftPanel} class="bar__left-panel flex-gap-2 flex-center">
-    <slot name="left" />
+<div class="bar" data-size={size}>
+  <div class="row">
+    <div class="left"><slot name="left" /></div>
+    <div class="center"><slot name="center" /></div>
+    <div class="right"><slot name="right" /></div>
   </div>
-  <div class="flex-grow" />
-  <slot name="extra" />
 </div>
 
 <style lang="scss">
   .bar {
-    overflow-x: auto;
-    position: relative;
+    --g: 0.5rem;
+  }
+
+  .bar {
     padding: 1rem;
     border-top: 1px solid var(--theme-divider-color);
+    container-type: inline-size;
+    width: 100%;
+  }
 
-    &__left-panel {
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      right: 1rem;
-      height: 100%;
-    }
+  .row {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: var(--g);
+  }
+  .left,
+  .center,
+  .right {
+    display: flex;
+    align-items: center;
+    gap: var(--g);
+    white-space: nowrap;
+    min-width: 0;
+  }
+  .center {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+  }
 
-    &__right-panel {
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: 1rem;
-      height: 100%;
+  @container (max-width: 350px) {
+    .bar[data-size='small'] .row {
+      justify-content: center;
+      gap: var(--g);
     }
-
-    &.combinePanel .bar__left-panel {
+    .bar[data-size='small'] .left,
+    .bar[data-size='small'] .center,
+    .bar[data-size='small'] .right {
+      display: contents;
+    }
+    .bar[data-size='small'] .center {
       position: static;
+      transform: none;
     }
+  }
 
-    &.combinePanel .bar__right-panel {
+  @container (max-width: 960px) {
+    .bar[data-size='big'] .row {
+      justify-content: center;
+      gap: var(--g);
+    }
+    .bar[data-size='big'] .left,
+    .bar[data-size='big'] .center,
+    .bar[data-size='big'] .right {
+      display: contents;
+    }
+    .bar[data-size='big'] .center {
       position: static;
+      transform: none;
     }
   }
 </style>
diff --git a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
index 0a6faea3c43..ad93a3a60ed 100644
--- a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
@@ -1,22 +1,23 @@
 <script lang="ts">
   import { AccountRole, getCurrentAccount, hasAccountRole } from '@hcengineering/core'
-  import { ModernButton } from '@hcengineering/ui'
+  import { ButtonBaseSize, ModernButton } from '@hcengineering/ui'
   import { isRecording, isRecordingAvailable, loveClient } from '../../../utils'
   import love from '../../../plugin'
   import { lkSessionConnected } from '../../../liveKitClient'
   import { Room } from '@hcengineering/love'
 
   export let room: Room
-  export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
+  export let size: ButtonBaseSize = 'large'
+  export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
 </script>
 
-{#if hasAccountRole(getCurrentAccount(), AccountRole.User) && $isRecordingAvailable}
-  <ModernButton
-    icon={$isRecording ? love.icon.StopRecord : love.icon.Record}
-    tooltip={{ label: $isRecording ? love.string.StopRecord : love.string.Record }}
-    disabled={!$lkSessionConnected}
-    kind={'secondary'}
-    {size}
-    on:click={() => loveClient.record(room)}
-  />
-{/if}
+<!-- {#if hasAccountRole(getCurrentAccount(), AccountRole.User) && $isRecordingAvailable} -->
+<ModernButton
+  icon={$isRecording ? love.icon.StopRecord : love.icon.Record}
+  tooltip={{ label: $isRecording ? love.string.StopRecord : love.string.Record }}
+  disabled={!$lkSessionConnected}
+  {kind}
+  {size}
+  on:click={() => loveClient.record(room)}
+/>
+<!-- {/if} -->
diff --git a/plugins/love-resources/src/components/meeting/controls/RoomAccessButton.svelte b/plugins/love-resources/src/components/meeting/controls/RoomAccessButton.svelte
index 273059d191d..23720213edc 100644
--- a/plugins/love-resources/src/components/meeting/controls/RoomAccessButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/RoomAccessButton.svelte
@@ -1,12 +1,13 @@
 <script lang="ts">
   import { isOffice, Room, RoomAccess, roomAccessIcon } from '@hcengineering/love'
   import love from '../../../plugin'
-  import { eventToHTMLElement, ModernButton, showPopup } from '@hcengineering/ui'
+  import { ButtonBaseSize, eventToHTMLElement, ModernButton, showPopup } from '@hcengineering/ui'
   import RoomAccessPopup from '../../RoomAccessPopup.svelte'
   import { getCurrentEmployee } from '@hcengineering/contact'
 
   export let room: Room
-  export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
+  export let size: ButtonBaseSize = 'large'
+  export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
 
   const me = getCurrentEmployee()
 
@@ -27,7 +28,7 @@
           : 'currentColor'
   }}
   tooltip={{ label: love.string.ChangeAccess }}
-  kind={'secondary'}
+  {kind}
   {size}
   disabled={isOffice(room) && room.person !== me}
   on:click={setAccess}
diff --git a/plugins/love-resources/src/components/meeting/controls/TranscriptionButton.svelte b/plugins/love-resources/src/components/meeting/controls/TranscriptionButton.svelte
index b56165ec58b..5c38fd840db 100644
--- a/plugins/love-resources/src/components/meeting/controls/TranscriptionButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/TranscriptionButton.svelte
@@ -4,11 +4,12 @@
   import { lkSessionConnected } from '../../../liveKitClient'
   import love from '../../../plugin'
   import view from '@hcengineering/view'
-  import { ModernButton } from '@hcengineering/ui'
+  import { ButtonBaseSize, ModernButton } from '@hcengineering/ui'
   import { Room } from '@hcengineering/love'
 
   export let room: Room
-  export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
+  export let size: ButtonBaseSize = 'large'
+  export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
 </script>
 
 {#if hasAccountRole(getCurrentAccount(), AccountRole.User) && isTranscriptionAllowed() && $lkSessionConnected}
@@ -16,7 +17,7 @@
     icon={view.icon.Feather}
     iconProps={$isTranscription ? { fill: 'var(--button-negative-BackgroundColor)' } : {}}
     tooltip={{ label: $isTranscription ? love.string.StopTranscription : love.string.StartTranscription }}
-    kind="secondary"
+    {kind}
     {size}
     on:click={() => {
       if ($isTranscription) {
diff --git a/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte b/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
index 42783b0d702..4d98c40da29 100644
--- a/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
+++ b/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
@@ -32,6 +32,9 @@
   import SendReactionButton from '../controls/SendReactionButton.svelte'
   import MeetingWidgetHeader from './MeetingWidgetHeader.svelte'
   import InviteEmployeeButton from '../invites/InviteEmployeeButton.svelte'
+  import MicrophoneButton from '../controls/MicrophoneButton.svelte'
+  import CameraButton from '../controls/CameraButton.svelte'
+  import ShareScreenButton from '../controls/ShareScreenButton.svelte'
 
   export let widgetState: WidgetState | undefined
   export let height: string
@@ -108,9 +111,8 @@
       {/if}
     {/if}
   </div>
-  <ControlBarContainer>
-    <svelte:fragment slot="right">
-      <RoomAccessButton {room} size="small" />
+  <ControlBarContainer size="small">
+    <svelte:fragment slot="left">
       <InviteEmployeeButton
         kind="secondary"
         type="type-button-icon"
@@ -121,10 +123,11 @@
     </svelte:fragment>
     <svelte:fragment slot="center">
       <SendReactionButton size="small" />
-      <RecordingButton {room} size="small" />
-      <TranscriptionButton {room} size="small" />
+      <MicrophoneButton size="small" />
+      <CameraButton size="small" />
+      <ShareScreenButton size="small" />
     </svelte:fragment>
-    <svelte:fragment slot="left">
+    <svelte:fragment slot="right">
       <LeaveRoomButton {room} noLabel={true} size="small" />
     </svelte:fragment>
   </ControlBarContainer>
diff --git a/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte b/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte
index e9b94884f79..a9eec5f285b 100644
--- a/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte
+++ b/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte
@@ -29,6 +29,9 @@
   import RoomModal from '../../RoomModal.svelte'
   import { currentRoom } from '../../../stores'
   import MeetingOptionsButton from '../controls/MeetingOptionsButton.svelte'
+  import RecordingButton from '../controls/RecordingButton.svelte'
+  import TranscriptionButton from '../controls/TranscriptionButton.svelte'
+  import RoomAccessButton from '../controls/RoomAccessButton.svelte'
 
   export let room: Room
   export let doc: MeetingMinutes | undefined = undefined
@@ -57,8 +60,11 @@
   <Breadcrumbs items={breadcrumbs} currentOnly />
   <svelte:fragment slot="actions">
     {#if $currentRoom !== undefined}
-      <ButtonIcon icon={IconMaximize} kind="tertiary" size="small" noPrint on:click={maximize} />
+      <RoomAccessButton {room} kind="tertiary" size="small" />
+      <RecordingButton {room} kind="tertiary" size="small" />
+      <TranscriptionButton {room} kind="tertiary" size="small" />
       <MeetingOptionsButton {room} kind="tertiary" size="small" />
+      <ButtonIcon icon={IconMaximize} kind="tertiary" size="small" noPrint on:click={maximize} />
     {/if}
   </svelte:fragment>
 </Header>
diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetingController.ts
index d4db236a669..abf7a181ffd 100644
--- a/plugins/love-resources/src/meetingController.ts
+++ b/plugins/love-resources/src/meetingController.ts
@@ -25,9 +25,9 @@ import { getCurrentEmployee, type Person } from '@hcengineering/contact'
 import { getPersonByPersonRef } from '@hcengineering/contact-resources'
 import { getMetadata } from '@hcengineering/platform'
 
+export let currentMeetingRoom: Ref<Room> | undefined
 const requestsQuery = createQuery(true)
 const invitesQuery = createQuery(true)
-export let currentMeetingRoom: Ref<Room> | undefined
 
 export async function createMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return

From 53f1d6eae982a8bcb3dec6e3725cb8d4d8716914 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Mon, 22 Sep 2025 10:29:41 +0700
Subject: [PATCH 11/25] Cleanup logs

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../src/components/EditRoom.svelte               |  5 +----
 .../src/components/RoomPopup.svelte              |  7 +------
 .../src/components/meeting/ControlExt.svelte     |  1 -
 plugins/love-resources/src/loveClient.ts         |  2 --
 plugins/love-resources/src/meetingController.ts  |  2 +-
 plugins/love-resources/src/utils.ts              | 16 +++-------------
 6 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/plugins/love-resources/src/components/EditRoom.svelte b/plugins/love-resources/src/components/EditRoom.svelte
index 1975dab1e50..a2ba100c69f 100644
--- a/plugins/love-resources/src/components/EditRoom.svelte
+++ b/plugins/love-resources/src/components/EditRoom.svelte
@@ -19,7 +19,7 @@
   import { IntlString } from '@hcengineering/platform'
 
   import love from '../plugin'
-  import { getRoomName, prepareRoomConnection } from '../utils'
+  import { getRoomName } from '../utils'
   import { infos, myOffice, currentRoom } from '../stores'
   import { lkSessionConnected } from '../liveKitClient'
   import { createMeeting, joinMeeting } from '../meetingController'
@@ -36,7 +36,6 @@
   let connecting = false
 
   onMount(() => {
-    void prepareRoomConnection(object)
     dispatch('open', { ignoreKeys: ['name'] })
   })
 
@@ -44,10 +43,8 @@
 
   async function connect (): Promise<void> {
     if ($infos.some(({ room }) => room === object._id)) {
-      console.log('join')
       await joinMeeting(object)
     } else {
-      console.log('create')
       await createMeeting(object)
     }
   }
diff --git a/plugins/love-resources/src/components/RoomPopup.svelte b/plugins/love-resources/src/components/RoomPopup.svelte
index 5d870ca16b6..b6b5e8f44f8 100644
--- a/plugins/love-resources/src/components/RoomPopup.svelte
+++ b/plugins/love-resources/src/components/RoomPopup.svelte
@@ -23,10 +23,9 @@
   import { getClient } from '@hcengineering/presentation'
   import view from '@hcengineering/view'
   import { getObjectLinkFragment } from '@hcengineering/view-resources'
-  import { createEventDispatcher, onMount } from 'svelte'
+  import { createEventDispatcher } from 'svelte'
   import love from '../plugin'
   import { currentMeetingMinutes, infos, myInfo } from '../stores'
-  import { prepareRoomConnection } from '../utils'
   import { lkSessionConnected } from '../liveKitClient'
   import MicrophoneButton from './meeting/controls/MicrophoneButton.svelte'
   import CameraButton from './meeting/controls/CameraButton.svelte'
@@ -46,10 +45,6 @@
     return await getPersonByPersonRef(info.person)
   }
 
-  onMount(() => {
-    prepareRoomConnection(room)
-  })
-
   let joined: boolean = false
   $: joined = $myInfo?.room === room._id
 
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index 8398398f08b..2fe65674499 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -186,7 +186,6 @@
       }
       return
     }
-    console.log(meetingSessionConnected, room, currentMeetingRoom, isMeetingWidgetCreated)
 
     if (meetingSessionConnected) {
       if (currentMeetingRoom !== undefined && room !== currentMeetingRoom) {
diff --git a/plugins/love-resources/src/loveClient.ts b/plugins/love-resources/src/loveClient.ts
index 0ffd257b51e..0cbf95fa78b 100644
--- a/plugins/love-resources/src/loveClient.ts
+++ b/plugins/love-resources/src/loveClient.ts
@@ -80,7 +80,6 @@ export class LoveClient {
   private async refreshRoomToken (room: Room): Promise<string> {
     const sessionName = this.getTokenRoomName(room)
     const endpoint = this.getLoveEndpoint()
-    console.log('refresh room token')
     if (endpoint === undefined) {
       throw new Error('Love service endpoint not found')
     }
@@ -89,7 +88,6 @@ export class LoveClient {
       throw new Error('Cannot find current person')
     }
     const platformToken = getPlatformToken()
-    console.log(platformToken)
     const res = await fetch(concatLink(endpoint, '/getToken'), {
       method: 'POST',
       headers: {
diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetingController.ts
index abf7a181ffd..5b024da91b3 100644
--- a/plugins/love-resources/src/meetingController.ts
+++ b/plugins/love-resources/src/meetingController.ts
@@ -240,8 +240,8 @@ async function connectToMeeting (room: Room): Promise<void> {
   await navigateToOfficeDoc(room)
   await moveToMeetingRoom(room)
 
-  const token = await loveClient.getRoomToken(room)
   try {
+    const token = await loveClient.getRoomToken(room)
     const wsURL = getLiveKitEndpoint()
     await liveKitClient.connect(wsURL, token, room.type === RoomType.Video)
   } catch (err) {
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index 023493cde8e..a8d7fe60390 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -267,11 +267,6 @@ export async function navigateToOfficeDoc (object: Doc): Promise<void> {
   navigate(loc)
 }
 
-export async function prepareRoomConnection (room: Room): Promise<void> {
-  const roomToken = await loveClient.getRoomToken(room)
-  await liveKitClient.prepareConnection(getLiveKitEndpoint(), roomToken)
-}
-
 export const joinRequest: Ref<JoinRequest> | undefined = undefined
 
 export function calculateFloorSize (_rooms: Room[], _preview?: boolean): number {
@@ -413,14 +408,9 @@ async function getRoomGuestLink (room: Room): Promise<string> {
 
     console.log('Create link')
     const accountClient = getAccountClientRaw(accountsUrl, token)
-    return await accountClient.createAccessLink(
-      AccountRole.Guest,
-      undefined,
-      undefined,
-      encodeURIComponent(JSON.stringify(navigateUrl))
-    )
-    // const func = await getResource(login.function.GetInviteLink)
-    // return await func(24, '', -1, AccountRole.Guest, )
+    return await accountClient.createAccessLink(AccountRole.Guest, {
+      navigateUrl: encodeURIComponent(JSON.stringify(navigateUrl))
+    })
   }
   return ''
 }

From 40db5047d1ced82dcb013088e41eb7770ffa7f9f Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Mon, 22 Sep 2025 12:01:54 +0700
Subject: [PATCH 12/25] Fix checks

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../love-resources/src/components/meeting/ControlBar.svelte  | 5 ++---
 .../src/components/meeting/ControlBarContainer.svelte        | 1 +
 .../src/components/meeting/widget/MeetingWidget.svelte       | 3 ---
 .../src/components/meeting/widget/MeetingWidgetHeader.svelte | 2 --
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/love-resources/src/components/meeting/ControlBar.svelte b/plugins/love-resources/src/components/meeting/ControlBar.svelte
index eb86bfd22f1..76d2ba5fc97 100644
--- a/plugins/love-resources/src/components/meeting/ControlBar.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlBar.svelte
@@ -39,7 +39,6 @@
   export let onFullScreen: (() => void) | undefined = undefined
 
   let allowLeave: boolean = false
-  let noLabel: boolean = false
 
   $: allowLeave = $myInfo?.room !== ($myOffice?._id ?? love.ids.Reception)
 
@@ -49,7 +48,7 @@
 </script>
 
 <div class="control-bar">
-  <ControlBarContainer bind:noLabel>
+  <ControlBarContainer>
     <svelte:fragment slot="left">
       {#if room._id !== love.ids.Reception && $lkSessionConnected}
         <RoomAccessButton {room} />
@@ -105,7 +104,7 @@
       {/if}
       <MeetingOptionsButton {room} />
       {#if allowLeave}
-        <LeaveRoomButton {room} {noLabel} />
+        <LeaveRoomButton {room} />
       {/if}
     </svelte:fragment>
 
diff --git a/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte b/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte
index 44b78ed4ec0..6143f736176 100644
--- a/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlBarContainer.svelte
@@ -21,6 +21,7 @@
     <div class="left"><slot name="left" /></div>
     <div class="center"><slot name="center" /></div>
     <div class="right"><slot name="right" /></div>
+    <slot name="extra" />
   </div>
 </div>
 
diff --git a/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte b/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
index 4d98c40da29..6fae71500bd 100644
--- a/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
+++ b/plugins/love-resources/src/components/meeting/widget/MeetingWidget.svelte
@@ -25,9 +25,6 @@
   import TranscriptionTab from './TranscriptionTab.svelte'
   import { lkSessionConnected } from '../../../liveKitClient'
   import LeaveRoomButton from '../controls/LeaveRoomButton.svelte'
-  import RoomAccessButton from '../controls/RoomAccessButton.svelte'
-  import RecordingButton from '../controls/RecordingButton.svelte'
-  import TranscriptionButton from '../controls/TranscriptionButton.svelte'
   import ControlBarContainer from '../ControlBarContainer.svelte'
   import SendReactionButton from '../controls/SendReactionButton.svelte'
   import MeetingWidgetHeader from './MeetingWidgetHeader.svelte'
diff --git a/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte b/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte
index a9eec5f285b..29a119db3dc 100644
--- a/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte
+++ b/plugins/love-resources/src/components/meeting/widget/MeetingWidgetHeader.svelte
@@ -25,7 +25,6 @@
   import { MeetingMinutes, Room } from '@hcengineering/love'
   import { onDestroy } from 'svelte'
 
-  import love from '../../../plugin'
   import RoomModal from '../../RoomModal.svelte'
   import { currentRoom } from '../../../stores'
   import MeetingOptionsButton from '../controls/MeetingOptionsButton.svelte'
@@ -42,7 +41,6 @@
   $: breadcrumbs = [
     {
       id: 'meeting',
-      icon: love.icon.Cam,
       title: doc?.title ?? room.name
     }
   ]

From bda827f1a7cb462ddb8279b6a651f669506b03b7 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Mon, 22 Sep 2025 15:40:34 +0700
Subject: [PATCH 13/25] Fix commented code

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../love-resources/src/components/Room.svelte |  5 ++---
 .../components/RoomLanguageSelector.svelte    |  1 -
 .../meeting/controls/RecordingButton.svelte   | 20 +++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/plugins/love-resources/src/components/Room.svelte b/plugins/love-resources/src/components/Room.svelte
index 093c89d11af..ff7c0bff190 100644
--- a/plugins/love-resources/src/components/Room.svelte
+++ b/plugins/love-resources/src/components/Room.svelte
@@ -13,17 +13,16 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import presentation, { ActionContext } from '@hcengineering/presentation'
+  import { ActionContext } from '@hcengineering/presentation'
   import { Room as TypeRoom } from '@hcengineering/love'
   import { getMetadata } from '@hcengineering/platform'
   import { Label, Loading, deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
   import { onDestroy, onMount } from 'svelte'
 
   import love from '../plugin'
-  import { waitForOfficeLoaded, currentRoom, infos, invites, myInfo, myRequests } from '../stores'
+  import { waitForOfficeLoaded, currentRoom } from '../stores'
   import { isFullScreen, lk } from '../utils'
   import ControlBar from './meeting/ControlBar.svelte'
-  import { lkSessionConnected } from '../liveKitClient'
   import ParticipantsListView from './meeting/ParticipantsListView.svelte'
   import ScreenSharingView from './meeting/ScreenSharingView.svelte'
 
diff --git a/plugins/love-resources/src/components/RoomLanguageSelector.svelte b/plugins/love-resources/src/components/RoomLanguageSelector.svelte
index fef754c3acf..cd9b2c2b5b0 100644
--- a/plugins/love-resources/src/components/RoomLanguageSelector.svelte
+++ b/plugins/love-resources/src/components/RoomLanguageSelector.svelte
@@ -43,7 +43,6 @@
     if (newLang == null) return
 
     await client.diffUpdate(room, { language: newLang })
-    // await updateSessionLanguage(room)
   }
 
   function showLanguagesPopup (): void {
diff --git a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
index ad93a3a60ed..140d1283479 100644
--- a/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/RecordingButton.svelte
@@ -11,13 +11,13 @@
   export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
 </script>
 
-<!-- {#if hasAccountRole(getCurrentAccount(), AccountRole.User) && $isRecordingAvailable} -->
-<ModernButton
-  icon={$isRecording ? love.icon.StopRecord : love.icon.Record}
-  tooltip={{ label: $isRecording ? love.string.StopRecord : love.string.Record }}
-  disabled={!$lkSessionConnected}
-  {kind}
-  {size}
-  on:click={() => loveClient.record(room)}
-/>
-<!-- {/if} -->
+{#if hasAccountRole(getCurrentAccount(), AccountRole.User) && $isRecordingAvailable}
+  <ModernButton
+    icon={$isRecording ? love.icon.StopRecord : love.icon.Record}
+    tooltip={{ label: $isRecording ? love.string.StopRecord : love.string.Record }}
+    disabled={!$lkSessionConnected}
+    {kind}
+    {size}
+    on:click={() => loveClient.record(room)}
+  />
+{/if}

From 172851a320146edde7a8a18249252be6f631d893 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Tue, 23 Sep 2025 09:30:51 +0700
Subject: [PATCH 14/25] Rename file

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../src/components/EditRoom.svelte            |  2 +-
 .../src/components/MediaPopupItemExt.svelte   |  5 ++-
 .../src/components/PersonActionPopup.svelte   |  2 +-
 .../src/components/RoomPopup.svelte           |  2 +-
 .../src/components/meeting/ControlExt.svelte  |  2 +-
 .../LastParticipantNotification.svelte        |  2 +-
 .../meeting/controls/LeaveRoomButton.svelte   |  2 +-
 .../meeting/invites/ActiveInvitesPopup.svelte |  2 +-
 .../invites/InviteEmployeeButton.svelte       |  2 +-
 .../meeting/invites/InvitePopup.svelte        |  2 +-
 .../meeting/invites/RequestPopup.svelte       |  2 +-
 .../meeting/invites/RequestingPopup.svelte    |  2 +-
 plugins/love-resources/src/liveKitClient.ts   |  2 +-
 .../src/{meetingController.ts => meetings.ts} | 34 +++++++++----------
 14 files changed, 31 insertions(+), 32 deletions(-)
 rename plugins/love-resources/src/{meetingController.ts => meetings.ts} (87%)

diff --git a/plugins/love-resources/src/components/EditRoom.svelte b/plugins/love-resources/src/components/EditRoom.svelte
index a2ba100c69f..e079c679607 100644
--- a/plugins/love-resources/src/components/EditRoom.svelte
+++ b/plugins/love-resources/src/components/EditRoom.svelte
@@ -22,7 +22,7 @@
   import { getRoomName } from '../utils'
   import { infos, myOffice, currentRoom } from '../stores'
   import { lkSessionConnected } from '../liveKitClient'
-  import { createMeeting, joinMeeting } from '../meetingController'
+  import { createMeeting, joinMeeting } from '../meetings'
 
   export let object: Room
 
diff --git a/plugins/love-resources/src/components/MediaPopupItemExt.svelte b/plugins/love-resources/src/components/MediaPopupItemExt.svelte
index a8258e12040..a02a2119c66 100644
--- a/plugins/love-resources/src/components/MediaPopupItemExt.svelte
+++ b/plugins/love-resources/src/components/MediaPopupItemExt.svelte
@@ -1,15 +1,14 @@
 <script lang="ts">
   import { Avatar, getPersonByPersonRefStore } from '@hcengineering/contact-resources'
-  import { isOffice } from '@hcengineering/love'
   import { Button } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import { createEventDispatcher } from 'svelte'
   import love from '../plugin'
-  import { currentRoom, infos, myInfo, myOffice, rooms } from '../stores'
+  import { currentRoom, infos, myInfo, myOffice } from '../stores'
   import { liveKitClient } from '../utils'
   import { lkSessionConnected, ScreenSharingState, screenSharingState } from '../liveKitClient'
   import MeetingHeader from './meeting/MeetingHeader.svelte'
-  import { leaveMeeting } from '../meetingController'
+  import { leaveMeeting } from '../meetings'
 
   export let limit: number = 4
 
diff --git a/plugins/love-resources/src/components/PersonActionPopup.svelte b/plugins/love-resources/src/components/PersonActionPopup.svelte
index a33b8ac121a..db142f9d4f8 100644
--- a/plugins/love-resources/src/components/PersonActionPopup.svelte
+++ b/plugins/love-resources/src/components/PersonActionPopup.svelte
@@ -5,7 +5,7 @@
   import { ActionIcon } from '@hcengineering/ui'
   import love from '../plugin'
   import { myInfo } from '../stores'
-  import { joinMeeting, kick, sendInvites } from '../meetingController'
+  import { joinMeeting, kick, sendInvites } from '../meetings'
 
   export let room: Room
   export let person: Ref<Person>
diff --git a/plugins/love-resources/src/components/RoomPopup.svelte b/plugins/love-resources/src/components/RoomPopup.svelte
index b6b5e8f44f8..df32a6e3d7b 100644
--- a/plugins/love-resources/src/components/RoomPopup.svelte
+++ b/plugins/love-resources/src/components/RoomPopup.svelte
@@ -32,7 +32,7 @@
   import ShareScreenButton from './meeting/controls/ShareScreenButton.svelte'
   import LeaveRoomButton from './meeting/controls/LeaveRoomButton.svelte'
   import MeetingHeader from './meeting/MeetingHeader.svelte'
-  import { joinMeeting } from '../meetingController'
+  import { joinMeeting } from '../meetings'
 
   export let room: Room
 
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index 2fe65674499..a1157f8ec06 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -39,7 +39,7 @@
   import RequestingPopup from './invites/RequestingPopup.svelte'
   import RoomPopup from '../RoomPopup.svelte'
   import RoomButton from '../RoomButton.svelte'
-  import { leaveMeeting, currentMeetingRoom } from '../../meetingController'
+  import { leaveMeeting, currentMeetingRoom } from '../../meetings'
   import { lkSessionConnected } from '../../liveKitClient'
 
   const client = getClient()
diff --git a/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte b/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte
index 01d959a9fcb..4f7ad69ad06 100644
--- a/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte
+++ b/plugins/love-resources/src/components/meeting/LastParticipantNotification.svelte
@@ -3,7 +3,7 @@
   import love from '../../plugin'
   import { onMount } from 'svelte'
   import { playSound } from '@hcengineering/presentation'
-  import { leaveMeeting } from '../../meetingController'
+  import { leaveMeeting } from '../../meetings'
 
   export let onRemove: () => void
   export let notification: Notification
diff --git a/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte b/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
index 80cf2c219b7..85c6aaf1872 100644
--- a/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
+++ b/plugins/love-resources/src/components/meeting/controls/LeaveRoomButton.svelte
@@ -4,7 +4,7 @@
   import { myInfo, myOffice } from '../../../stores'
   import { isOffice, Room } from '@hcengineering/love'
   import { createEventDispatcher } from 'svelte'
-  import { leaveMeeting } from '../../../meetingController'
+  import { leaveMeeting } from '../../../meetings'
 
   export let room: Room
   export let size: 'large' | 'medium' | 'small' | 'extra-small' | 'min' = 'large'
diff --git a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
index 0ac12e0f24e..f620d562e6e 100644
--- a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
@@ -17,7 +17,7 @@
   import { CombineAvatars } from '@hcengineering/contact-resources'
   import { Button, Label } from '@hcengineering/ui'
   import love from '../../../plugin'
-  import { cancelInvites } from '../../../meetingController'
+  import { cancelInvites } from '../../../meetings'
   import { activeInvites } from '../../../stores'
 
   $: persons = $activeInvites.map((p) => p.target)
diff --git a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
index 36a231e60f9..06f626ae389 100644
--- a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { ButtonBaseSize, IconSize, ModernButton, showPopup } from '@hcengineering/ui'
   import { Employee } from '@hcengineering/contact'
-  import { sendInvites } from '../../../meetingController'
+  import { sendInvites } from '../../../meetings'
   import love from '../../../plugin'
   import { SelectUsersPopup } from '@hcengineering/contact-resources'
   import { Ref } from '@hcengineering/core'
diff --git a/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
index 7d3e93f2ad5..99e365eca15 100644
--- a/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
@@ -21,7 +21,7 @@
   import { onDestroy, onMount } from 'svelte'
 
   import love from '../../../plugin'
-  import { acceptInvite, rejectInvite } from '../../../meetingController'
+  import { acceptInvite, rejectInvite } from '../../../meetings'
 
   export let invite: Invite
 
diff --git a/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte b/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
index 97c66a5db73..9cacc9c0964 100644
--- a/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
@@ -20,7 +20,7 @@
   import { JoinRequest } from '@hcengineering/love'
   import love from '../../../plugin'
   import { onDestroy, onMount } from 'svelte'
-  import { acceptJoinRequest, rejectJoinRequest } from '../../../meetingController'
+  import { acceptJoinRequest, rejectJoinRequest } from '../../../meetings'
 
   export let request: JoinRequest
 
diff --git a/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte b/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
index 4c0499a89cc..61b7132978f 100644
--- a/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
@@ -18,7 +18,7 @@
   import love from '../../../plugin'
   import { rooms } from '../../../stores'
   import { getRoomLabel } from '../../../utils'
-  import { cancelJoinRequest } from '../../../meetingController'
+  import { cancelJoinRequest } from '../../../meetings'
 
   export let request: JoinRequest
 
diff --git a/plugins/love-resources/src/liveKitClient.ts b/plugins/love-resources/src/liveKitClient.ts
index c9401394d0f..368849320f5 100644
--- a/plugins/love-resources/src/liveKitClient.ts
+++ b/plugins/love-resources/src/liveKitClient.ts
@@ -23,7 +23,7 @@ import { getCurrentLanguage } from '@hcengineering/theme'
 import LastParticipantNotification from './components/meeting/LastParticipantNotification.svelte'
 import love from './plugin'
 import { $myPreferences } from './stores'
-import { leaveMeeting } from './meetingController'
+import { leaveMeeting } from './meetings'
 
 export enum ScreenSharingState {
   Inactive,
diff --git a/plugins/love-resources/src/meetingController.ts b/plugins/love-resources/src/meetings.ts
similarity index 87%
rename from plugins/love-resources/src/meetingController.ts
rename to plugins/love-resources/src/meetings.ts
index 5b024da91b3..2130f584307 100644
--- a/plugins/love-resources/src/meetingController.ts
+++ b/plugins/love-resources/src/meetings.ts
@@ -29,7 +29,7 @@ export let currentMeetingRoom: Ref<Room> | undefined
 const requestsQuery = createQuery(true)
 const invitesQuery = createQuery(true)
 
-export async function createMeeting (room: Room): Promise<void> {
+export async function createMeeting(room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const me = getCurrentEmployee()
@@ -55,7 +55,7 @@ export async function createMeeting (room: Room): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function leaveMeeting (): Promise<void> {
+export async function leaveMeeting(): Promise<void> {
   const client = getClient()
   const currentParticipationInfo = get(myInfo)
   const office = get(myOffice)
@@ -82,7 +82,7 @@ export async function leaveMeeting (): Promise<void> {
   currentMeetingRoom = undefined
 }
 
-export async function joinMeeting (room: Room): Promise<void> {
+export async function joinMeeting(room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const isGuest = getCurrentAccount().role === AccountRole.Guest
@@ -94,7 +94,7 @@ export async function joinMeeting (room: Room): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function acceptInvite (invite: Invite): Promise<void> {
+export async function acceptInvite(invite: Invite): Promise<void> {
   const client = getClient()
   await client.update(invite, { status: RequestStatus.Approved })
   const room = getRoomById(invite.room)
@@ -112,12 +112,12 @@ export async function acceptInvite (invite: Invite): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function rejectInvite (invite: Invite): Promise<void> {
+export async function rejectInvite(invite: Invite): Promise<void> {
   const client = getClient()
   await client.update(invite, { status: RequestStatus.Rejected })
 }
 
-export async function cancelInvites (invites: Invite[]): Promise<void> {
+export async function cancelInvites(invites: Invite[]): Promise<void> {
   const client = getClient()
   for (const invite of invites) {
     if (invite.status === RequestStatus.Pending) {
@@ -126,7 +126,7 @@ export async function cancelInvites (invites: Invite[]): Promise<void> {
   }
 }
 
-export async function sendInvites (persons: Array<Ref<Person>>): Promise<void> {
+export async function sendInvites(persons: Array<Ref<Person>>): Promise<void> {
   const myParticipation = get(myInfo)
   const room = myParticipation?.room
   if (room === undefined || room === love.ids.Reception) return
@@ -156,7 +156,7 @@ export async function sendInvites (persons: Array<Ref<Person>>): Promise<void> {
   })
 }
 
-export async function acceptJoinRequest (request: JoinRequest): Promise<void> {
+export async function acceptJoinRequest(request: JoinRequest): Promise<void> {
   const client = getClient()
   const room = getRoomById(request.room)
 
@@ -174,19 +174,19 @@ export async function acceptJoinRequest (request: JoinRequest): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function rejectJoinRequest (request: JoinRequest): Promise<void> {
+export async function rejectJoinRequest(request: JoinRequest): Promise<void> {
   const client = getClient()
   await client.update(request, { status: RequestStatus.Rejected })
 }
 
-export async function cancelJoinRequest (request: JoinRequest): Promise<void> {
+export async function cancelJoinRequest(request: JoinRequest): Promise<void> {
   if (request.status === RequestStatus.Pending) {
     const client = getClient()
     await client.remove(request)
   }
 }
 
-async function sendJoinRequest (room: Room): Promise<void> {
+async function sendJoinRequest(room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const me = getCurrentEmployee()
@@ -217,7 +217,7 @@ async function sendJoinRequest (room: Room): Promise<void> {
   })
 }
 
-export async function kick (person: Ref<Person>): Promise<void> {
+export async function kick(person: Ref<Person>): Promise<void> {
   const client = getClient()
   const allRooms = get(rooms)
   const participantsInfo = get(infos)
@@ -227,7 +227,7 @@ export async function kick (person: Ref<Person>): Promise<void> {
   await client.update(participantInfo, { room: participantOffice?._id ?? love.ids.Reception, x: 0, y: 0 })
 }
 
-async function connectToMeeting (room: Room): Promise<void> {
+async function connectToMeeting(room: Room): Promise<void> {
   if (getCurrentAccount().role === AccountRole.ReadOnlyGuest) return
   if (currentMeetingRoom === room._id) return
 
@@ -250,7 +250,7 @@ async function connectToMeeting (room: Room): Promise<void> {
   }
 }
 
-async function moveToMeetingRoom (room: Room): Promise<void> {
+async function moveToMeetingRoom(room: Room): Promise<void> {
   const me = getCurrentEmployee()
   const currentPerson = await getPersonByPersonRef(me)
   const client = getClient()
@@ -282,7 +282,7 @@ async function moveToMeetingRoom (room: Room): Promise<void> {
   }
 }
 
-async function createMeetingDocument (room: Room): Promise<void> {
+async function createMeetingDocument(room: Room): Promise<void> {
   const client = getClient()
   await client.createDoc(love.class.MeetingMinutes, core.space.Workspace, {
     description: null,
@@ -294,7 +294,7 @@ async function createMeetingDocument (room: Room): Promise<void> {
   })
 }
 
-async function getNewMeetingTitle (room: Room): Promise<string> {
+async function getNewMeetingTitle(room: Room): Promise<string> {
   const date = new Date()
     .toLocaleDateString('en-GB', {
       day: 'numeric',
@@ -305,7 +305,7 @@ async function getNewMeetingTitle (room: Room): Promise<string> {
   return `${await getRoomName(room)} ${date}`
 }
 
-function getRoomById (roomId: Ref<Room>): Room | undefined {
+function getRoomById(roomId: Ref<Room>): Room | undefined {
   const allRooms = get(rooms)
   return allRooms.find((p) => p._id === roomId)
 }

From 50a1c06add5561997eae0aa4614b63ca9aae89a4 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Wed, 24 Sep 2025 12:40:33 +0700
Subject: [PATCH 15/25] Move pulse creation to the presentation package

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 packages/presentation/package.json                            | 1 +
 packages/presentation/src/index.ts                            | 1 +
 .../presence-resources => packages/presentation}/src/pulse.ts | 2 +-
 .../src/components/WorkbenchExtension.svelte                  | 2 +-
 plugins/presence-resources/src/index.ts                       | 1 -
 plugins/presence-resources/src/presence.ts                    | 4 +---
 plugins/presence-resources/src/typing.ts                      | 3 +--
 7 files changed, 6 insertions(+), 8 deletions(-)
 rename {plugins/presence-resources => packages/presentation}/src/pulse.ts (95%)

diff --git a/packages/presentation/package.json b/packages/presentation/package.json
index 03071237476..d0a5fccea40 100644
--- a/packages/presentation/package.json
+++ b/packages/presentation/package.json
@@ -62,6 +62,7 @@
     "@hcengineering/theme": "^0.6.5",
     "@hcengineering/retry": "^0.6.0",
     "@hcengineering/hulylake-client": "^0.6.0",
+    "@hcengineering/hulypulse-client": "^0.6.0",
     "fast-equals": "^5.2.2",
     "png-chunks-extract": "^1.0.0",
     "svelte": "^4.2.20",
diff --git a/packages/presentation/src/index.ts b/packages/presentation/src/index.ts
index 899c0ed61ce..ba646872468 100644
--- a/packages/presentation/src/index.ts
+++ b/packages/presentation/src/index.ts
@@ -78,3 +78,4 @@ export * from './drawingCommand'
 export * from './drawingCommandsProcessor'
 export * from './link-preview'
 export * from './communication'
+export * from './pulse'
diff --git a/plugins/presence-resources/src/pulse.ts b/packages/presentation/src/pulse.ts
similarity index 95%
rename from plugins/presence-resources/src/pulse.ts
rename to packages/presentation/src/pulse.ts
index 52b379090ef..93681b8093a 100644
--- a/plugins/presence-resources/src/pulse.ts
+++ b/packages/presentation/src/pulse.ts
@@ -13,7 +13,7 @@
 
 import { HulypulseClient } from '@hcengineering/hulypulse-client'
 import { getMetadata } from '@hcengineering/platform'
-import presentation from '@hcengineering/presentation'
+import presentation from './plugin'
 
 let pulseclient: HulypulseClient | undefined
 
diff --git a/plugins/presence-resources/src/components/WorkbenchExtension.svelte b/plugins/presence-resources/src/components/WorkbenchExtension.svelte
index 21d05b794d2..df2fe4c30f2 100644
--- a/plugins/presence-resources/src/components/WorkbenchExtension.svelte
+++ b/plugins/presence-resources/src/components/WorkbenchExtension.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import { onDestroy, onMount } from 'svelte'
   import { HulypulseClient } from '@hcengineering/hulypulse-client'
-  import { createPulseClient } from '../pulse'
+  import { createPulseClient } from '@hcengineering/presentation'
 
   let parentElement: HTMLDivElement
 
diff --git a/plugins/presence-resources/src/index.ts b/plugins/presence-resources/src/index.ts
index dfa54428ebb..954748a2c31 100644
--- a/plugins/presence-resources/src/index.ts
+++ b/plugins/presence-resources/src/index.ts
@@ -22,7 +22,6 @@ import { getFollowee, publishData, followeeDataSubscribe, followeeDataUnsubscrib
 
 export { Presence, PresenceAvatars }
 
-export * from './pulse'
 export * from './presence'
 export * from './typing'
 export * from './types'
diff --git a/plugins/presence-resources/src/presence.ts b/plugins/presence-resources/src/presence.ts
index be8abf772f4..dbe802e642d 100644
--- a/plugins/presence-resources/src/presence.ts
+++ b/plugins/presence-resources/src/presence.ts
@@ -15,9 +15,7 @@ import { type Employee, type Person } from '@hcengineering/contact'
 import { type UnsubscribeCallback, type Callback } from '@hcengineering/hulypulse-client'
 import { type Class, type Doc, type Ref } from '@hcengineering/core'
 import { getMetadata } from '@hcengineering/platform'
-import presentation from '@hcengineering/presentation'
-
-import { createPulseClient } from './pulse'
+import presentation, { createPulseClient } from '@hcengineering/presentation'
 
 export interface PresenceInfo {
   personId: Ref<Person>
diff --git a/plugins/presence-resources/src/typing.ts b/plugins/presence-resources/src/typing.ts
index 1e5c8040f8b..6e7a8050d9f 100644
--- a/plugins/presence-resources/src/typing.ts
+++ b/plugins/presence-resources/src/typing.ts
@@ -14,9 +14,8 @@
 import { type Employee, type Person } from '@hcengineering/contact'
 import { type UnsubscribeCallback, type Callback } from '@hcengineering/hulypulse-client'
 import { getMetadata } from '@hcengineering/platform'
-import presentation from '@hcengineering/presentation'
+import presentation, { createPulseClient } from '@hcengineering/presentation'
 import { type Doc, type Ref } from '@hcengineering/core'
-import { createPulseClient } from './pulse'
 
 const typingDelaySeconds = 2
 

From 4b0db0122dac3f5bec62ca412d5242cef64ed233 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Wed, 24 Sep 2025 12:40:58 +0700
Subject: [PATCH 16/25] Fix popup update function

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 packages/ui/src/popups.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/popups.ts b/packages/ui/src/popups.ts
index 705befff00e..b82eb6cda64 100644
--- a/packages/ui/src/popups.ts
+++ b/packages/ui/src/popups.ts
@@ -143,7 +143,7 @@ export function showPopup (
     id,
     close: closePopupOp,
     update: (props) => {
-      updatePopup(id, props)
+      updatePopup(id, { props })
     }
   }
 }

From 865753467080fba79ebae8d48e40ba5406262bbc Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Wed, 24 Sep 2025 12:42:19 +0700
Subject: [PATCH 17/25] Use pulse for meeting invites

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 plugins/love-resources/package.json           |   1 +
 .../src/components/PersonActionPopup.svelte   |   5 +-
 .../src/components/WorkbenchExtension.svelte  |   6 +-
 .../src/components/meeting/ControlExt.svelte  |  26 --
 .../meeting/invites/ActiveInvitesPopup.svelte |  34 ++-
 .../invites/InviteEmployeeButton.svelte       |   6 +-
 .../meeting/invites/InvitePopup.svelte        |  17 +-
 plugins/love-resources/src/invites.ts         | 225 ++++++++++++++++++
 plugins/love-resources/src/meetings.ts        |  77 ++----
 9 files changed, 288 insertions(+), 109 deletions(-)
 create mode 100644 plugins/love-resources/src/invites.ts

diff --git a/plugins/love-resources/package.json b/plugins/love-resources/package.json
index a2782eea1e4..fe69c4e322c 100644
--- a/plugins/love-resources/package.json
+++ b/plugins/love-resources/package.json
@@ -65,6 +65,7 @@
     "@hcengineering/emoji-resources": "^0.6.0",
     "@hcengineering/theme": "^0.6.5",
     "@hcengineering/account-client": "^0.6.0",
+    "@hcengineering/hulypulse-client": "^0.6.0",
     "@livekit/krisp-noise-filter": "^0.3.0",
     "@livekit/track-processors": "^0.5.6",
     "livekit-client": "^2.15.6",
diff --git a/plugins/love-resources/src/components/PersonActionPopup.svelte b/plugins/love-resources/src/components/PersonActionPopup.svelte
index db142f9d4f8..7e66faa8cec 100644
--- a/plugins/love-resources/src/components/PersonActionPopup.svelte
+++ b/plugins/love-resources/src/components/PersonActionPopup.svelte
@@ -5,7 +5,8 @@
   import { ActionIcon } from '@hcengineering/ui'
   import love from '../plugin'
   import { myInfo } from '../stores'
-  import { joinMeeting, kick, sendInvites } from '../meetings'
+  import { joinMeeting, kick } from '../meetings'
+  import { showInvitesPopup } from '../invites'
 
   export let room: Room
   export let person: Ref<Person>
@@ -30,7 +31,7 @@
       label={love.string.Invite}
       icon={love.icon.Invite}
       action={() => {
-        void sendInvites([person])
+        showInvitesPopup([person])
       }}
     />
     {#if room.access === RoomAccess.Knock}
diff --git a/plugins/love-resources/src/components/WorkbenchExtension.svelte b/plugins/love-resources/src/components/WorkbenchExtension.svelte
index 0091f5e31f2..1b2752bcf6b 100644
--- a/plugins/love-resources/src/components/WorkbenchExtension.svelte
+++ b/plugins/love-resources/src/components/WorkbenchExtension.svelte
@@ -5,6 +5,7 @@
   import love from '../plugin'
   import { liveKitClient, lk } from '../utils'
   import { lkSessionConnected } from '../liveKitClient'
+  import { subscribeInviteRequests, unsubscribeInviteRequests } from '../invites'
 
   let parentElement: HTMLDivElement
 
@@ -33,13 +34,16 @@
     }
   }
 
-  onMount(() => {
+  onMount(async () => {
     pushRootBarComponent('left', love.component.ControlExt, 20)
     lk.on(RoomEvent.TrackSubscribed, handleTrackSubscribed)
     lk.on(RoomEvent.TrackUnsubscribed, handleTrackUnsubscribed)
+
+    await subscribeInviteRequests()
   })
 
   onDestroy(async () => {
+    await unsubscribeInviteRequests()
     lk.off(RoomEvent.TrackSubscribed, handleTrackSubscribed)
     lk.off(RoomEvent.TrackUnsubscribed, handleTrackUnsubscribed)
     if ($lkSessionConnected) {
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index a1157f8ec06..ebc36a89b2f 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -33,7 +33,6 @@
   import { activeInvites, currentRoom, infos, myInfo, myInvites, myRequests, rooms } from '../../stores'
   import { createMeetingWidget, getRoomName } from '../../utils'
   import ActiveInvitesPopup from './invites/ActiveInvitesPopup.svelte'
-  import InvitePopup from './invites/InvitePopup.svelte'
   import PersonActionPopup from '../PersonActionPopup.svelte'
   import RequestPopup from './invites/RequestPopup.svelte'
   import RequestingPopup from './invites/RequestingPopup.svelte'
@@ -127,30 +126,6 @@
     }
   }
 
-  let activeInvite: Invite | undefined = undefined
-  const inviteCategory = 'inviteReq'
-  function checkInvites (invites: Invite[]): void {
-    if (activeInvite !== undefined) {
-      // try to find active request, if it not exists close popup
-      if (invites.find((r) => r._id === activeInvite?._id) === undefined) {
-        closePopup(inviteCategory)
-        activeInvite = undefined
-      }
-    }
-    if (activeInvite === undefined) {
-      activeInvite = invites[0]
-      if (activeInvite !== undefined) {
-        showPopup(InvitePopup, { invite: activeInvite }, undefined, undefined, undefined, {
-          category: inviteCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    }
-  }
-
-  $: checkInvites($myInvites)
-
   const myInvitesCategory = 'myInvites'
 
   let myInvitesPopup: PopupResult | undefined = undefined
@@ -211,7 +186,6 @@
 
   onDestroy(() => {
     closePopup(myInvitesCategory)
-    closePopup(inviteCategory)
     closePopup(joinRequestCategory)
     closePopup(myJoinRequestCategory)
     closeWidget(love.ids.MeetingWidget)
diff --git a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
index f620d562e6e..0c24d712a8b 100644
--- a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
@@ -13,17 +13,41 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact from '@hcengineering/contact'
+  import contact, { Person } from '@hcengineering/contact'
   import { CombineAvatars } from '@hcengineering/contact-resources'
   import { Button, Label } from '@hcengineering/ui'
   import love from '../../../plugin'
-  import { cancelInvites } from '../../../meetings'
-  import { activeInvites } from '../../../stores'
+  import { Ref } from '@hcengineering/core'
+  import { onMount } from 'svelte'
+  import {
+    cancelInvites,
+    closeInvitesPopup,
+    inviteSecondsToLive,
+    sendInvites,
+    subscribeInviteResponses,
+    unsubscribeInviteResponses
+  } from '../../../invites'
 
-  $: persons = $activeInvites.map((p) => p.target)
+  export let persons: Array<Ref<Person>>
+  export let meetingId: string
+
+  onMount(() => {
+    void subscribeInviteResponses()
+    void doSendInvites()
+    const interval = setInterval(doSendInvites, (inviteSecondsToLive - 2) * 1000)
+    return () => {
+      void unsubscribeInviteResponses()
+      clearInterval(interval)
+      void cancelInvites(meetingId)
+    }
+  })
+
+  async function doSendInvites (): Promise<void> {
+    await sendInvites(persons, meetingId)
+  }
 
   async function cancel (): Promise<void> {
-    await cancelInvites($activeInvites)
+    closeInvitesPopup()
   }
 </script>
 
diff --git a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
index 06f626ae389..c184e2d3f1e 100644
--- a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
@@ -15,11 +15,11 @@
 <script lang="ts">
   import { ButtonBaseSize, IconSize, ModernButton, showPopup } from '@hcengineering/ui'
   import { Employee } from '@hcengineering/contact'
-  import { sendInvites } from '../../../meetings'
   import love from '../../../plugin'
   import { SelectUsersPopup } from '@hcengineering/contact-resources'
   import { Ref } from '@hcengineering/core'
   import { createEventDispatcher } from 'svelte'
+  import { showInvitesPopup } from '../../../invites'
 
   export let employee: Employee | undefined = undefined
   export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
@@ -32,7 +32,7 @@
 
   async function invite (): Promise<void> {
     if (employee !== undefined) {
-      await sendInvites([employee._id])
+      showInvitesPopup([employee._id])
     } else {
       openSelectUsersPopup()
     }
@@ -50,7 +50,7 @@
       'top',
       (result?: Ref<Employee>[]) => {
         if (result != null) {
-          void sendInvites(result)
+          showInvitesPopup(result)
         }
         dispatch('close')
       }
diff --git a/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
index 99e365eca15..eff8535602b 100644
--- a/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
@@ -17,15 +17,14 @@
   import { Avatar, getPersonByPersonRefCb } from '@hcengineering/contact-resources'
   import { playNotificationSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
-  import { Invite } from '@hcengineering/love'
   import { onDestroy, onMount } from 'svelte'
 
   import love from '../../../plugin'
-  import { acceptInvite, rejectInvite } from '../../../meetings'
-
-  export let invite: Invite
+  import { InviteRequest, responseToInviteRequest } from '../../../invites'
 
+  export let invite: InviteRequest
   let person: Person | undefined = undefined
+
   $: getPersonByPersonRefCb(invite.from, (p) => {
     person = p ?? undefined
   })
@@ -33,11 +32,11 @@
   let stopSound: (() => void) | null = null
 
   async function accept (): Promise<void> {
-    await acceptInvite(invite)
+    await responseToInviteRequest(true)
   }
 
   async function decline (): Promise<void> {
-    await rejectInvite(invite)
+    await responseToInviteRequest(false)
   }
 
   onMount(async () => {
@@ -83,10 +82,4 @@
     color: var(--caption-color);
     font-weight: 700;
   }
-
-  .roomTitle {
-    color: var(--caption-color);
-    font-weight: 700;
-    font-size: 1rem;
-  }
 </style>
diff --git a/plugins/love-resources/src/invites.ts b/plugins/love-resources/src/invites.ts
new file mode 100644
index 00000000000..e659e1b242b
--- /dev/null
+++ b/plugins/love-resources/src/invites.ts
@@ -0,0 +1,225 @@
+import { type Ref } from '@hcengineering/core'
+import { getCurrentEmployee, type Person } from '@hcengineering/contact'
+import { type PopupResult, showPopup } from '@hcengineering/ui'
+import { type UnsubscribeCallback } from '@hcengineering/hulypulse-client'
+import presentation, { createPulseClient } from '@hcengineering/presentation'
+import { getMetadata } from '@hcengineering/platform'
+import { get } from 'svelte/store'
+import { myInfo } from './stores'
+import love, { type Room } from '@hcengineering/love'
+import ActiveInvitesPopup from './components/meeting/invites/ActiveInvitesPopup.svelte'
+import InvitePopup from './components/meeting/invites/InvitePopup.svelte'
+import { joinOrCreateMeetingByInvite } from './meetings'
+
+export const inviteSecondsToLive = 5
+export const responseSecondsToLive = 2
+const pulsePrefix = 'love/invite'
+const myInvitesPopupCategory = 'myInvites'
+
+export interface InviteRequest {
+  from: Ref<Person>
+  meetingId: string
+}
+
+export interface InviteResponse {
+  from: Ref<Person>
+  meetingId: string
+  accept: boolean
+}
+
+let invitesPopup: PopupResult | undefined
+let inviteResponseUnsubscribeCallback: UnsubscribeCallback | undefined
+let invitePersons: Array<Ref<Person>> | undefined
+
+export async function subscribeInviteResponses (): Promise<UnsubscribeCallback> {
+  const client = await createPulseClient()
+  const currentPerson = getCurrentEmployee()
+
+  if (client !== undefined) {
+    inviteResponseUnsubscribeCallback = await client.subscribe(
+      `${getPulsePrefix()}/response/${currentPerson}/`,
+      (key: string, inviteResponse: InviteResponse | undefined) => {
+        void updateInviteResponse(key, inviteResponse)
+      }
+    )
+  }
+
+  return async () => false
+}
+
+export async function unsubscribeInviteResponses (): Promise<void> {
+  if (inviteResponseUnsubscribeCallback !== undefined) {
+    await inviteResponseUnsubscribeCallback()
+  }
+}
+
+export async function showInvitesPopup (persons: Array<Ref<Person>>): Promise<void> {
+  closeInvitesPopup()
+  invitePersons = persons
+  const myParticipation = get(myInfo)
+  const room = myParticipation?.room
+  if (room === undefined || room === love.ids.Reception) return
+  invitesPopup = showPopup(ActiveInvitesPopup, { persons, meetingId: room }, undefined, undefined, undefined, {
+    category: myInvitesPopupCategory,
+    overlay: false,
+    fixed: true
+  })
+}
+
+export function closeInvitesPopup (): void {
+  invitesPopup?.close()
+  invitesPopup = undefined
+}
+
+export async function sendInvites (persons: Array<Ref<Person>>, meetingId: string): Promise<void> {
+  const client = await createPulseClient()
+  const currentPerson = getCurrentEmployee()
+
+  if (client === undefined) return
+
+  try {
+    for (const person of persons) {
+      await client.put(
+        `${getPulsePrefix()}/request/${person}/${currentPerson}/${meetingId}`,
+        { from: currentPerson, meetingId },
+        inviteSecondsToLive
+      )
+    }
+  } catch (error) {
+    console.warn('failed to put invite info:', error)
+  }
+}
+
+export async function cancelInvites (meetingId: string): Promise<void> {
+  const client = await createPulseClient()
+  const currentPerson = getCurrentEmployee()
+
+  if (client === undefined || invitePersons === undefined) return
+  try {
+    for (const person of invitePersons) {
+      await client.delete(`${getPulsePrefix()}/request/${person}/${currentPerson}/${meetingId}`)
+    }
+  } catch (error) {
+    console.warn('failed to delete invite info:', error)
+  }
+}
+
+async function updateInviteResponse (_key: string, inviteResponse: InviteResponse | undefined): Promise<void> {
+  const client = await createPulseClient()
+  if (client === undefined || inviteResponse === undefined || invitePersons === undefined) return
+
+  const currentPerson = getCurrentEmployee()
+  await client.delete(`${getPulsePrefix()}/request/${inviteResponse.from}/${currentPerson}/${inviteResponse.meetingId}`)
+  await client.delete(
+    `${getPulsePrefix()}/response/${currentPerson}/${inviteResponse.from}/${inviteResponse.meetingId}`
+  )
+  invitePersons = invitePersons.filter((p) => p !== inviteResponse.from)
+  if (invitePersons.length === 0) {
+    closeInvitesPopup()
+  } else {
+    invitesPopup?.update({ persons: invitePersons })
+  }
+
+  if (!inviteResponse.accept) return
+  await joinOrCreateMeetingByInvite(inviteResponse.meetingId as Ref<Room>)
+}
+
+let inviteRequestPopup: PopupResult | undefined
+let inviteRequestsUnsubscribeCallback: UnsubscribeCallback | undefined
+let activeInviteKey: string | undefined
+let inviteRequestsMap: Map<string, InviteRequest | undefined>
+
+export async function subscribeInviteRequests (): Promise<UnsubscribeCallback> {
+  const client = await createPulseClient()
+  const currentPerson = getCurrentEmployee()
+
+  if (client !== undefined) {
+    inviteRequestsMap = new Map<string, InviteRequest>()
+    inviteRequestsUnsubscribeCallback = await client.subscribe(
+      `${getPulsePrefix()}/request/${currentPerson}/`,
+      updateInviteRequest
+    )
+  }
+
+  return async () => false
+}
+
+export async function unsubscribeInviteRequests (): Promise<void> {
+  if (inviteRequestsUnsubscribeCallback !== undefined) {
+    await inviteRequestsUnsubscribeCallback()
+  }
+}
+
+export async function responseToInviteRequest (accept: boolean): Promise<void> {
+  if (activeInviteKey === undefined) return
+
+  const client = await createPulseClient()
+  if (client === undefined) return
+
+  const activeInvite = inviteRequestsMap.get(activeInviteKey)
+  if (activeInvite === undefined) return
+
+  const currentPerson = getCurrentEmployee()
+  await client.put(
+    `${getPulsePrefix()}/response/${activeInvite.from}/${currentPerson}/${activeInvite.meetingId}`,
+    { accept, from: currentPerson, meetingId: activeInvite.meetingId },
+    responseSecondsToLive
+  )
+
+  inviteRequestPopup?.close()
+  inviteRequestPopup = undefined
+  if (activeInviteKey === undefined) return
+  inviteRequestsMap.set(activeInviteKey, undefined)
+  activeInviteKey = undefined
+
+  if (!accept) return
+  await joinOrCreateMeetingByInvite(activeInvite.meetingId as Ref<Room>)
+}
+
+function updateInviteRequest (key: string, invite: InviteRequest | undefined): void {
+  if (invite === undefined) {
+    inviteRequestsMap.delete(key)
+    if (activeInviteKey === key) {
+      activeInviteKey = undefined
+    }
+  } else if (!inviteRequestsMap.has(key)) {
+    inviteRequestsMap.set(key, invite)
+  }
+  let keyChanged: boolean = false
+  if (activeInviteKey === undefined && inviteRequestsMap.size > 0) {
+    const unprocessedInvite = inviteRequestsMap?.entries().find((v) => v[1] !== undefined)
+    if (unprocessedInvite !== undefined) {
+      activeInviteKey = unprocessedInvite[0]
+      keyChanged = true
+    }
+  }
+  if (activeInviteKey === undefined) {
+    inviteRequestPopup?.close()
+    inviteRequestPopup = undefined
+    return
+  }
+
+  if (inviteRequestPopup === undefined) {
+    inviteRequestPopup = showPopup(
+      InvitePopup,
+      { invite: inviteRequestsMap.get(activeInviteKey) },
+      undefined,
+      undefined,
+      undefined,
+      {
+        category: myInvitesPopupCategory,
+        overlay: false,
+        fixed: true
+      }
+    )
+    return
+  }
+  if (keyChanged) {
+    inviteRequestPopup?.update({ invite: inviteRequestsMap.get(activeInviteKey) })
+  }
+}
+
+function getPulsePrefix (): string {
+  const workspace = getMetadata(presentation.metadata.WorkspaceUuid) ?? ''
+  return `${workspace}/${pulsePrefix}`
+}
diff --git a/plugins/love-resources/src/meetings.ts b/plugins/love-resources/src/meetings.ts
index 2130f584307..e69c67dabc0 100644
--- a/plugins/love-resources/src/meetings.ts
+++ b/plugins/love-resources/src/meetings.ts
@@ -29,7 +29,7 @@ export let currentMeetingRoom: Ref<Room> | undefined
 const requestsQuery = createQuery(true)
 const invitesQuery = createQuery(true)
 
-export async function createMeeting(room: Room): Promise<void> {
+export async function createMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const me = getCurrentEmployee()
@@ -55,7 +55,7 @@ export async function createMeeting(room: Room): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function leaveMeeting(): Promise<void> {
+export async function leaveMeeting (): Promise<void> {
   const client = getClient()
   const currentParticipationInfo = get(myInfo)
   const office = get(myOffice)
@@ -82,7 +82,7 @@ export async function leaveMeeting(): Promise<void> {
   currentMeetingRoom = undefined
 }
 
-export async function joinMeeting(room: Room): Promise<void> {
+export async function joinMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const isGuest = getCurrentAccount().role === AccountRole.Guest
@@ -94,10 +94,11 @@ export async function joinMeeting(room: Room): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function acceptInvite(invite: Invite): Promise<void> {
+export async function joinOrCreateMeetingByInvite (roomId: Ref<Room>): Promise<void> {
+  if (currentMeetingRoom === roomId) return
+
   const client = getClient()
-  await client.update(invite, { status: RequestStatus.Approved })
-  const room = getRoomById(invite.room)
+  const room = getRoomById(roomId)
 
   if (room === undefined) return
 
@@ -112,51 +113,7 @@ export async function acceptInvite(invite: Invite): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function rejectInvite(invite: Invite): Promise<void> {
-  const client = getClient()
-  await client.update(invite, { status: RequestStatus.Rejected })
-}
-
-export async function cancelInvites(invites: Invite[]): Promise<void> {
-  const client = getClient()
-  for (const invite of invites) {
-    if (invite.status === RequestStatus.Pending) {
-      await client.remove(invite)
-    }
-  }
-}
-
-export async function sendInvites(persons: Array<Ref<Person>>): Promise<void> {
-  const myParticipation = get(myInfo)
-  const room = myParticipation?.room
-  if (room === undefined || room === love.ids.Reception) return
-  const client = getClient()
-  const me = getCurrentEmployee()
-  const inviteIds: Array<Ref<Invite>> = []
-  for (const person of persons) {
-    inviteIds.push(
-      await client.createDoc(love.class.Invite, core.space.Workspace, {
-        target: person,
-        room,
-        status: RequestStatus.Pending,
-        from: me
-      })
-    )
-  }
-  invitesQuery.query(love.class.Invite, { from: me, _id: { $in: inviteIds } }, (res) => {
-    for (const invite of res) {
-      if (invite === undefined || invite.status !== RequestStatus.Approved) {
-        continue
-      }
-      invitesQuery.unsubscribe()
-      const room = getRoomById(invite.room)
-      if (room === undefined) return
-      void connectToMeeting(room)
-    }
-  })
-}
-
-export async function acceptJoinRequest(request: JoinRequest): Promise<void> {
+export async function acceptJoinRequest (request: JoinRequest): Promise<void> {
   const client = getClient()
   const room = getRoomById(request.room)
 
@@ -174,19 +131,19 @@ export async function acceptJoinRequest(request: JoinRequest): Promise<void> {
   await connectToMeeting(room)
 }
 
-export async function rejectJoinRequest(request: JoinRequest): Promise<void> {
+export async function rejectJoinRequest (request: JoinRequest): Promise<void> {
   const client = getClient()
   await client.update(request, { status: RequestStatus.Rejected })
 }
 
-export async function cancelJoinRequest(request: JoinRequest): Promise<void> {
+export async function cancelJoinRequest (request: JoinRequest): Promise<void> {
   if (request.status === RequestStatus.Pending) {
     const client = getClient()
     await client.remove(request)
   }
 }
 
-async function sendJoinRequest(room: Room): Promise<void> {
+async function sendJoinRequest (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
 
   const me = getCurrentEmployee()
@@ -217,7 +174,7 @@ async function sendJoinRequest(room: Room): Promise<void> {
   })
 }
 
-export async function kick(person: Ref<Person>): Promise<void> {
+export async function kick (person: Ref<Person>): Promise<void> {
   const client = getClient()
   const allRooms = get(rooms)
   const participantsInfo = get(infos)
@@ -227,7 +184,7 @@ export async function kick(person: Ref<Person>): Promise<void> {
   await client.update(participantInfo, { room: participantOffice?._id ?? love.ids.Reception, x: 0, y: 0 })
 }
 
-async function connectToMeeting(room: Room): Promise<void> {
+async function connectToMeeting (room: Room): Promise<void> {
   if (getCurrentAccount().role === AccountRole.ReadOnlyGuest) return
   if (currentMeetingRoom === room._id) return
 
@@ -250,7 +207,7 @@ async function connectToMeeting(room: Room): Promise<void> {
   }
 }
 
-async function moveToMeetingRoom(room: Room): Promise<void> {
+async function moveToMeetingRoom (room: Room): Promise<void> {
   const me = getCurrentEmployee()
   const currentPerson = await getPersonByPersonRef(me)
   const client = getClient()
@@ -282,7 +239,7 @@ async function moveToMeetingRoom(room: Room): Promise<void> {
   }
 }
 
-async function createMeetingDocument(room: Room): Promise<void> {
+async function createMeetingDocument (room: Room): Promise<void> {
   const client = getClient()
   await client.createDoc(love.class.MeetingMinutes, core.space.Workspace, {
     description: null,
@@ -294,7 +251,7 @@ async function createMeetingDocument(room: Room): Promise<void> {
   })
 }
 
-async function getNewMeetingTitle(room: Room): Promise<string> {
+async function getNewMeetingTitle (room: Room): Promise<string> {
   const date = new Date()
     .toLocaleDateString('en-GB', {
       day: 'numeric',
@@ -305,7 +262,7 @@ async function getNewMeetingTitle(room: Room): Promise<string> {
   return `${await getRoomName(room)} ${date}`
 }
 
-function getRoomById(roomId: Ref<Room>): Room | undefined {
+function getRoomById (roomId: Ref<Room>): Room | undefined {
   const allRooms = get(rooms)
   return allRooms.find((p) => p._id === roomId)
 }

From e75c3cae53e71b186371cb48cfba84ee72cf1d3e Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 25 Sep 2025 09:25:18 +0700
Subject: [PATCH 18/25] Remove old transient invite

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 models/love/src/index.ts                      | 31 ----------
 models/server-love/src/index.ts               |  8 ---
 .../src/components/meeting/ControlExt.svelte  | 24 +-------
 .../meeting/invites/InvitePopup.svelte        |  4 +-
 plugins/love-resources/src/meetings.ts        |  4 +-
 plugins/love-resources/src/stores.ts          | 26 +--------
 plugins/love/src/plugin.ts                    |  2 -
 plugins/love/src/types.ts                     |  7 ---
 server-plugins/love-resources/src/index.ts    | 58 +------------------
 server-plugins/love/src/index.ts              |  1 -
 10 files changed, 9 insertions(+), 156 deletions(-)

diff --git a/models/love/src/index.ts b/models/love/src/index.ts
index 775e5d556b4..d8431db1d6f 100644
--- a/models/love/src/index.ts
+++ b/models/love/src/index.ts
@@ -31,7 +31,6 @@ import {
 import {
   type DevicesPreference,
   type Floor,
-  type Invite,
   type JoinRequest,
   loveId,
   type Meeting,
@@ -174,20 +173,6 @@ export class TJoinRequest extends TDoc implements JoinRequest {
   status!: RequestStatus
 }
 
-@Model(love.class.Invite, core.class.Doc, DOMAIN_TRANSIENT)
-export class TInvite extends TDoc implements Invite {
-  @Prop(TypeRef(contact.class.Person), getEmbeddedLabel('From'))
-    from!: Ref<Person>
-
-  @Prop(TypeRef(contact.class.Person), getEmbeddedLabel('Target'))
-    target!: Ref<Person>
-
-  @Prop(TypeRef(love.class.Room), love.string.Room)
-    room!: Ref<Room>
-
-  status!: RequestStatus
-}
-
 @Model(love.class.DevicesPreference, preference.class.Preference)
 export class TDevicesPreference extends TPreference implements DevicesPreference {
   blurRadius!: number
@@ -275,7 +260,6 @@ export function createModel (builder: Builder): void {
     TJoinRequest,
     TDevicesPreference,
     TRoomInfo,
-    TInvite,
     TMeeting,
     TMeetingMinutes,
     TMeetingSchedule
@@ -388,21 +372,6 @@ export function createModel (builder: Builder): void {
     love.ids.LoveNotificationGroup
   )
 
-  builder.createDoc(
-    notification.class.NotificationType,
-    core.space.Model,
-    {
-      hidden: false,
-      generated: false,
-      label: love.string.InivitingLabel,
-      group: love.ids.LoveNotificationGroup,
-      txClasses: [core.class.TxCreateDoc],
-      objectClass: love.class.Invite,
-      defaultEnabled: true
-    },
-    love.ids.InviteNotification
-  )
-
   builder.createDoc(
     notification.class.NotificationType,
     core.space.Model,
diff --git a/models/server-love/src/index.ts b/models/server-love/src/index.ts
index c2984c8088b..c21335465bd 100644
--- a/models/server-love/src/index.ts
+++ b/models/server-love/src/index.ts
@@ -72,14 +72,6 @@ export function createModel (builder: Builder): void {
     }
   })
 
-  builder.createDoc(serverCore.class.Trigger, core.space.Model, {
-    trigger: serverLove.trigger.OnInvite,
-    txMatch: {
-      objectClass: love.class.Invite,
-      _class: core.class.TxCreateDoc
-    }
-  })
-
   builder.mixin(love.class.MeetingMinutes, core.class.Class, serverCore.mixin.SearchPresenter, {
     searchIcon: love.icon.MeetingMinutes,
     title: [['title']]
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index ebc36a89b2f..789aa9e4fc1 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { IdMap, Ref, toIdMap } from '@hcengineering/core'
-  import { Invite, isOffice, JoinRequest, ParticipantInfo, RequestStatus, Room } from '@hcengineering/love'
+  import { isOffice, JoinRequest, ParticipantInfo, RequestStatus, Room } from '@hcengineering/love'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import {
     closePopup,
@@ -30,9 +30,8 @@
   import { closeWidget, sidebarStore } from '@hcengineering/workbench-resources'
 
   import love from '../../plugin'
-  import { activeInvites, currentRoom, infos, myInfo, myInvites, myRequests, rooms } from '../../stores'
+  import { currentRoom, infos, myInfo, myRequests, rooms } from '../../stores'
   import { createMeetingWidget, getRoomName } from '../../utils'
-  import ActiveInvitesPopup from './invites/ActiveInvitesPopup.svelte'
   import PersonActionPopup from '../PersonActionPopup.svelte'
   import RequestPopup from './invites/RequestPopup.svelte'
   import RequestingPopup from './invites/RequestingPopup.svelte'
@@ -128,29 +127,10 @@
 
   const myInvitesCategory = 'myInvites'
 
-  let myInvitesPopup: PopupResult | undefined = undefined
-
-  function checkActiveInvites (invites: Invite[]): void {
-    if (invites.length > 0) {
-      if (myInvitesPopup === undefined) {
-        myInvitesPopup = showPopup(ActiveInvitesPopup, {}, undefined, undefined, undefined, {
-          category: myInvitesCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    } else if (myInvitesPopup !== undefined) {
-      myInvitesPopup.close()
-      myInvitesPopup = undefined
-    }
-  }
-
   $: reception = $rooms.find((f) => f._id === love.ids.Reception)
 
   $: receptionParticipants = $infos.filter((p) => p.room === love.ids.Reception)
 
-  $: checkActiveInvites($activeInvites)
-
   function checkActiveMeeting (loc: Location, meetingSessionConnected: boolean, room: Ref<Room> | undefined): void {
     const meetingWidgetState = $sidebarStore.widgetsState.get(love.ids.MeetingWidget)
     const isMeetingWidgetCreated = meetingWidgetState !== undefined
diff --git a/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
index eff8535602b..f8777c6f940 100644
--- a/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { formatName, Person } from '@hcengineering/contact'
   import { Avatar, getPersonByPersonRefCb } from '@hcengineering/contact-resources'
-  import { playNotificationSound } from '@hcengineering/presentation'
+  import { playSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
   import { onDestroy, onMount } from 'svelte'
 
@@ -40,7 +40,7 @@
   }
 
   onMount(async () => {
-    stopSound = await playNotificationSound(love.sound.Knock, love.class.Invite, true)
+    stopSound = await playSound(love.sound.Knock, true)
   })
 
   onDestroy(() => {
diff --git a/plugins/love-resources/src/meetings.ts b/plugins/love-resources/src/meetings.ts
index e69c67dabc0..a9c00532b0e 100644
--- a/plugins/love-resources/src/meetings.ts
+++ b/plugins/love-resources/src/meetings.ts
@@ -7,8 +7,7 @@ import love, {
   isOffice,
   RoomAccess,
   RequestStatus,
-  type JoinRequest,
-  type Invite
+  type JoinRequest
 } from '@hcengineering/love'
 import presentation, { createQuery, getClient } from '@hcengineering/presentation'
 import {
@@ -27,7 +26,6 @@ import { getMetadata } from '@hcengineering/platform'
 
 export let currentMeetingRoom: Ref<Room> | undefined
 const requestsQuery = createQuery(true)
-const invitesQuery = createQuery(true)
 
 export async function createMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
diff --git a/plugins/love-resources/src/stores.ts b/plugins/love-resources/src/stores.ts
index c7cb282bf4e..fa13e48878b 100644
--- a/plugins/love-resources/src/stores.ts
+++ b/plugins/love-resources/src/stores.ts
@@ -6,7 +6,6 @@ import {
   RequestStatus,
   type DevicesPreference,
   type Floor,
-  type Invite,
   type JoinRequest,
   type MeetingMinutes,
   type Office,
@@ -44,15 +43,6 @@ export const activeFloor = derived([rooms, myInfo, myOffice], ([rooms, myInfo, m
   return res ?? love.ids.MainFloor
 })
 export const myRequests = writable<JoinRequest[]>([])
-export const invites = writable<Invite[]>([])
-export const myInvites = derived([invites, myInfo], ([val, info]) => {
-  const personId = getCurrentEmployee()
-  return val.filter((p) => p.target === personId && info?.room !== p.room)
-})
-export const activeInvites = derived(invites, (val) => {
-  const personId = getCurrentEmployee()
-  return val.filter((p) => p.from === personId)
-})
 
 export const myPreferences = writable<DevicesPreference | undefined>()
 export let $myPreferences: DevicesPreference | undefined
@@ -81,7 +71,6 @@ const statusQuery = createQuery(true)
 const floorsQuery = createQuery(true)
 const requestsQuery = createQuery(true)
 const preferencesQuery = createQuery(true)
-const invitesQuery = createQuery(true)
 
 onClient(() => {
   const roomPromise = new Promise<void>((resolve) =>
@@ -120,18 +109,9 @@ onClient(() => {
     })
   )
 
-  const invitesPromise = new Promise<void>((resolve) =>
-    invitesQuery.query(love.class.Invite, { status: RequestStatus.Pending }, (res) => {
-      invites.set(res)
-      resolve()
-    })
-  )
-
-  void Promise.all([roomPromise, infoPromise, floorPromise, requestPromise, preferencePromise, invitesPromise]).then(
-    () => {
-      officeLoaded.set(true)
-    }
-  )
+  void Promise.all([roomPromise, infoPromise, floorPromise, requestPromise, preferencePromise]).then(() => {
+    officeLoaded.set(true)
+  })
 })
 
 export async function waitForOfficeLoaded (): Promise<void> {
diff --git a/plugins/love/src/plugin.ts b/plugins/love/src/plugin.ts
index 0cefe4ef747..bd65d95c53f 100644
--- a/plugins/love/src/plugin.ts
+++ b/plugins/love/src/plugin.ts
@@ -8,7 +8,6 @@ import { Widget } from '@hcengineering/workbench'
 import {
   DevicesPreference,
   Floor,
-  Invite,
   JoinRequest,
   Meeting,
   MeetingMinutes,
@@ -31,7 +30,6 @@ const love = plugin(loveId, {
     JoinRequest: '' as Ref<Class<JoinRequest>>,
     DevicesPreference: '' as Ref<Class<DevicesPreference>>,
     RoomInfo: '' as Ref<Class<RoomInfo>>,
-    Invite: '' as Ref<Class<Invite>>,
     MeetingMinutes: '' as Ref<Class<MeetingMinutes>>
   },
   mixin: {
diff --git a/plugins/love/src/types.ts b/plugins/love/src/types.ts
index 33dca6a4a82..8640feff6f4 100644
--- a/plugins/love/src/types.ts
+++ b/plugins/love/src/types.ts
@@ -139,13 +139,6 @@ export interface JoinRequest extends Doc {
   status: RequestStatus
 }
 
-export interface Invite extends Doc {
-  from: Ref<Person>
-  target: Ref<Person>
-  room: Ref<Room>
-  status: RequestStatus
-}
-
 export interface DevicesPreference extends Preference {
   micEnabled: boolean
   noiseCancellation: boolean
diff --git a/server-plugins/love-resources/src/index.ts b/server-plugins/love-resources/src/index.ts
index b6eee7c86c9..4252b5a971a 100644
--- a/server-plugins/love-resources/src/index.ts
+++ b/server-plugins/love-resources/src/index.ts
@@ -31,7 +31,6 @@ import core, {
   UserStatus
 } from '@hcengineering/core'
 import love, {
-  Invite,
   isOffice,
   JoinRequest,
   loveId,
@@ -452,60 +451,6 @@ export async function OnKnock (txes: Tx[], control: TriggerControl): Promise<Tx[
   return []
 }
 
-export async function OnInvite (txes: Tx[], control: TriggerControl): Promise<Tx[]> {
-  for (const tx of txes) {
-    const actualTx = tx as TxCreateDoc<Invite>
-    if (actualTx._class === core.class.TxCreateDoc) {
-      const invite = TxProcessor.createDoc2Doc(actualTx)
-      if (invite.status === RequestStatus.Pending) {
-        const target = (
-          await control.findAll(
-            control.ctx,
-            contact.mixin.Employee,
-            { _id: invite.target as Ref<Employee> },
-            { limit: 1 }
-          )
-        )[0]
-        if (target === undefined) {
-          continue
-        }
-        const from = (await control.findAll(control.ctx, contact.class.Person, { _id: invite.from }))[0]
-        const type = await control.modelDb.findOne(notification.class.NotificationType, {
-          _id: love.ids.InviteNotification
-        })
-        if (type === undefined) {
-          continue
-        }
-        const provider = await control.modelDb.findOne(notification.class.NotificationProvider, {
-          _id: notification.providers.PushNotificationProvider
-        })
-        if (provider === undefined) {
-          continue
-        }
-        const notificationControl = await getNotificationProviderControl(control.ctx, control)
-        const socialStrings = await getSocialStrings(control, target._id)
-        if (isAllowed(control, socialStrings, type, provider, notificationControl)) {
-          const path = [workbenchId, control.workspace.url, loveId]
-          const title = await translate(love.string.InivitingLabel, {})
-          const body =
-            from !== undefined
-              ? await translate(love.string.InvitingYou, {
-                name: formatName(from.name, control.branding?.lastNameFirst)
-              })
-              : await translate(love.string.InivitingLabel, {})
-          const account = target?.personUuid
-          if (account === undefined) continue
-          const subscriptions = await control.findAll(control.ctx, notification.class.PushSubscription, {
-            user: account
-          })
-          await createPushNotification(control, account, title, body, invite._id, subscriptions, from, path)
-        }
-      }
-    }
-  }
-  return []
-}
-
 export async function meetingMinutesHTMLPresenter (doc: Doc, control: TriggerControl): Promise<string> {
   const meetingMinutes = doc as MeetingMinutes
   const front = control.branding?.front ?? getMetadata(serverCore.metadata.FrontUrl) ?? ''
@@ -588,7 +533,6 @@ export default async () => ({
     OnUserStatus,
     OnParticipantInfo,
     OnRoomInfo,
-    OnKnock,
-    OnInvite
+    OnKnock
   }
 })
diff --git a/server-plugins/love/src/index.ts b/server-plugins/love/src/index.ts
index 5512cdcf4ef..05ffa40c941 100644
--- a/server-plugins/love/src/index.ts
+++ b/server-plugins/love/src/index.ts
@@ -21,7 +21,6 @@ export default plugin(serverLoveId, {
     OnUserStatus: '' as Resource<TriggerFunc>,
     OnParticipantInfo: '' as Resource<TriggerFunc>,
     OnRoomInfo: '' as Resource<TriggerFunc>,
-    OnInvite: '' as Resource<TriggerFunc>,
     OnKnock: '' as Resource<TriggerFunc>
   }
 })

From 3d78298e53240ef722d216f2049acfdcc26b41b5 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 25 Sep 2025 17:06:39 +0700
Subject: [PATCH 19/25] Use pulse for join requests

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../src/components/PersonActionPopup.svelte   |   4 +-
 .../src/components/WorkbenchExtension.svelte  |  14 ++
 .../src/components/meeting/ControlExt.svelte  |  70 +-----
 .../invites/InviteEmployeeButton.svelte       |   6 +-
 ...Popup.svelte => InviteRequestPopup.svelte} |  14 +-
 ...opup.svelte => InviteResponsePopup.svelte} |   0
 ...ngPopup.svelte => JoinRequestPopup.svelte} |  32 ++-
 ...tPopup.svelte => JoinResponsePopup.svelte} |  11 +-
 plugins/love-resources/src/invites.ts         | 179 +++++++-------
 plugins/love-resources/src/joinRequests.ts    | 228 ++++++++++++++++++
 plugins/love-resources/src/meetings.ts        |  81 +------
 11 files changed, 390 insertions(+), 249 deletions(-)
 rename plugins/love-resources/src/components/meeting/invites/{ActiveInvitesPopup.svelte => InviteRequestPopup.svelte} (86%)
 rename plugins/love-resources/src/components/meeting/invites/{InvitePopup.svelte => InviteResponsePopup.svelte} (100%)
 rename plugins/love-resources/src/components/meeting/invites/{RequestingPopup.svelte => JoinRequestPopup.svelte} (66%)
 rename plugins/love-resources/src/components/meeting/invites/{RequestPopup.svelte => JoinResponsePopup.svelte} (87%)
 create mode 100644 plugins/love-resources/src/joinRequests.ts

diff --git a/plugins/love-resources/src/components/PersonActionPopup.svelte b/plugins/love-resources/src/components/PersonActionPopup.svelte
index 7e66faa8cec..192125b637e 100644
--- a/plugins/love-resources/src/components/PersonActionPopup.svelte
+++ b/plugins/love-resources/src/components/PersonActionPopup.svelte
@@ -6,7 +6,7 @@
   import love from '../plugin'
   import { myInfo } from '../stores'
   import { joinMeeting, kick } from '../meetings'
-  import { showInvitesPopup } from '../invites'
+  import { sendInvites } from '../invites'
 
   export let room: Room
   export let person: Ref<Person>
@@ -31,7 +31,7 @@
       label={love.string.Invite}
       icon={love.icon.Invite}
       action={() => {
-        showInvitesPopup([person])
+        sendInvites([person])
       }}
     />
     {#if room.access === RoomAccess.Knock}
diff --git a/plugins/love-resources/src/components/WorkbenchExtension.svelte b/plugins/love-resources/src/components/WorkbenchExtension.svelte
index 1b2752bcf6b..c95321ec25b 100644
--- a/plugins/love-resources/src/components/WorkbenchExtension.svelte
+++ b/plugins/love-resources/src/components/WorkbenchExtension.svelte
@@ -6,6 +6,10 @@
   import { liveKitClient, lk } from '../utils'
   import { lkSessionConnected } from '../liveKitClient'
   import { subscribeInviteRequests, unsubscribeInviteRequests } from '../invites'
+  import { Room } from '@hcengineering/love'
+  import { subscribeJoinRequests, unsubscribeJoinRequests } from '../joinRequests'
+  import { Ref } from '@hcengineering/core'
+  import { myInfo } from '../stores'
 
   let parentElement: HTMLDivElement
 
@@ -34,6 +38,16 @@
     }
   }
 
+  function subscribeRoomRequests (room: Ref<Room> | undefined): void {
+    unsubscribeJoinRequests()
+      .then(() => subscribeJoinRequests(room))
+      .catch((e) => {
+        console.log(e)
+      })
+  }
+
+  $: subscribeRoomRequests($myInfo?.room)
+
   onMount(async () => {
     pushRootBarComponent('left', love.component.ControlExt, 20)
     lk.on(RoomEvent.TrackSubscribed, handleTrackSubscribed)
diff --git a/plugins/love-resources/src/components/meeting/ControlExt.svelte b/plugins/love-resources/src/components/meeting/ControlExt.svelte
index 789aa9e4fc1..7a990fc4d3a 100644
--- a/plugins/love-resources/src/components/meeting/ControlExt.svelte
+++ b/plugins/love-resources/src/components/meeting/ControlExt.svelte
@@ -14,27 +14,17 @@
 -->
 <script lang="ts">
   import { IdMap, Ref, toIdMap } from '@hcengineering/core'
-  import { isOffice, JoinRequest, ParticipantInfo, RequestStatus, Room } from '@hcengineering/love'
-  import { createQuery, getClient } from '@hcengineering/presentation'
-  import {
-    closePopup,
-    eventToHTMLElement,
-    Location,
-    location,
-    PopupResult,
-    showPopup,
-    closeTooltip
-  } from '@hcengineering/ui'
+  import { isOffice, ParticipantInfo, Room } from '@hcengineering/love'
+  import { getClient } from '@hcengineering/presentation'
+  import { closePopup, eventToHTMLElement, Location, location, showPopup, closeTooltip } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
   import workbench from '@hcengineering/workbench'
   import { closeWidget, sidebarStore } from '@hcengineering/workbench-resources'
 
   import love from '../../plugin'
-  import { currentRoom, infos, myInfo, myRequests, rooms } from '../../stores'
+  import { currentRoom, infos, myInfo, rooms } from '../../stores'
   import { createMeetingWidget, getRoomName } from '../../utils'
   import PersonActionPopup from '../PersonActionPopup.svelte'
-  import RequestPopup from './invites/RequestPopup.svelte'
-  import RequestingPopup from './invites/RequestingPopup.svelte'
   import RoomPopup from '../RoomPopup.svelte'
   import RoomButton from '../RoomButton.svelte'
   import { leaveMeeting, currentMeetingRoom } from '../../meetings'
@@ -68,56 +58,6 @@
 
   $: activeRooms = getActiveRooms($rooms, $infos)
 
-  const query = createQuery()
-  let requests: JoinRequest[] = []
-  query.query(love.class.JoinRequest, { status: RequestStatus.Pending }, (res) => {
-    requests = res
-  })
-
-  let activeRequest: JoinRequest | undefined = undefined
-  const joinRequestCategory = 'joinRequest'
-  function checkRequests (requests: JoinRequest[], $myInfo: ParticipantInfo | undefined): void {
-    if (activeRequest !== undefined) {
-      // try to find active request, if it not exists close popup
-      if (requests.find((r) => r._id === activeRequest?._id && r.room === $myInfo?.room) === undefined) {
-        closePopup(joinRequestCategory)
-        activeRequest = undefined
-      }
-    }
-    if (activeRequest === undefined) {
-      activeRequest = requests.find((r) => r.room === $myInfo?.room)
-      if (activeRequest !== undefined) {
-        showPopup(RequestPopup, { request: activeRequest }, undefined, undefined, undefined, {
-          category: joinRequestCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    }
-  }
-
-  const myJoinRequestCategory = 'MyJoinRequest'
-  let myRequestsPopup: PopupResult | undefined = undefined
-
-  function checkMyRequests (requests: JoinRequest[]): void {
-    if (requests.length > 0) {
-      if (myRequestsPopup === undefined) {
-        myRequestsPopup = showPopup(RequestingPopup, { request: requests[0] }, undefined, undefined, undefined, {
-          category: myJoinRequestCategory,
-          overlay: false,
-          fixed: true
-        })
-      }
-    } else if (myRequestsPopup !== undefined) {
-      myRequestsPopup.close()
-      myRequestsPopup = undefined
-    }
-  }
-
-  $: checkMyRequests($myRequests)
-
-  $: checkRequests(requests, $myInfo)
-
   function openRoom (room: Room): (e: MouseEvent) => void {
     return (e: MouseEvent) => {
       closeTooltip()
@@ -166,8 +106,6 @@
 
   onDestroy(() => {
     closePopup(myInvitesCategory)
-    closePopup(joinRequestCategory)
-    closePopup(myJoinRequestCategory)
     closeWidget(love.ids.MeetingWidget)
   })
 
diff --git a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
index c184e2d3f1e..abd9a4feaa7 100644
--- a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
@@ -19,7 +19,7 @@
   import { SelectUsersPopup } from '@hcengineering/contact-resources'
   import { Ref } from '@hcengineering/core'
   import { createEventDispatcher } from 'svelte'
-  import { showInvitesPopup } from '../../../invites'
+  import { sendInvites } from '../../../invites'
 
   export let employee: Employee | undefined = undefined
   export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'
@@ -32,7 +32,7 @@
 
   async function invite (): Promise<void> {
     if (employee !== undefined) {
-      showInvitesPopup([employee._id])
+      sendInvites([employee._id])
     } else {
       openSelectUsersPopup()
     }
@@ -50,7 +50,7 @@
       'top',
       (result?: Ref<Employee>[]) => {
         if (result != null) {
-          showInvitesPopup(result)
+          sendInvites(result)
         }
         dispatch('close')
       }
diff --git a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte b/plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte
similarity index 86%
rename from plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte
index 0c24d712a8b..0bee280a712 100644
--- a/plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte
@@ -22,10 +22,10 @@
   import {
     cancelInvites,
     closeInvitesPopup,
-    inviteSecondsToLive,
-    sendInvites,
+    inviteRequestSecondsToLive,
     subscribeInviteResponses,
-    unsubscribeInviteResponses
+    unsubscribeInviteResponses,
+    updateInvites
   } from '../../../invites'
 
   export let persons: Array<Ref<Person>>
@@ -33,8 +33,8 @@
 
   onMount(() => {
     void subscribeInviteResponses()
-    void doSendInvites()
-    const interval = setInterval(doSendInvites, (inviteSecondsToLive - 2) * 1000)
+    void doUpdateInvites()
+    const interval = setInterval(doUpdateInvites, (inviteRequestSecondsToLive - 2) * 1000)
     return () => {
       void unsubscribeInviteResponses()
       clearInterval(interval)
@@ -42,8 +42,8 @@
     }
   })
 
-  async function doSendInvites (): Promise<void> {
-    await sendInvites(persons, meetingId)
+  async function doUpdateInvites (): Promise<void> {
+    await updateInvites(persons, meetingId)
   }
 
   async function cancel (): Promise<void> {
diff --git a/plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte b/plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte
similarity index 100%
rename from plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte
diff --git a/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte b/plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
similarity index 66%
rename from plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
index 61b7132978f..a868dadb053 100644
--- a/plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
@@ -14,18 +14,40 @@
 -->
 <script lang="ts">
   import { Button, Label } from '@hcengineering/ui'
-  import { JoinRequest } from '@hcengineering/love'
   import love from '../../../plugin'
   import { rooms } from '../../../stores'
   import { getRoomLabel } from '../../../utils'
-  import { cancelJoinRequest } from '../../../meetings'
+  import {
+    cancelJoinRequest,
+    closeJoinRequestPopup,
+    joinRequestSecondsToLive,
+    subscribeJoinResponses,
+    unsubscribeJoinResponses,
+    updateJoinRequest
+  } from '../../../joinRequests'
+  import { onMount } from 'svelte'
 
-  export let request: JoinRequest
+  export let meetingId: string
 
-  $: room = $rooms.find((p) => p._id === request.room)
+  $: room = $rooms.find((p) => p._id === meetingId)
+
+  onMount(() => {
+    void subscribeJoinResponses()
+    void doUpdateRequest()
+    const interval = setInterval(doUpdateRequest, (joinRequestSecondsToLive - 2) * 1000)
+    return () => {
+      void unsubscribeJoinResponses()
+      clearInterval(interval)
+      void cancelJoinRequest()
+    }
+  })
+
+  async function doUpdateRequest (): Promise<void> {
+    await updateJoinRequest()
+  }
 
   async function cancel (): Promise<void> {
-    await cancelJoinRequest(request)
+    closeJoinRequestPopup()
   }
 </script>
 
diff --git a/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte b/plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
similarity index 87%
rename from plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
rename to plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
index 9cacc9c0964..f3087239377 100644
--- a/plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
@@ -17,24 +17,23 @@
   import { Avatar, getPersonByPersonRefStore } from '@hcengineering/contact-resources'
   import { playNotificationSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
-  import { JoinRequest } from '@hcengineering/love'
   import love from '../../../plugin'
   import { onDestroy, onMount } from 'svelte'
-  import { acceptJoinRequest, rejectJoinRequest } from '../../../meetings'
+  import { responseToJoinRequest, JoinRequest } from '../../../joinRequests'
 
   export let request: JoinRequest
 
-  $: personByRefStore = getPersonByPersonRefStore([request.person])
-  $: person = $personByRefStore.get(request.person)
+  $: personByRefStore = getPersonByPersonRefStore([request.from])
+  $: person = $personByRefStore.get(request.from)
 
   let stopSound: (() => void) | null = null
 
   async function accept (): Promise<void> {
-    await acceptJoinRequest(request)
+    await responseToJoinRequest(request, true)
   }
 
   async function decline (): Promise<void> {
-    await rejectJoinRequest(request)
+    await responseToJoinRequest(request, false)
   }
 
   onMount(async () => {
diff --git a/plugins/love-resources/src/invites.ts b/plugins/love-resources/src/invites.ts
index e659e1b242b..50e617e6455 100644
--- a/plugins/love-resources/src/invites.ts
+++ b/plugins/love-resources/src/invites.ts
@@ -1,3 +1,18 @@
+//
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
 import { type Ref } from '@hcengineering/core'
 import { getCurrentEmployee, type Person } from '@hcengineering/contact'
 import { type PopupResult, showPopup } from '@hcengineering/ui'
@@ -7,14 +22,14 @@ import { getMetadata } from '@hcengineering/platform'
 import { get } from 'svelte/store'
 import { myInfo } from './stores'
 import love, { type Room } from '@hcengineering/love'
-import ActiveInvitesPopup from './components/meeting/invites/ActiveInvitesPopup.svelte'
-import InvitePopup from './components/meeting/invites/InvitePopup.svelte'
+import InviteRequestPopup from './components/meeting/invites/InviteRequestPopup.svelte'
+import InviteResponsePopup from './components/meeting/invites/InviteResponsePopup.svelte'
 import { joinOrCreateMeetingByInvite } from './meetings'
 
-export const inviteSecondsToLive = 5
-export const responseSecondsToLive = 2
+export const inviteRequestSecondsToLive = 5
+const responseSecondsToLive = 2
+
 const pulsePrefix = 'love/invite'
-const myInvitesPopupCategory = 'myInvites'
 
 export interface InviteRequest {
   from: Ref<Person>
@@ -27,51 +42,50 @@ export interface InviteResponse {
   accept: boolean
 }
 
-let invitesPopup: PopupResult | undefined
-let inviteResponseUnsubscribeCallback: UnsubscribeCallback | undefined
-let invitePersons: Array<Ref<Person>> | undefined
+const requestPopupCategory = 'inviteRequest'
+let unsubscribeResponse: UnsubscribeCallback | undefined
+let requestPopup: PopupResult | undefined
+let requestPersons: Array<Ref<Person>> | undefined
 
-export async function subscribeInviteResponses (): Promise<UnsubscribeCallback> {
+export async function subscribeInviteResponses (): Promise<void> {
   const client = await createPulseClient()
-  const currentPerson = getCurrentEmployee()
+  if (client === undefined) return
 
-  if (client !== undefined) {
-    inviteResponseUnsubscribeCallback = await client.subscribe(
-      `${getPulsePrefix()}/response/${currentPerson}/`,
-      (key: string, inviteResponse: InviteResponse | undefined) => {
-        void updateInviteResponse(key, inviteResponse)
-      }
-    )
-  }
+  const currentPerson = getCurrentEmployee()
 
-  return async () => false
+  unsubscribeResponse = await client.subscribe(
+    `${getPulsePrefix()}/response/${currentPerson}/`,
+    (key: string, inviteResponse: InviteResponse | undefined) => {
+      void onInviteResponse(key, inviteResponse)
+    }
+  )
 }
 
 export async function unsubscribeInviteResponses (): Promise<void> {
-  if (inviteResponseUnsubscribeCallback !== undefined) {
-    await inviteResponseUnsubscribeCallback()
+  if (unsubscribeResponse !== undefined) {
+    await unsubscribeResponse()
   }
 }
 
-export async function showInvitesPopup (persons: Array<Ref<Person>>): Promise<void> {
+export function sendInvites (persons: Array<Ref<Person>>): void {
   closeInvitesPopup()
-  invitePersons = persons
+  requestPersons = persons
   const myParticipation = get(myInfo)
   const room = myParticipation?.room
   if (room === undefined || room === love.ids.Reception) return
-  invitesPopup = showPopup(ActiveInvitesPopup, { persons, meetingId: room }, undefined, undefined, undefined, {
-    category: myInvitesPopupCategory,
+  requestPopup = showPopup(InviteRequestPopup, { persons, meetingId: room }, undefined, undefined, undefined, {
+    category: requestPopupCategory,
     overlay: false,
     fixed: true
   })
 }
 
 export function closeInvitesPopup (): void {
-  invitesPopup?.close()
-  invitesPopup = undefined
+  requestPopup?.close()
+  requestPopup = undefined
 }
 
-export async function sendInvites (persons: Array<Ref<Person>>, meetingId: string): Promise<void> {
+export async function updateInvites (persons: Array<Ref<Person>>, meetingId: string): Promise<void> {
   const client = await createPulseClient()
   const currentPerson = getCurrentEmployee()
 
@@ -82,7 +96,7 @@ export async function sendInvites (persons: Array<Ref<Person>>, meetingId: strin
       await client.put(
         `${getPulsePrefix()}/request/${person}/${currentPerson}/${meetingId}`,
         { from: currentPerson, meetingId },
-        inviteSecondsToLive
+        inviteRequestSecondsToLive
       )
     }
   } catch (error) {
@@ -94,9 +108,9 @@ export async function cancelInvites (meetingId: string): Promise<void> {
   const client = await createPulseClient()
   const currentPerson = getCurrentEmployee()
 
-  if (client === undefined || invitePersons === undefined) return
+  if (client === undefined || requestPersons === undefined) return
   try {
-    for (const person of invitePersons) {
+    for (const person of requestPersons) {
       await client.delete(`${getPulsePrefix()}/request/${person}/${currentPerson}/${meetingId}`)
     }
   } catch (error) {
@@ -104,59 +118,53 @@ export async function cancelInvites (meetingId: string): Promise<void> {
   }
 }
 
-async function updateInviteResponse (_key: string, inviteResponse: InviteResponse | undefined): Promise<void> {
+async function onInviteResponse (_key: string, response: InviteResponse | undefined): Promise<void> {
   const client = await createPulseClient()
-  if (client === undefined || inviteResponse === undefined || invitePersons === undefined) return
+  if (client === undefined || response === undefined || requestPersons === undefined) return
 
   const currentPerson = getCurrentEmployee()
-  await client.delete(`${getPulsePrefix()}/request/${inviteResponse.from}/${currentPerson}/${inviteResponse.meetingId}`)
-  await client.delete(
-    `${getPulsePrefix()}/response/${currentPerson}/${inviteResponse.from}/${inviteResponse.meetingId}`
-  )
-  invitePersons = invitePersons.filter((p) => p !== inviteResponse.from)
-  if (invitePersons.length === 0) {
+  await client.delete(`${getPulsePrefix()}/request/${response.from}/${currentPerson}/${response.meetingId}`)
+  await client.delete(`${getPulsePrefix()}/response/${currentPerson}/${response.from}/${response.meetingId}`)
+  requestPersons = requestPersons.filter((p) => p !== response.from)
+  if (requestPersons.length === 0) {
     closeInvitesPopup()
   } else {
-    invitesPopup?.update({ persons: invitePersons })
+    requestPopup?.update({ persons: requestPersons })
   }
 
-  if (!inviteResponse.accept) return
-  await joinOrCreateMeetingByInvite(inviteResponse.meetingId as Ref<Room>)
+  if (!response.accept) return
+  await joinOrCreateMeetingByInvite(response.meetingId as Ref<Room>)
 }
 
-let inviteRequestPopup: PopupResult | undefined
-let inviteRequestsUnsubscribeCallback: UnsubscribeCallback | undefined
-let activeInviteKey: string | undefined
-let inviteRequestsMap: Map<string, InviteRequest | undefined>
+const responsePopupCategory = 'inviteResponse'
+let responsePopup: PopupResult | undefined
+let unsubscribeRequest: UnsubscribeCallback | undefined
+let activeRequestKey: string | undefined
+let activeRequestsMap: Map<string, InviteRequest | undefined>
 
-export async function subscribeInviteRequests (): Promise<UnsubscribeCallback> {
+export async function subscribeInviteRequests (): Promise<void> {
   const client = await createPulseClient()
-  const currentPerson = getCurrentEmployee()
+  if (client === undefined) return
 
-  if (client !== undefined) {
-    inviteRequestsMap = new Map<string, InviteRequest>()
-    inviteRequestsUnsubscribeCallback = await client.subscribe(
-      `${getPulsePrefix()}/request/${currentPerson}/`,
-      updateInviteRequest
-    )
-  }
+  const currentPerson = getCurrentEmployee()
 
-  return async () => false
+  activeRequestsMap = new Map<string, InviteRequest>()
+  unsubscribeRequest = await client.subscribe(`${getPulsePrefix()}/request/${currentPerson}/`, onInviteRequest)
 }
 
 export async function unsubscribeInviteRequests (): Promise<void> {
-  if (inviteRequestsUnsubscribeCallback !== undefined) {
-    await inviteRequestsUnsubscribeCallback()
+  if (unsubscribeRequest !== undefined) {
+    await unsubscribeRequest()
   }
 }
 
 export async function responseToInviteRequest (accept: boolean): Promise<void> {
-  if (activeInviteKey === undefined) return
+  if (activeRequestKey === undefined) return
 
   const client = await createPulseClient()
   if (client === undefined) return
 
-  const activeInvite = inviteRequestsMap.get(activeInviteKey)
+  const activeInvite = activeRequestsMap.get(activeRequestKey)
   if (activeInvite === undefined) return
 
   const currentPerson = getCurrentEmployee()
@@ -166,48 +174,49 @@ export async function responseToInviteRequest (accept: boolean): Promise<void> {
     responseSecondsToLive
   )
 
-  inviteRequestPopup?.close()
-  inviteRequestPopup = undefined
-  if (activeInviteKey === undefined) return
-  inviteRequestsMap.set(activeInviteKey, undefined)
-  activeInviteKey = undefined
+  responsePopup?.close()
+  responsePopup = undefined
+  if (activeRequestKey === undefined) return
+  activeRequestsMap.set(activeRequestKey, undefined)
+  activeRequestKey = undefined
 
   if (!accept) return
   await joinOrCreateMeetingByInvite(activeInvite.meetingId as Ref<Room>)
 }
 
-function updateInviteRequest (key: string, invite: InviteRequest | undefined): void {
-  if (invite === undefined) {
-    inviteRequestsMap.delete(key)
-    if (activeInviteKey === key) {
-      activeInviteKey = undefined
+function onInviteRequest (key: string, request: InviteRequest | undefined): void {
+  if (request === undefined) {
+    activeRequestsMap.delete(key)
+    if (activeRequestKey === key) {
+      activeRequestKey = undefined
     }
-  } else if (!inviteRequestsMap.has(key)) {
-    inviteRequestsMap.set(key, invite)
+  } else if (!activeRequestsMap.has(key)) {
+    activeRequestsMap.set(key, request)
   }
   let keyChanged: boolean = false
-  if (activeInviteKey === undefined && inviteRequestsMap.size > 0) {
-    const unprocessedInvite = inviteRequestsMap?.entries().find((v) => v[1] !== undefined)
-    if (unprocessedInvite !== undefined) {
-      activeInviteKey = unprocessedInvite[0]
+  if (activeRequestKey === undefined && activeRequestsMap.size > 0) {
+    const requests = Array.from(activeRequestsMap.entries())
+    const unprocessedRequest = requests.find((v: [string, InviteRequest | undefined]) => v[1] !== undefined)
+    if (unprocessedRequest !== undefined) {
+      activeRequestKey = unprocessedRequest[0]
       keyChanged = true
     }
   }
-  if (activeInviteKey === undefined) {
-    inviteRequestPopup?.close()
-    inviteRequestPopup = undefined
+  if (activeRequestKey === undefined) {
+    responsePopup?.close()
+    responsePopup = undefined
     return
   }
 
-  if (inviteRequestPopup === undefined) {
-    inviteRequestPopup = showPopup(
-      InvitePopup,
-      { invite: inviteRequestsMap.get(activeInviteKey) },
+  if (responsePopup === undefined) {
+    responsePopup = showPopup(
+      InviteResponsePopup,
+      { invite: activeRequestsMap.get(activeRequestKey) },
       undefined,
       undefined,
       undefined,
       {
-        category: myInvitesPopupCategory,
+        category: responsePopupCategory,
         overlay: false,
         fixed: true
       }
@@ -215,7 +224,7 @@ function updateInviteRequest (key: string, invite: InviteRequest | undefined): v
     return
   }
   if (keyChanged) {
-    inviteRequestPopup?.update({ invite: inviteRequestsMap.get(activeInviteKey) })
+    responsePopup?.update({ invite: activeRequestsMap.get(activeRequestKey) })
   }
 }
 
diff --git a/plugins/love-resources/src/joinRequests.ts b/plugins/love-resources/src/joinRequests.ts
new file mode 100644
index 00000000000..279bdea4b79
--- /dev/null
+++ b/plugins/love-resources/src/joinRequests.ts
@@ -0,0 +1,228 @@
+//
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { type Ref } from '@hcengineering/core'
+import { getCurrentEmployee, type Person } from '@hcengineering/contact'
+import { type PopupResult, showPopup } from '@hcengineering/ui'
+import { type UnsubscribeCallback } from '@hcengineering/hulypulse-client'
+import presentation, { createPulseClient } from '@hcengineering/presentation'
+import { getMetadata } from '@hcengineering/platform'
+import { type Room } from '@hcengineering/love'
+import { joinOrCreateMeetingByInvite } from './meetings'
+import JoinRequestPopup from './components/meeting/invites/JoinRequestPopup.svelte'
+import JoinResponsePopup from './components/meeting/invites/JoinResponsePopup.svelte'
+
+export const joinRequestSecondsToLive = 5
+const responseSecondsToLive = 2
+
+const pulsePrefix = 'love/join'
+
+export interface JoinRequest {
+  from: Ref<Person>
+  meetingId: string
+}
+
+export interface JoinResponse {
+  meetingId: string
+  accept: boolean
+}
+
+const requestPopupCategory = 'joinRequest'
+let unsubscribeResponse: UnsubscribeCallback | undefined
+let requestPopup: PopupResult | undefined
+let requestMeetingId: string | undefined
+
+export async function subscribeJoinResponses (): Promise<void> {
+  const client = await createPulseClient()
+  const currentPerson = getCurrentEmployee()
+
+  if (client === undefined) return
+
+  unsubscribeResponse = await client.subscribe(
+    `${getPulsePrefix()}/response/${currentPerson}/`,
+    (key: string, inviteResponse: JoinResponse | undefined) => {
+      void onJoinResponse(key, inviteResponse)
+    }
+  )
+}
+
+export async function unsubscribeJoinResponses (): Promise<void> {
+  if (unsubscribeResponse !== undefined) {
+    await unsubscribeResponse()
+  }
+}
+
+export function sendJoinRequest (meetingId: string): void {
+  closeJoinRequestPopup()
+  requestMeetingId = meetingId
+  requestPopup = showPopup(JoinRequestPopup, { meetingId }, undefined, undefined, undefined, {
+    category: requestPopupCategory,
+    overlay: false,
+    fixed: true
+  })
+}
+
+export function closeJoinRequestPopup (): void {
+  requestPopup?.close()
+  requestPopup = undefined
+}
+
+export async function updateJoinRequest (): Promise<void> {
+  const client = await createPulseClient()
+  const currentPerson = getCurrentEmployee()
+  console.log('update request')
+
+  if (client === undefined) return
+
+  try {
+    await client.put(
+      `${getPulsePrefix()}/request/${requestMeetingId}/${currentPerson}`,
+      { from: currentPerson, meetingId: requestMeetingId },
+      joinRequestSecondsToLive
+    )
+  } catch (error) {
+    console.warn('failed to put joinRequest:', error)
+  }
+}
+
+export async function cancelJoinRequest (): Promise<void> {
+  const client = await createPulseClient()
+  const currentPerson = getCurrentEmployee()
+
+  if (client === undefined) return
+  try {
+    await client.delete(`${getPulsePrefix()}/request/${requestMeetingId}/${currentPerson}`)
+  } catch (error) {
+    console.warn('failed to delete invite info:', error)
+  }
+  requestMeetingId = undefined
+}
+
+async function onJoinResponse (_key: string, response: JoinResponse | undefined): Promise<void> {
+  const client = await createPulseClient()
+  if (
+    client === undefined ||
+    response === undefined ||
+    requestMeetingId === undefined ||
+    requestMeetingId !== response.meetingId
+  ) {
+    return
+  }
+
+  const currentPerson = getCurrentEmployee()
+  await client.delete(`${getPulsePrefix()}/request/${requestMeetingId}/${currentPerson}`)
+  await client.delete(`${getPulsePrefix()}/response/${currentPerson}/${requestMeetingId}`)
+  closeJoinRequestPopup()
+  if (!response.accept) return
+  await joinOrCreateMeetingByInvite(response.meetingId as Ref<Room>)
+}
+
+const responsePopupCategory = 'joinResponse'
+let responsePopup: PopupResult | undefined
+let unsubscribeRequest: UnsubscribeCallback | undefined
+let activeRequestKey: string | undefined
+let activeRequestsMap: Map<string, JoinRequest | undefined> | undefined
+
+export async function subscribeJoinRequests (meetingId: string | undefined): Promise<void> {
+  if (meetingId === undefined) return
+
+  const client = await createPulseClient()
+  if (client === undefined) return
+
+  activeRequestsMap = new Map<string, JoinRequest>()
+  unsubscribeRequest = await client.subscribe(`${getPulsePrefix()}/request/${meetingId}/`, onJoinRequest)
+}
+
+export async function unsubscribeJoinRequests (): Promise<void> {
+  activeRequestsMap = undefined
+  if (unsubscribeRequest !== undefined) {
+    await unsubscribeRequest()
+  }
+}
+
+export async function responseToJoinRequest (joinRequest: JoinRequest, accept: boolean): Promise<void> {
+  if (activeRequestKey === undefined) return
+
+  const client = await createPulseClient()
+  if (client === undefined || activeRequestsMap === undefined) return
+
+  const activeRequest = activeRequestsMap.get(activeRequestKey)
+  if (activeRequest === undefined) return
+
+  await client.put(
+    `${getPulsePrefix()}/response/${joinRequest.from}/${joinRequest.meetingId}`,
+    { accept, meetingId: joinRequest.meetingId },
+    responseSecondsToLive
+  )
+
+  responsePopup?.close()
+  responsePopup = undefined
+  if (activeRequestKey === undefined) return
+  activeRequestsMap.set(activeRequestKey, undefined)
+  activeRequestKey = undefined
+
+  if (!accept) return
+  await joinOrCreateMeetingByInvite(joinRequest.meetingId as Ref<Room>)
+}
+
+function onJoinRequest (key: string, request: JoinRequest | undefined): void {
+  if (activeRequestsMap === undefined) return
+  if (request === undefined) {
+    activeRequestsMap.delete(key)
+    if (activeRequestKey === key) {
+      activeRequestKey = undefined
+    }
+  } else if (!activeRequestsMap.has(key)) {
+    activeRequestsMap.set(key, request)
+  }
+  let keyChanged: boolean = false
+  if (activeRequestKey === undefined && activeRequestsMap.size > 0) {
+    const requests = Array.from(activeRequestsMap.entries())
+    const unprocessedRequest = requests.find((v: [string, JoinRequest | undefined]) => v[1] !== undefined)
+    if (unprocessedRequest !== undefined) {
+      activeRequestKey = unprocessedRequest[0]
+      keyChanged = true
+    }
+  }
+  if (activeRequestKey === undefined) {
+    responsePopup?.close()
+    responsePopup = undefined
+    return
+  }
+
+  if (responsePopup === undefined) {
+    responsePopup = showPopup(
+      JoinResponsePopup,
+      { request: activeRequestsMap.get(activeRequestKey) },
+      undefined,
+      undefined,
+      undefined,
+      {
+        category: responsePopupCategory,
+        overlay: false,
+        fixed: true
+      }
+    )
+    return
+  }
+  if (keyChanged) {
+    responsePopup?.update({ invite: activeRequestsMap.get(activeRequestKey) })
+  }
+}
+
+function getPulsePrefix (): string {
+  const workspace = getMetadata(presentation.metadata.WorkspaceUuid) ?? ''
+  return `${workspace}/${pulsePrefix}`
+}
diff --git a/plugins/love-resources/src/meetings.ts b/plugins/love-resources/src/meetings.ts
index a9c00532b0e..c7cab6057d4 100644
--- a/plugins/love-resources/src/meetings.ts
+++ b/plugins/love-resources/src/meetings.ts
@@ -1,15 +1,6 @@
 import core, { AccountRole, getCurrentAccount, type Ref } from '@hcengineering/core'
-import love, {
-  getFreeRoomPlace,
-  MeetingStatus,
-  type Room,
-  RoomType,
-  isOffice,
-  RoomAccess,
-  RequestStatus,
-  type JoinRequest
-} from '@hcengineering/love'
-import presentation, { createQuery, getClient } from '@hcengineering/presentation'
+import love, { getFreeRoomPlace, MeetingStatus, type Room, RoomType, isOffice, RoomAccess } from '@hcengineering/love'
+import presentation, { getClient } from '@hcengineering/presentation'
 import {
   closeMeetingMinutes,
   getLiveKitEndpoint,
@@ -23,9 +14,9 @@ import { infos, myInfo, myOffice, rooms } from './stores'
 import { getCurrentEmployee, type Person } from '@hcengineering/contact'
 import { getPersonByPersonRef } from '@hcengineering/contact-resources'
 import { getMetadata } from '@hcengineering/platform'
+import { sendJoinRequest, subscribeJoinRequests, unsubscribeJoinRequests } from './joinRequests'
 
 export let currentMeetingRoom: Ref<Room> | undefined
-const requestsQuery = createQuery(true)
 
 export async function createMeeting (room: Room): Promise<void> {
   if (room.access === RoomAccess.DND) return
@@ -34,7 +25,7 @@ export async function createMeeting (room: Room): Promise<void> {
   const currentPerson = await getPersonByPersonRef(me)
 
   if (isOffice(room) && room.person !== currentPerson?._id) {
-    await sendJoinRequest(room)
+    sendJoinRequest(room._id)
     return
   }
 
@@ -76,6 +67,7 @@ export async function leaveMeeting (): Promise<void> {
     }
   }
   await liveKitClient.disconnect()
+  await unsubscribeJoinRequests()
   closeMeetingMinutes()
   currentMeetingRoom = undefined
 }
@@ -85,7 +77,7 @@ export async function joinMeeting (room: Room): Promise<void> {
 
   const isGuest = getCurrentAccount().role === AccountRole.Guest
   if (room.access === RoomAccess.Knock || isOffice(room) || isGuest) {
-    await sendJoinRequest(room)
+    sendJoinRequest(room._id)
     return
   }
 
@@ -111,67 +103,6 @@ export async function joinOrCreateMeetingByInvite (roomId: Ref<Room>): Promise<v
   await connectToMeeting(room)
 }
 
-export async function acceptJoinRequest (request: JoinRequest): Promise<void> {
-  const client = getClient()
-  const room = getRoomById(request.room)
-
-  if (room === undefined) return
-
-  const meeting = await client.findOne(love.class.MeetingMinutes, {
-    attachedTo: room._id,
-    status: MeetingStatus.Active
-  })
-  if (meeting === undefined) {
-    await createMeetingDocument(room)
-  }
-
-  await client.update(request, { status: RequestStatus.Approved })
-  await connectToMeeting(room)
-}
-
-export async function rejectJoinRequest (request: JoinRequest): Promise<void> {
-  const client = getClient()
-  await client.update(request, { status: RequestStatus.Rejected })
-}
-
-export async function cancelJoinRequest (request: JoinRequest): Promise<void> {
-  if (request.status === RequestStatus.Pending) {
-    const client = getClient()
-    await client.remove(request)
-  }
-}
-
-async function sendJoinRequest (room: Room): Promise<void> {
-  if (room.access === RoomAccess.DND) return
-
-  const me = getCurrentEmployee()
-  const currentPerson = await getPersonByPersonRef(me)
-
-  if (currentPerson == null) {
-    return
-  }
-
-  if (isOffice(room) && room.person === currentPerson._id) {
-    return
-  }
-
-  const client = getClient()
-  const _id = await client.createDoc(love.class.JoinRequest, core.space.Workspace, {
-    person: currentPerson._id,
-    room: room._id,
-    status: RequestStatus.Pending
-  })
-  requestsQuery.query(love.class.JoinRequest, { person: me, _id }, (res) => {
-    const req = res[0]
-    if (req === undefined) return
-    if (req.status === RequestStatus.Pending) return
-    requestsQuery.unsubscribe()
-    if (req.status === RequestStatus.Approved) {
-      void connectToMeeting(room)
-    }
-  })
-}
-
 export async function kick (person: Ref<Person>): Promise<void> {
   const client = getClient()
   const allRooms = get(rooms)

From 35ecbfc39659a94383ce0f0f494a112c0108cece Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 25 Sep 2025 17:22:24 +0700
Subject: [PATCH 20/25] Remove old transient join requests

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 models/love/src/index.ts                   | 34 --------
 models/server-love/src/index.ts            |  8 --
 plugins/love-resources/src/stores.ts       | 16 +---
 plugins/love-resources/src/utils.ts        |  3 -
 plugins/love/src/plugin.ts                 |  2 -
 plugins/love/src/types.ts                  | 12 ---
 server-plugins/love-resources/src/index.ts | 97 +---------------------
 7 files changed, 4 insertions(+), 168 deletions(-)

diff --git a/models/love/src/index.ts b/models/love/src/index.ts
index d8431db1d6f..cb7139738f9 100644
--- a/models/love/src/index.ts
+++ b/models/love/src/index.ts
@@ -31,7 +31,6 @@ import {
 import {
   type DevicesPreference,
   type Floor,
-  type JoinRequest,
   loveId,
   type Meeting,
   type MeetingMinutes,
@@ -39,7 +38,6 @@ import {
   type MeetingSchedule,
   type Office,
   type ParticipantInfo,
-  type RequestStatus,
   type Room,
   type RoomAccess,
   type RoomInfo,
@@ -162,17 +160,6 @@ export class TParticipantInfo extends TDoc implements ParticipantInfo {
   account!: AccountUuid | null
 }
 
-@Model(love.class.JoinRequest, core.class.Doc, DOMAIN_TRANSIENT)
-export class TJoinRequest extends TDoc implements JoinRequest {
-  @Prop(TypeRef(contact.class.Person), getEmbeddedLabel('From'))
-    person!: Ref<Person>
-
-  @Prop(TypeRef(love.class.Room), love.string.Room)
-    room!: Ref<Room>
-
-  status!: RequestStatus
-}
-
 @Model(love.class.DevicesPreference, preference.class.Preference)
 export class TDevicesPreference extends TPreference implements DevicesPreference {
   blurRadius!: number
@@ -257,7 +244,6 @@ export function createModel (builder: Builder): void {
     TFloor,
     TOffice,
     TParticipantInfo,
-    TJoinRequest,
     TDevicesPreference,
     TRoomInfo,
     TMeeting,
@@ -372,21 +358,6 @@ export function createModel (builder: Builder): void {
     love.ids.LoveNotificationGroup
   )
 
-  builder.createDoc(
-    notification.class.NotificationType,
-    core.space.Model,
-    {
-      hidden: false,
-      generated: false,
-      label: love.string.KnockingLabel,
-      group: love.ids.LoveNotificationGroup,
-      txClasses: [],
-      objectClass: love.class.JoinRequest,
-      defaultEnabled: true
-    },
-    love.ids.KnockNotification
-  )
-
   builder.createDoc(notification.class.NotificationProviderDefaults, core.space.Model, {
     provider: notification.providers.SoundNotificationProvider,
     excludeIgnore: [love.ids.KnockNotification],
@@ -483,11 +454,6 @@ export function createModel (builder: Builder): void {
     components: { input: { component: chunter.component.ChatMessageInput, props: { collection: 'messages' } } }
   })
 
-  builder.mixin(love.class.JoinRequest, core.class.Class, core.mixin.TxAccessLevel, {
-    createAccessLevel: AccountRole.Guest,
-    removeAccessLevel: AccountRole.Guest
-  })
-
   builder.mixin(love.class.ParticipantInfo, core.class.Class, core.mixin.TxAccessLevel, {
     createAccessLevel: AccountRole.Guest,
     updateAccessLevel: AccountRole.Guest
diff --git a/models/server-love/src/index.ts b/models/server-love/src/index.ts
index c21335465bd..2ddca004b31 100644
--- a/models/server-love/src/index.ts
+++ b/models/server-love/src/index.ts
@@ -64,14 +64,6 @@ export function createModel (builder: Builder): void {
     }
   })
 
-  builder.createDoc(serverCore.class.Trigger, core.space.Model, {
-    trigger: serverLove.trigger.OnKnock,
-    txMatch: {
-      objectClass: love.class.JoinRequest,
-      _class: core.class.TxCreateDoc
-    }
-  })
-
   builder.mixin(love.class.MeetingMinutes, core.class.Class, serverCore.mixin.SearchPresenter, {
     searchIcon: love.icon.MeetingMinutes,
     title: [['title']]
diff --git a/plugins/love-resources/src/stores.ts b/plugins/love-resources/src/stores.ts
index fa13e48878b..670a2b98b15 100644
--- a/plugins/love-resources/src/stores.ts
+++ b/plugins/love-resources/src/stores.ts
@@ -3,10 +3,8 @@ import { getCurrentEmployee } from '@hcengineering/contact'
 import { getPersonRefByPersonId } from '@hcengineering/contact-resources'
 import { type Ref } from '@hcengineering/core'
 import {
-  RequestStatus,
   type DevicesPreference,
   type Floor,
-  type JoinRequest,
   type MeetingMinutes,
   type Office,
   type ParticipantInfo,
@@ -42,7 +40,6 @@ export const activeFloor = derived([rooms, myInfo, myOffice], ([rooms, myInfo, m
   }
   return res ?? love.ids.MainFloor
 })
-export const myRequests = writable<JoinRequest[]>([])
 
 export const myPreferences = writable<DevicesPreference | undefined>()
 export let $myPreferences: DevicesPreference | undefined
@@ -69,7 +66,6 @@ const officeLoaded = writable(false)
 const query = createQuery(true)
 const statusQuery = createQuery(true)
 const floorsQuery = createQuery(true)
-const requestsQuery = createQuery(true)
 const preferencesQuery = createQuery(true)
 
 onClient(() => {
@@ -91,16 +87,6 @@ onClient(() => {
       resolve()
     })
   )
-  const requestPromise = new Promise<void>((resolve) =>
-    requestsQuery.query(
-      love.class.JoinRequest,
-      { person: getCurrentEmployee(), status: RequestStatus.Pending },
-      (res) => {
-        myRequests.set(res)
-        resolve()
-      }
-    )
-  )
   const preferencePromise = new Promise<void>((resolve) =>
     preferencesQuery.query(love.class.DevicesPreference, {}, (res) => {
       myPreferences.set(res[0])
@@ -109,7 +95,7 @@ onClient(() => {
     })
   )
 
-  void Promise.all([roomPromise, infoPromise, floorPromise, requestPromise, preferencePromise]).then(() => {
+  void Promise.all([roomPromise, infoPromise, floorPromise, preferencePromise]).then(() => {
     officeLoaded.set(true)
   })
 })
diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index a8d7fe60390..b782005c923 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -21,7 +21,6 @@ import core, {
 import login from '@hcengineering/login'
 import {
   isOffice,
-  type JoinRequest,
   LoveEvents,
   loveId,
   type Meeting,
@@ -267,8 +266,6 @@ export async function navigateToOfficeDoc (object: Doc): Promise<void> {
   navigate(loc)
 }
 
-export const joinRequest: Ref<JoinRequest> | undefined = undefined
-
 export function calculateFloorSize (_rooms: Room[], _preview?: boolean): number {
   let fH: number = 5
   _rooms.forEach((room) => {
diff --git a/plugins/love/src/plugin.ts b/plugins/love/src/plugin.ts
index bd65d95c53f..88d666e3431 100644
--- a/plugins/love/src/plugin.ts
+++ b/plugins/love/src/plugin.ts
@@ -8,7 +8,6 @@ import { Widget } from '@hcengineering/workbench'
 import {
   DevicesPreference,
   Floor,
-  JoinRequest,
   Meeting,
   MeetingMinutes,
   MeetingSchedule,
@@ -27,7 +26,6 @@ const love = plugin(loveId, {
     Floor: '' as Ref<Class<Floor>>,
     Office: '' as Ref<Class<Office>>,
     ParticipantInfo: '' as Ref<Class<ParticipantInfo>>,
-    JoinRequest: '' as Ref<Class<JoinRequest>>,
     DevicesPreference: '' as Ref<Class<DevicesPreference>>,
     RoomInfo: '' as Ref<Class<RoomInfo>>,
     MeetingMinutes: '' as Ref<Class<MeetingMinutes>>
diff --git a/plugins/love/src/types.ts b/plugins/love/src/types.ts
index 8640feff6f4..dcb6c05b263 100644
--- a/plugins/love/src/types.ts
+++ b/plugins/love/src/types.ts
@@ -127,18 +127,6 @@ export interface MeetingSchedule extends Schedule {
   room: Ref<Room>
 }
 
-export enum RequestStatus {
-  Pending,
-  Approved,
-  Rejected
-}
-
-export interface JoinRequest extends Doc {
-  person: Ref<Person>
-  room: Ref<Room>
-  status: RequestStatus
-}
-
 export interface DevicesPreference extends Preference {
   micEnabled: boolean
   noiseCancellation: boolean
diff --git a/server-plugins/love-resources/src/index.ts b/server-plugins/love-resources/src/index.ts
index 4252b5a971a..955df80e69e 100644
--- a/server-plugins/love-resources/src/index.ts
+++ b/server-plugins/love-resources/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import contact, { Employee, formatName, getName, Person } from '@hcengineering/contact'
+import contact, { Employee, getName, Person } from '@hcengineering/contact'
 import core, {
   type AccountUuid,
   combineAttributes,
@@ -32,26 +32,17 @@ import core, {
 } from '@hcengineering/core'
 import love, {
   isOffice,
-  JoinRequest,
   loveId,
   MeetingMinutes,
   MeetingStatus,
   Office,
   ParticipantInfo,
-  RequestStatus,
   Room,
   RoomAccess,
   RoomInfo
 } from '@hcengineering/love'
-import notification from '@hcengineering/notification'
-import { getMetadata, translate } from '@hcengineering/platform'
-import { getSocialStrings } from '@hcengineering/server-contact'
+import { getMetadata } from '@hcengineering/platform'
 import serverCore, { TriggerControl } from '@hcengineering/server-core'
-import {
-  createPushNotification,
-  getNotificationProviderControl,
-  isAllowed
-} from '@hcengineering/server-notification-resources'
 import view from '@hcengineering/view'
 import { workbenchId } from '@hcengineering/workbench'
 
@@ -289,29 +280,6 @@ async function getRoomName (control: TriggerControl, roomId: Ref<Room>): Promise
   return room.name
 }
 
-async function rejectJoinRequests (info: ParticipantInfo, control: TriggerControl): Promise<Tx[]> {
-  const res: Tx[] = []
-  const roomInfos = await control.queryFind(control.ctx, love.class.RoomInfo, {})
-  const oldRoomInfo = roomInfos.find((ri) => ri.persons.includes(info.person))
-  if (oldRoomInfo !== undefined) {
-    const restPersons = oldRoomInfo.persons.filter((p) => p !== info.person)
-    if (restPersons.length === 0) {
-      const requests = await control.findAll(control.ctx, love.class.JoinRequest, {
-        room: oldRoomInfo.room,
-        status: RequestStatus.Pending
-      })
-      for (const request of requests) {
-        res.push(
-          control.txFactory.createTxUpdateDoc(love.class.JoinRequest, core.space.Workspace, request._id, {
-            status: RequestStatus.Rejected
-          })
-        )
-      }
-    }
-  }
-  return res
-}
-
 async function setDefaultRoomAccess (info: ParticipantInfo, control: TriggerControl): Promise<Tx[]> {
   const res: Tx[] = []
   const roomInfos = await control.queryFind(control.ctx, love.class.RoomInfo, {})
@@ -386,7 +354,6 @@ export async function OnParticipantInfo (txes: Tx[], control: TriggerControl): P
       if (info === undefined) {
         continue
       }
-      result.push(...(await rejectJoinRequests(info, control)))
       result.push(...(await setDefaultRoomAccess(info, control)))
       result.push(...(await roomJoinHandler(info, control)))
     }
@@ -394,63 +361,6 @@ export async function OnParticipantInfo (txes: Tx[], control: TriggerControl): P
   return result
 }
 
-export async function OnKnock (txes: Tx[], control: TriggerControl): Promise<Tx[]> {
-  for (const tx of txes) {
-    const actualTx = tx as TxCreateDoc<JoinRequest>
-    if (actualTx._class === core.class.TxCreateDoc) {
-      const request = TxProcessor.createDoc2Doc(actualTx)
-      if (request.status === RequestStatus.Pending) {
-        const roomInfo = (await control.findAll(control.ctx, love.class.RoomInfo, { room: request.room }))[0]
-        if (roomInfo !== undefined) {
-          const from = (await control.findAll(control.ctx, contact.class.Person, { _id: request.person }))[0]
-          if (from === undefined) {
-            continue
-          }
-          const type = await control.modelDb.findOne(notification.class.NotificationType, {
-            _id: love.ids.KnockNotification
-          })
-          if (type === undefined) {
-            continue
-          }
-          const provider = await control.modelDb.findOne(notification.class.NotificationProvider, {
-            _id: notification.providers.PushNotificationProvider
-          })
-          if (provider === undefined) {
-            continue
-          }
-
-          const notificationControl = await getNotificationProviderControl(control.ctx, control)
-          for (const user of roomInfo.persons) {
-            const socialStrings = await getSocialStrings(control, user)
-            if (socialStrings.length === 0) continue
-            if (isAllowed(control, socialStrings, type, provider, notificationControl)) {
-              const path = [workbenchId, control.workspace.url, loveId]
-              const title = await translate(love.string.KnockingLabel, {})
-              const body = await translate(love.string.IsKnocking, {
-                name: formatName(from.name, control.branding?.lastNameFirst)
-              })
-              const employee = await control.findAll(
-                control.ctx,
-                contact.mixin.Employee,
-                { _id: user as Ref<Employee> },
-                { limit: 1 }
-              )
-              const account = employee[0]?.personUuid
-              if (account === undefined) continue
-
-              const subscriptions = await control.findAll(control.ctx, notification.class.PushSubscription, {
-                user: account
-              })
-              await createPushNotification(control, account, title, body, request._id, subscriptions, from, path)
-            }
-          }
-        }
-      }
-    }
-  }
-  return []
-}
-
 export async function meetingMinutesHTMLPresenter (doc: Doc, control: TriggerControl): Promise<string> {
   const meetingMinutes = doc as MeetingMinutes
   const front = control.branding?.front ?? getMetadata(serverCore.metadata.FrontUrl) ?? ''
@@ -532,7 +442,6 @@ export default async () => ({
     OnEmployee,
     OnUserStatus,
     OnParticipantInfo,
-    OnRoomInfo,
-    OnKnock
+    OnRoomInfo
   }
 })

From 521db4e7e5f0d1055d1d71f9eddb136d510715cb Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 25 Sep 2025 19:10:57 +0700
Subject: [PATCH 21/25] Fix merged files

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../meeting/invites/InviteRequestPopup.svelte | 10 ----------
 .../invites/InviteResponsePopup.svelte        | 20 -------------------
 .../meeting/invites/JoinRequestPopup.svelte   | 12 -----------
 .../meeting/invites/JoinResponsePopup.svelte  | 19 ++----------------
 4 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte b/plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte
index 74dc8c23046..0bee280a712 100644
--- a/plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte
@@ -17,7 +17,6 @@
   import { CombineAvatars } from '@hcengineering/contact-resources'
   import { Button, Label } from '@hcengineering/ui'
   import love from '../../../plugin'
-<<<<<<<< HEAD:plugins/love-resources/src/components/meeting/invites/InviteRequestPopup.svelte
   import { Ref } from '@hcengineering/core'
   import { onMount } from 'svelte'
   import {
@@ -49,15 +48,6 @@
 
   async function cancel (): Promise<void> {
     closeInvitesPopup()
-========
-  import { cancelInvites } from '../../../meetings'
-  import { activeInvites } from '../../../stores'
-
-  $: persons = $activeInvites.map((p) => p.target)
-
-  async function cancel (): Promise<void> {
-    await cancelInvites($activeInvites)
->>>>>>>> develop:plugins/love-resources/src/components/meeting/invites/ActiveInvitesPopup.svelte
   }
 </script>
 
diff --git a/plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte b/plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte
index 8b913010db0..f8777c6f940 100644
--- a/plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte
@@ -15,24 +15,12 @@
 <script lang="ts">
   import { formatName, Person } from '@hcengineering/contact'
   import { Avatar, getPersonByPersonRefCb } from '@hcengineering/contact-resources'
-<<<<<<<< HEAD:plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte
   import { playSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
   import { onDestroy, onMount } from 'svelte'
 
   import love from '../../../plugin'
   import { InviteRequest, responseToInviteRequest } from '../../../invites'
-========
-  import { playNotificationSound } from '@hcengineering/presentation'
-  import { Button, Label } from '@hcengineering/ui'
-  import { Invite } from '@hcengineering/love'
-  import { onDestroy, onMount } from 'svelte'
-
-  import love from '../../../plugin'
-  import { acceptInvite, rejectInvite } from '../../../meetings'
-
-  export let invite: Invite
->>>>>>>> develop:plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
 
   export let invite: InviteRequest
   let person: Person | undefined = undefined
@@ -44,19 +32,11 @@
   let stopSound: (() => void) | null = null
 
   async function accept (): Promise<void> {
-<<<<<<<< HEAD:plugins/love-resources/src/components/meeting/invites/InviteResponsePopup.svelte
     await responseToInviteRequest(true)
   }
 
   async function decline (): Promise<void> {
     await responseToInviteRequest(false)
-========
-    await acceptInvite(invite)
-  }
-
-  async function decline (): Promise<void> {
-    await rejectInvite(invite)
->>>>>>>> develop:plugins/love-resources/src/components/meeting/invites/InvitePopup.svelte
   }
 
   onMount(async () => {
diff --git a/plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte b/plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
index 2033aa06e10..a868dadb053 100644
--- a/plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
@@ -14,7 +14,6 @@
 -->
 <script lang="ts">
   import { Button, Label } from '@hcengineering/ui'
-<<<<<<<< HEAD:plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
   import love from '../../../plugin'
   import { rooms } from '../../../stores'
   import { getRoomLabel } from '../../../utils'
@@ -27,13 +26,6 @@
     updateJoinRequest
   } from '../../../joinRequests'
   import { onMount } from 'svelte'
-========
-  import { JoinRequest } from '@hcengineering/love'
-  import love from '../../../plugin'
-  import { rooms } from '../../../stores'
-  import { getRoomLabel } from '../../../utils'
-  import { cancelJoinRequest } from '../../../meetings'
->>>>>>>> develop:plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
 
   export let meetingId: string
 
@@ -55,11 +47,7 @@
   }
 
   async function cancel (): Promise<void> {
-<<<<<<<< HEAD:plugins/love-resources/src/components/meeting/invites/JoinRequestPopup.svelte
     closeJoinRequestPopup()
-========
-    await cancelJoinRequest(request)
->>>>>>>> develop:plugins/love-resources/src/components/meeting/invites/RequestingPopup.svelte
   }
 </script>
 
diff --git a/plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte b/plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
index 5a09d61e3a4..ce1f8696475 100644
--- a/plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
@@ -15,18 +15,11 @@
 <script lang="ts">
   import { formatName } from '@hcengineering/contact'
   import { Avatar, getPersonByPersonRefStore } from '@hcengineering/contact-resources'
-  import { playNotificationSound } from '@hcengineering/presentation'
+  import { playSound } from '@hcengineering/presentation'
   import { Button, Label } from '@hcengineering/ui'
-<<<<<<<< HEAD:plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
   import love from '../../../plugin'
   import { onDestroy, onMount } from 'svelte'
   import { responseToJoinRequest, JoinRequest } from '../../../joinRequests'
-========
-  import { JoinRequest } from '@hcengineering/love'
-  import love from '../../../plugin'
-  import { onDestroy, onMount } from 'svelte'
-  import { acceptJoinRequest, rejectJoinRequest } from '../../../meetings'
->>>>>>>> develop:plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
 
   export let request: JoinRequest
 
@@ -36,23 +29,15 @@
   let stopSound: (() => void) | null = null
 
   async function accept (): Promise<void> {
-<<<<<<<< HEAD:plugins/love-resources/src/components/meeting/invites/JoinResponsePopup.svelte
     await responseToJoinRequest(request, true)
   }
 
   async function decline (): Promise<void> {
     await responseToJoinRequest(request, false)
-========
-    await acceptJoinRequest(request)
-  }
-
-  async function decline (): Promise<void> {
-    await rejectJoinRequest(request)
->>>>>>>> develop:plugins/love-resources/src/components/meeting/invites/RequestPopup.svelte
   }
 
   onMount(async () => {
-    stopSound = await playNotificationSound(love.sound.Knock, love.class.JoinRequest, true)
+    stopSound = await playSound(love.sound.Knock, true)
   })
 
   onDestroy(() => {

From 56d25d2f35285f99b71ceba987be459c5d84c40c Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 25 Sep 2025 20:48:47 +0700
Subject: [PATCH 22/25] Remove unused import

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 plugins/love-resources/src/meetings.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/love-resources/src/meetings.ts b/plugins/love-resources/src/meetings.ts
index c7cab6057d4..6620f826299 100644
--- a/plugins/love-resources/src/meetings.ts
+++ b/plugins/love-resources/src/meetings.ts
@@ -14,7 +14,7 @@ import { infos, myInfo, myOffice, rooms } from './stores'
 import { getCurrentEmployee, type Person } from '@hcengineering/contact'
 import { getPersonByPersonRef } from '@hcengineering/contact-resources'
 import { getMetadata } from '@hcengineering/platform'
-import { sendJoinRequest, subscribeJoinRequests, unsubscribeJoinRequests } from './joinRequests'
+import { sendJoinRequest, unsubscribeJoinRequests } from './joinRequests'
 
 export let currentMeetingRoom: Ref<Room> | undefined
 

From bc6ccd45f3854285ecf30b0dda0fcaf0b2880eb8 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Fri, 26 Sep 2025 09:30:01 +0700
Subject: [PATCH 23/25] Update plugins/love-resources/src/joinRequests.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 plugins/love-resources/src/joinRequests.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/love-resources/src/joinRequests.ts b/plugins/love-resources/src/joinRequests.ts
index 279bdea4b79..88e77630e3d 100644
--- a/plugins/love-resources/src/joinRequests.ts
+++ b/plugins/love-resources/src/joinRequests.ts
@@ -82,7 +82,6 @@ export function closeJoinRequestPopup (): void {
 export async function updateJoinRequest (): Promise<void> {
   const client = await createPulseClient()
   const currentPerson = getCurrentEmployee()
-  console.log('update request')
 
   if (client === undefined) return
 

From ea0941aecc257396a5d3835a375897730fad6dfc Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 2 Oct 2025 09:44:00 +0700
Subject: [PATCH 24/25] Fix merge errors

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 .../src/components/meeting/invites/InviteEmployeeButton.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
index 0adfb11d860..c9263b26523 100644
--- a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
+++ b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte
@@ -15,12 +15,13 @@
 <script lang="ts">
   import { ButtonBaseSize, IconSize, ModernButton, showPopup } from '@hcengineering/ui'
   import { Employee } from '@hcengineering/contact'
-  import { currentMeetingRoom, sendInvites } from '../../../meetings'
+  import { currentMeetingRoom } from '../../../meetings'
   import love from '../../../plugin'
   import { SelectUsersPopup } from '@hcengineering/contact-resources'
   import { Ref } from '@hcengineering/core'
   import { createEventDispatcher } from 'svelte'
   import { sendInvites } from '../../../invites'
+  import { infos } from '../../../stores'
 
   export let employee: Employee | undefined = undefined
   export let kind: 'primary' | 'secondary' | 'tertiary' | 'negative' = 'secondary'

From acd197b1eefcb6396b36f5d00861bde5c42e3b08 Mon Sep 17 00:00:00 2001
From: Anton Alexeyev <alexeyev.anton@gmail.com>
Date: Thu, 2 Oct 2025 09:51:44 +0700
Subject: [PATCH 25/25] Fix validation

Signed-off-by: Anton Alexeyev <alexeyev.anton@gmail.com>
---
 plugins/love-resources/src/utils.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/love-resources/src/utils.ts b/plugins/love-resources/src/utils.ts
index 6b266f3bc3c..1870183ecb9 100644
--- a/plugins/love-resources/src/utils.ts
+++ b/plugins/love-resources/src/utils.ts
@@ -279,8 +279,6 @@ export async function navigateToMeetingMinutes (room: Room): Promise<void> {
   await navigateToOfficeDoc(room)
 }
 
-export const joinRequest: Ref<JoinRequest> | undefined = undefined
-
 export function calculateFloorSize (_rooms: Room[], _preview?: boolean): number {
   let fH: number = 5
   _rooms.forEach((room) => {