finish refactor

wakatime · Aug 27, 2024 · b84be60 · b84be60
1 parent 4d08aeb
commit b84be60
Show file tree

Hide file tree

Showing 10 changed files with 329 additions and 303 deletions.
diff --git a/src/background.ts b/src/background.ts
@@ -10,7 +10,7 @@ browser.alarms.onAlarm.addListener(async (alarm) => {
     // Checks if the user is online and if there are cached heartbeats requests,
     // if so then procedd to send these payload to wakatime api
     if (navigator.onLine) {
-      await WakaTimeCore.sendCachedHeartbeatsRequest();
+      await WakaTimeCore.sendHeartbeats();
     }
   }
 });
@@ -30,7 +30,6 @@ browser.tabs.onActivated.addListener(async (activeInfo) => {
  */
 browser.windows.onFocusChanged.addListener(async (windowId) => {
   if (windowId != browser.windows.WINDOW_ID_NONE) {
-    console.log('recording a heartbeat - active window changed');
     const tabs: browser.Tabs.Tab[] = await browser.tabs.query({
       active: true,
       currentWindow: true,

diff --git a/src/components/Options.tsx b/src/components/Options.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import config, { SuccessOrFailType } from '../config/config';
-import { IS_CHROME } from '../utils';
 import apiKeyInvalid from '../utils/apiKey';
+import { IS_CHROME } from '../utils/operatingSystem';
 import { getSettings, saveSettings, Settings } from '../utils/settings';
 import { logUserIn } from '../utils/user';
 import SitesList from './SitesList';

diff --git a/src/core/WakaTimeCore.ts b/src/core/WakaTimeCore.ts
@@ -5,9 +5,9 @@ import browser, { Tabs } from 'webextension-polyfill';
 import moment from 'moment';
 import { v4 as uuid4 } from 'uuid';
 import { OptionalHeartbeat } from '../types/sites';
-import { getOperatingSystem, IS_EDGE, IS_FIREFOX } from '../utils';
 import { changeExtensionStatus } from '../utils/changeExtensionStatus';
 import getDomainFromUrl, { getDomain } from '../utils/getDomainFromUrl';
+import { getOperatingSystem, IS_EDGE, IS_FIREFOX } from '../utils/operatingSystem';
 import { getSettings, Settings } from '../utils/settings';
 
 import config, { ExtensionStatus } from '../config/config';
@@ -149,6 +149,7 @@ class WakaTimeCore {
       entity: heartbeat?.entity ?? entity,
       id: uuid4(),
       language: heartbeat?.language,
+      plugin: heartbeat?.plugin,
       project: heartbeat?.project ?? '<<LAST_PROJECT>>',
       time: this.getCurrentTime(),
       type: heartbeat?.entityType ?? (settings.loggingType as EntityType),

diff --git a/src/types/heartbeats.ts b/src/types/heartbeats.ts
@@ -13,6 +13,7 @@ export enum Category {
   browsing = 'browsing',
   code_reviewing = 'code reviewing',
   coding = 'coding',
+  communicating = 'communicating',
   debugging = 'debugging',
   designing = 'designing',
   meeting = 'meeting',

diff --git a/src/types/sites.ts b/src/types/sites.ts
@@ -21,6 +21,7 @@ export interface OptionalHeartbeat {
   entity?: string;
   entityType?: EntityType;
   language?: string | null;
+  plugin?: string;
   project?: string | null;
 }
 

diff --git a/src/utils/changeExtensionStatus.ts b/src/utils/changeExtensionStatus.ts
@@ -1,6 +1,6 @@
 import browser from 'webextension-polyfill';
 import config, { ExtensionStatus } from '../config/config';
-import { IS_FIREFOX } from '.';
+import { IS_FIREFOX } from './operatingSystem';
 
 type ColorIconTypes = 'gray' | 'red' | 'white' | '';
 

diff --git a/src/utils/heartbeat.ts b/src/utils/heartbeat.ts
diff --git a/src/utils/index.ts → src/utils/operatingSystem.ts b/src/utils/index.ts → src/utils/operatingSystem.ts
@@ -2,17 +2,6 @@ export const IS_EDGE = navigator.userAgent.includes('Edg');
 export const IS_FIREFOX = navigator.userAgent.includes('Firefox');
 export const IS_CHROME = IS_EDGE === false && IS_FIREFOX === false;
 
-const CODE_REVIEW_URL_REG_LIST = [/github.com\/[^/]+\/[^/]+\/pull\/\d+\/files/];
-
-export const isCodeReviewing = (url: string): boolean => {
-  for (const reg of CODE_REVIEW_URL_REG_LIST) {
-    if (url.match(reg)) {
-      return true;
-    }
-  }
-  return false;
-};
-
 export const getOperatingSystem = (): Promise<string> => {
   return new Promise((resolve) => {
     chrome.runtime.getPlatformInfo(function (info) {