Update getting from black list with and without www

Author: Stigmatoz

src/compositions/black-list.ts

@@ -1,8 +1,10 @@
 import { injecStorage } from "../storage/inject-storage";
 import { StorageParams } from "../storage/storage-params";
+import { isDomainEquals } from "../utils/common";
+import { extractHostname } from "./extract-hostname";
 
 export async function isInBlackList(url: string): Promise<boolean>{
     const storage = injecStorage();
     const blackList = await storage.getValue(StorageParams.BLACK_LIST) as string[];
-    return blackList != undefined && blackList.indexOf(url) != -1 ? true : false;
+    return blackList?.find(x => isDomainEquals(extractHostname(x), extractHostname(url))) !== undefined;
 }

src/utils/common.ts

@@ -5,4 +5,20 @@ export function isEmpty(obj: any): boolean {
     }
 
     return JSON.stringify(obj) === JSON.stringify({});
+}
+
+export function isDomainEquals(first:string, second:string) {
+    if (first === second)
+        return true;
+    else {
+        var resultUrl = function(url:string) {
+            if (url.indexOf('www.') > -1)
+                return url.split('www.')[1];
+            return url;
+        };
+
+        if (resultUrl(first) === resultUrl(second))
+            return true;
+        else return false;
+    }
 }