kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check the domains by removing the subdomain

Browse Source
This commit is contained in:
Sebastian Velez
2023-05-08 16:37:19 -05:00
parent a368c66514
commit 9fc39c77f6
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/WakaTimeCore.ts
View File

@@ -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');

10
src/utils/getDomainFromUrl.ts
View File

@@ -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;
}