From 9fc39c77f66bd941a8e1e977966d84e22cee10ed Mon Sep 17 00:00:00 2001
From: Sebastian Velez <sebasvelez@gmail.com>
Date: Mon, 8 May 2023 16:37:19 -0500
Subject: [PATCH] check the domains by removing the subdomain

---
 src/core/WakaTimeCore.ts      |  4 ++--
 src/utils/getDomainFromUrl.ts | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/core/WakaTimeCore.ts b/src/core/WakaTimeCore.ts
index b12a2dd..f5f256b 100644
--- a/src/core/WakaTimeCore.ts
+++ b/src/core/WakaTimeCore.ts
@@ -12,7 +12,7 @@ import { IS_FIREFOX, generateProjectFromDevSites } from '../utils';
 import { getApiKey } from '../utils/apiKey';
 import changeExtensionState from '../utils/changeExtensionState';
 import contains from '../utils/contains';
-import getDomainFromUrl, { getDomainFromUrlWithoutProtocol } from '../utils/getDomainFromUrl';
+import getDomainFromUrl, { getDomain } from '../utils/getDomainFromUrl';
 
 class WakaTimeCore {
   tabsWithDevtoolsOpen: Tabs.Tab[];
@@ -156,7 +156,7 @@ class WakaTimeCore {
         }
       }
 
-      const hostname = getDomainFromUrlWithoutProtocol(url).replace('www.', '');
+      const hostname = getDomain(url);
       if (!items.trackSocialMedia) {
         if ((items.socialMediaSites as string[]).includes(hostname)) {
           return changeExtensionState('blacklisted');
diff --git a/src/utils/getDomainFromUrl.ts b/src/utils/getDomainFromUrl.ts
index 8f19f4f..9c1f35a 100644
--- a/src/utils/getDomainFromUrl.ts
+++ b/src/utils/getDomainFromUrl.ts
@@ -10,8 +10,12 @@ export default function getDomainFromUrl(url: string): string {
 /**
  * Returns domain from given URL.
  */
-export function getDomainFromUrlWithoutProtocol(url: string): string {
-  const parts = url.split('/');
+export function getDomain(url: string): string {
+  const splittedUrl = url.replace(/(https?:\/\/)?(www.)?/i, '').split('.');
+  const domain = splittedUrl.slice(splittedUrl.length - 2).join('.');
+  if (domain.includes('/')) {
+    return domain.split('/')[0];
+  }
 
-  return parts[2];
+  return domain;
 }