-
Notifications
You must be signed in to change notification settings - Fork 13k
refactor: remove LoginPresence from Meteor startup
#35787
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| import '../lib/MessageTypes'; | ||
| import './OAuthProxy'; | ||
| import './methods/sendMessage'; | ||
|
|
||
| export * from './lib'; |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; | ||
| import { useEffect } from 'react'; | ||
|
|
||
| import { useIdleDetection } from './useIdleDetection'; | ||
|
|
||
| /** | ||
| * useIdleActiveEvents is a custom hook that triggers a callback function when the user is detected to be idle, and another callback function when the user is detected to be active. | ||
| * The idle state is determined based on the absence of certain user interactions for a specified time period. | ||
| * | ||
| * @param options - A configuration object. | ||
| * @param options.id - A unique identifier for the idle detection mechanism. | ||
| * @param options.time - The time in milliseconds to consider the user idle. Optional. Defaults to 600000 ms (10 minutes). | ||
| * @param options.awayOnWindowBlur - A boolean flag to trigger the callback when the window loses focus. Optional. Defaults to false. | ||
| * @param onIdleCallback - The callback function to be called when the user is detected to be idle. | ||
| * @param onActiveCallback - The callback function to be called when the user is detected to be active. | ||
| * | ||
| */ | ||
|
|
||
| export const useIdleActiveEvents = ( | ||
| { | ||
| id, | ||
| time, | ||
| awayOnWindowBlur, | ||
| }: { | ||
| id: string; | ||
| time?: number; | ||
| awayOnWindowBlur?: boolean; | ||
| }, | ||
| onIdleCallback: () => void, | ||
| onActiveCallback?: () => void, | ||
| ) => { | ||
| const stableIdleCallback = useEffectEvent(onIdleCallback); | ||
| const stableActiveCallback = useEffectEvent(onActiveCallback || (() => undefined)); | ||
|
|
||
| useEffect(() => { | ||
| document.addEventListener(`${id}_idle`, stableIdleCallback); | ||
|
|
||
| onActiveCallback && document.addEventListener(`${id}_active`, stableActiveCallback); | ||
|
|
||
| return () => { | ||
| document.removeEventListener(`${id}_idle`, stableIdleCallback); | ||
| document.removeEventListener(`${id}_active`, stableActiveCallback); | ||
| }; | ||
| }, [id, onActiveCallback, stableActiveCallback, stableIdleCallback]); | ||
juliajforesti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| return useIdleDetection({ id, time, awayOnWindowBlur }); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; | ||
| import { ServerContext, useConnectionStatus, useSetting, useUserId } from '@rocket.chat/ui-contexts'; | ||
| import { useContext } from 'react'; | ||
|
|
||
| import { useIdleActiveEvents } from './useIdleActiveEvents'; | ||
|
|
||
| export const useIdleConnection = () => { | ||
| const uid = useUserId(); | ||
| const { status } = useConnectionStatus(); | ||
| const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead'); | ||
| const { disconnect: disconnectServer, reconnect: reconnectServer } = useContext(ServerContext); | ||
juliajforesti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| const disconnect = useEffectEvent(() => { | ||
| if (status === 'offline') { | ||
| if (!uid && allowAnonymousRead !== true) { | ||
| disconnectServer(); | ||
| } | ||
| } | ||
juliajforesti marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }); | ||
|
|
||
| const reconnect = useEffectEvent(() => { | ||
| if (status === 'offline') { | ||
| reconnectServer(); | ||
| } | ||
| }); | ||
|
|
||
| useIdleActiveEvents({ id: 'useLoginPresence', time: 3000, awayOnWindowBlur: true }, disconnect, reconnect); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.