From 3b7aea9ce4e267aa4688ea0cae4daf59a79a1394 Mon Sep 17 00:00:00 2001
From: Softonik <softonik@ro.ru>
Date: Sat, 2 Mar 2024 04:15:56 +0300
Subject: [PATCH] =?UTF-8?q?Sharedlib:=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D0=B8=202=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0-=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C:=20=D0=BE=D0=B1=D1=89?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D0=B8=20=D0=BB=D0=B8=D1=87=D0=BD=D1=8B=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/sharedlib/lib.go     | 21 ---------------------
 pkg/sharedlib/storage.go | 23 ++++++++++++++---------
 2 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 pkg/sharedlib/lib.go

diff --git a/pkg/sharedlib/lib.go b/pkg/sharedlib/lib.go
deleted file mode 100644
index 346cf09..0000000
--- a/pkg/sharedlib/lib.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import "strings"
-
-func isBlackListed(s string) bool {
-	for _, b := range *blockedList_case.GetList() {
-		if strings.Contains(s, b) {
-			return true
-		}
-	}
-
-	s_low := strings.ToLower(s)
-	for _, b := range *blockedList.GetList() {
-		b = strings.ToLower(b)
-		if strings.Contains(s_low, b) {
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/pkg/sharedlib/storage.go b/pkg/sharedlib/storage.go
index 4d8b525..bebd131 100644
--- a/pkg/sharedlib/storage.go
+++ b/pkg/sharedlib/storage.go
@@ -2,31 +2,36 @@ package main
 
 import (
 	"log"
+	"my/ktgo/pkg/filter"
 	"my/ktgo/pkg/storage"
 )
 
 const (
-	DataDir                  = "/data"
-	BlockedListFileName      = DataDir + "/blocked_list.txt"
-	BlockedListFileName_case = DataDir + "/blocked_list_case.txt"
+	DataDir                   = "/data"
+	BlockedListFileName       = DataDir + "/blocked_list.txt"
+	BlockedListFileNameShared = DataDir + "/shared_blocked_list.txt"
 )
 
 var (
-	blockedList, blockedList_case *storage.Storage
+	blockLists []*storage.Storage
 )
 
 func initStorage() {
-	var err error
-
-	blockedList, err = storage.NewStorage(BlockedListFileName)
+	l, err := storage.NewStorage(BlockedListFileName)
 	if err != nil {
 		log.Fatalf("Storage: %v: %v\n", BlockedListFileName, err)
 		return
 	}
+	blockLists = append(blockLists, l)
 
-	blockedList_case, err = storage.NewStorage(BlockedListFileName_case)
+	l, err = storage.NewStorage(BlockedListFileNameShared)
 	if err != nil {
-		log.Fatalf("Storage: %v: %v\n", BlockedListFileName, err)
+		log.Fatalf("Storage: %v: %v\n", BlockedListFileNameShared, err)
 		return
 	}
+	blockLists = append(blockLists, l)
+}
+
+func isBlackListed(s string) bool {
+	return filter.IsListed(&blockLists, s)
 }