feat: implement an idle timeout

Co-authored-by: MRmlik12 <mrmlik12sup@gmail.com>

package.json

@@ -149,6 +149,11 @@
 						"type": "boolean",
 						"default": false,
 						"description": "Removes the View Repository button"
+					},
+					"discord.idleTimeout": {
+						"type": "number",
+						"default": 0,
+						"description": "Time (in seconds) to clear the presence when idling. 0 (the default) means no clearing"
 					}
 				}
 			}

src/activity.ts

@@ -49,7 +49,7 @@ export async function activity(previous: ActivityPayload = {}) {
 	const defaultLargeImageText = config[CONFIG_KEYS.LargeImageIdling];
 	const removeDetails = config[CONFIG_KEYS.RemoveDetails];
 	const removeLowerDetails = config[CONFIG_KEYS.RemoveLowerDetails];
-	const removeRemotRepository = config[CONFIG_KEYS.removeRemotRepository];
+	const removeRemoteRepository = config[CONFIG_KEYS.RemoveRemoteRepository];
 
 	const git = await getGit();
 
@@ -74,7 +74,7 @@ export async function activity(previous: ActivityPayload = {}) {
 		};
 	}
 
-	if (!removeRemotRepository && git?.repositories.length) {
+	if (!removeRemoteRepository && git?.repositories.length) {
 		let repo = git.repositories.find((repo) => repo.ui.selected)?.state.remotes[0].fetchUrl;
 
 		if (repo) {
@@ -84,6 +84,8 @@ export async function activity(previous: ActivityPayload = {}) {
 				...state,
 				buttons: [{ label: 'View Repository', url: repo }],
 			};
+
+			console.log(state);
 		}
 	}
 

src/constants.ts

@@ -56,5 +56,6 @@ export const enum CONFIG_KEYS {
 	RemoveDetails = 'removeDetails',
 	RemoveLowerDetails = 'removeLowerDetails',
 	RemoveTimestamp = 'removeTimestamp',
-	removeRemotRepository = 'removeRemoteRepository',
+	RemoveRemoteRepository = 'removeRemoteRepository',
+	IdleTimeout = 'idleTimeout',
 }

src/extension.ts

@@ -24,16 +24,25 @@ let rpc = new Client({ transport: 'ipc' });
 const config = getConfig();
 
 let state = {};
-let interval: NodeJS.Timeout;
+let interval: NodeJS.Timeout | undefined;
+let idle: NodeJS.Timeout | undefined;
 let listeners: { dispose(): any }[] = [];
 
 export function cleanUp() {
 	listeners.forEach((listener) => listener.dispose());
 	listeners = [];
-	clearInterval(interval);
+
+	if (interval) {
+		clearTimeout(interval);
+	}
 }
 
 async function sendActivity() {
+	if (interval) {
+		clearTimeout(interval);
+	}
+
+	interval = setTimeout(() => void sendActivity(), 5000);
 	state = {
 		...(await activity(state)),
 	};
@@ -51,7 +60,6 @@ async function login() {
 		statusBarIcon.tooltip = 'Connected to Discord';
 
 		void sendActivity();
-		interval = setInterval(() => void sendActivity(), 5000);
 		const onChangeActiveTextEditor = window.onDidChangeActiveTextEditor(() => sendActivity());
 		const onChangeTextDocument = workspace.onDidChangeTextDocument(throttle(() => sendActivity(), 1000));
 		const onStartDebugSession = debug.onDidStartDebugSession(() => sendActivity());
@@ -143,6 +151,28 @@ export async function activate(context: ExtensionContext) {
 		await login();
 	}
 
+	window.onDidChangeWindowState(async (windowState) => {
+		if (config[CONFIG_KEYS.IdleTimeout] !== 0) {
+			if (windowState.focused) {
+				if (idle) {
+					clearTimeout(idle);
+				}
+
+				await sendActivity();
+			} else {
+				// eslint-disable-next-line @typescript-eslint/no-misused-promises
+				idle = setTimeout(async () => {
+					if (interval) {
+						clearTimeout(interval);
+					}
+
+					state = {};
+					await rpc.clearActivity();
+				}, config[CONFIG_KEYS.IdleTimeout] * 1000);
+			}
+		}
+	});
+
 	try {
 		const gitExtension = extensions.getExtension<GitExtension>('vscode.git');
 		if (!gitExtension?.isActive) {

src/util.ts

@@ -24,6 +24,7 @@ type WorkspaceExtensionConfiguration = WorkspaceConfiguration & {
 	removeLowerDetails: boolean;
 	removeTimestamp: boolean;
 	removeRemoteRepository: boolean;
+	idleTimeout: number;
 };
 
 export function getConfig() {