From 14ca632137f731091e49faadaea677ccaa4ae0d7 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andis@fet.at>
Date: Fri, 1 Jan 2021 22:20:36 +0000
Subject: [PATCH] optz

---
 bot1/chats.py           | 2 +-
 bot1/users.py           | 3 ++-
 solrfet2020/__init__.py | 3 +--
 solrfet2020/convert.py  | 2 +-
 solrfet2020/utils.py    | 7 +++----
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bot1/chats.py b/bot1/chats.py
index 4c5fa0f..757efbe 100644
--- a/bot1/chats.py
+++ b/bot1/chats.py
@@ -22,7 +22,7 @@ import logging
 
 logger = logging.getLogger()
 from misc import SaveFileMapping, SaveFileObject
-from lxml.html.clean import clean_html, Cleaner
+#from lxml.html.clean import clean_html, Cleaner
 import settings
 solr = SolrFet2020()
 
diff --git a/bot1/users.py b/bot1/users.py
index 8bee7e5..15e6757 100644
--- a/bot1/users.py
+++ b/bot1/users.py
@@ -1,6 +1,7 @@
 from misc import SaveFileMapping, SaveFileObject
 from dataclasses import dataclass
 from pytgbot.api_types.receivable.updates import Update
+import lazymappingstorage
 
 def get_from_id(update):
     if update.message and update.message.to_array():
@@ -38,7 +39,7 @@ class User(SaveFileObject):
 
 
 class UserManager(SaveFileMapping):
-    def __init__(self):
+    def __init__(self,file="users.yaml"):
         super().__init__(file="users.yaml")
         self.from_file()
 
diff --git a/solrfet2020/__init__.py b/solrfet2020/__init__.py
index 07b037f..518d6b6 100644
--- a/solrfet2020/__init__.py
+++ b/solrfet2020/__init__.py
@@ -1,4 +1,3 @@
-from lxml.html.clean import clean_html, Cleaner
 
 import settings
 
@@ -49,5 +48,5 @@ class SolrFet2020:
         )
 
         links = result_to_object(r)
-        # print(yaml.dump(r))
+
         return links, r.hits
diff --git a/solrfet2020/convert.py b/solrfet2020/convert.py
index bf3d342..09940ca 100644
--- a/solrfet2020/convert.py
+++ b/solrfet2020/convert.py
@@ -1,4 +1,4 @@
-from lxml.html.clean import clean_html, Cleaner
+#from lxml.html.clean import clean_html, Cleaner
 from bs4 import BeautifulSoup
 
 
diff --git a/solrfet2020/utils.py b/solrfet2020/utils.py
index 5a05eb3..195812c 100644
--- a/solrfet2020/utils.py
+++ b/solrfet2020/utils.py
@@ -1,11 +1,10 @@
 from lxml.html.clean import clean_html, Cleaner
 from fet2020api import fet2020postapi, fet2020memberapi
 from urllib.parse import urljoin,urlparse
-from . import env
+import settings
 
-
-fet=fet2020postapi(urljoin(env('TARGET'),"api/posts/"))
-fetmember=fet2020memberapi(urljoin(env('TARGET'),"api/members/"))
+fet=fet2020postapi(urljoin(settings.TARGET,"api/posts/"))
+fetmember=fet2020memberapi(urljoin(settings.TARGET,"api/members/"))
 
 
 def replace_special(t):