Merge pull request #71 from dark0ghost/beta

Beta

Author: dark0ghost

README.md

@@ -3,6 +3,7 @@
 [![GitHub issues](https://img.shields.io/github/issues/dark0ghost/async_py_bot)](https://github.com/dark0ghost/async_py_bot/issues)
 [![GitHub release](https://img.shields.io/github/release/dark0ghost/async_py_bot)](https://github.com/dark0ghost/async_py_bot/releases/)
 [![Github all releases](https://img.shields.io/github/downloads/dark0ghost/async_py_bot/total.svg)](https://github.com/dark0ghost/async_py_bot/releases/)
+[![GitHub code size](https://img.shields.io/github/languages/code-size/dark0ghost/async_py_bot?style=flat)](https://github.com/dark0ghost/async_py_bot)
 
 # start with docker-compose:
 ```bash

bot.evn

@@ -0,0 +1,13 @@
+TOKEN=""
+PAYMENTS_PROVIDER_TOKEN=""
+TOKEN_QIWI=""
+POSTGRES=""
+virustotal=""
+etcherscan=""
+pastebin=""
+cat_api=""
+STATS_DB=""
+STATS_HOST=""
+STATS_USER=""
+STATS_PASS=""
+MASTER=""

config.json

@@ -1,8 +1,4 @@
 {
-  "token": "",
-  "PAYMENTS_PROVIDER_TOKEN":"",
-  "TOKEN_QIWI": "",
-  "POSTGRES": "",
   "lang":["ru","en"],
   "mes": {
     "start": "message start",
@@ -12,7 +8,6 @@
     "buy": "покупка произведена успешно",
     "error_pay": "покупка не произошла"
   },
-  "good_proxy_link": "",
   "login": {
     "login": "",
     "password": ""
@@ -61,17 +56,5 @@
     "host": "",
     "port": 6379
   },
-  "cat_api": {
-    "token": ""
-  },
-  "pastebin": "",
-  "virustotal": "",
-  "proxy_use": false,
-  "wallet": {
-    "ton": ""
-  },
-  "master": "",
-  "etcherscan":{
-    "token": ""
-  }
+  "master": ""
 }

core.py

@@ -9,12 +9,11 @@
 from aiogram.contrib.fsm_storage.redis import RedisStorage2
 from aiogram.contrib.middlewares.logging import LoggingMiddleware
 from aiogram.utils.callback_data import CallbackData
-from aiograph import Telegraph
 from aiosocksy.connector import ProxyConnector, ProxyClientRequest
 
 import filter
 import helps
-from modules import async_proxy, button, keyboard, i18n, ab_api, crypto_price, checker_email, cat_api, io_json_box, \
+from modules import button, keyboard, i18n, ab_api, crypto_price, checker_email, cat_api, io_json_box, \
     db_pg, etherscan
 from modules.com.pastebin import pastebin
 from modules.com.virustotal.virustotal import Virustotal
@@ -30,12 +29,11 @@
 BASE_DIR: str = (os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + "/bot"
 
 checker_mail: checker_email.CheckerEmail = checker_email.CheckerEmail(hostname_mail=helps.smtp_host,
-                                                                      port=helps.smtp_port, password=helps.smtp_password,
+                                                                      port=helps.smtp_port,
+                                                                      password=helps.smtp_password,
                                                                       login=helps.smtp_login)
 checker_mail.change_len_code(new_len_code=5)
 
-telegraph = Telegraph()
-
 session: aiohttp.ClientSession = aiohttp.ClientSession()
 
 io_json_box: io_json_box = io_json_box.IOJsonBox(session)
@@ -46,11 +44,8 @@
 
 ether_api: etherscan.EtherScan = etherscan.EtherScan(api_key=helps.ether_api, session=session)
 
-
 debug = True
 
-proxy_use: str = helps.proxy_use
-
 pastebin: pastebin = pastebin.Pastebin(token=helps.pastebian, session=session)
 
 ton = TON(session=session)
@@ -75,17 +70,14 @@
 
 posts_cb: CallbackData = CallbackData('post', 'id', 'action')
 
-Button.posts_cb= posts_cb
+Button.posts_cb = posts_cb
 
-Base_filter: filter.Base_bot_filter = filter.Base_bot_filter()
 Master_filter: filter.MasterFilter = filter.MasterFilter()
 
 lazy_get_text: i18n.lazy_gettext = i18n.lazy_gettext
 
 lang: List[str] = []
 
-proxy_class = async_proxy.Proxy(session=session)
-
 """
 check debug on debug mode
 """
@@ -96,29 +88,6 @@
 
 
 # start def
-async def setproxy() -> None:
-    """
-    check  proxy and add to list
-    @return:
-    """
-    proxy_box = []
-    connector = ProxyConnector()
-    li = await proxy_class.main()
-    for proxy in li:
-        try:
-            async with aiohttp.ClientSession(connector=connector, request_class=ProxyClientRequest) as session:
-                async with session.get("https://www.telegram.org", proxy=proxy) as response:
-                    log.debug(f"{proxy} valid")
-                    proxy_box.append(proxy)
-
-        except Exception as e:
-            logging.exception(e)
-            log.info(f"warning {proxy} not valid")
-
-    if len(proxy_box) < 2:
-        log.info(f"log new rec")
-        await setproxy()
-
 
 async def task():
     """
@@ -127,17 +96,11 @@ async def task():
     @return:
     """
     bind = await postgres.connect(url=helps.POSTGRES)
-    await telegraph.create_account((await bot.get_me())["first_name"])
 
 
 # end def
-if proxy_use:
-    bot = Bot(token=helps.token, loop=loop,
-              parse_mode=types.ParseMode.HTML,
-              proxy=helps.good_proxy_link, proxy_auth=helps.login)
-else:
-    bot = Bot(token=helps.token, loop=loop,
-              parse_mode=types.ParseMode.HTML)
+bot = Bot(token=helps.token, loop=loop,
+          parse_mode=types.ParseMode.HTML)
 
 dp = Dispatcher(bot, storage=storage)
 dp.middleware.setup(LoggingMiddleware())

docker-compose.yml

@@ -6,6 +6,8 @@ services:
       context: .
       dockerfile:
         Dockerfile
+    env_file:
+       bot.evn
     restart:
        on-failure
     volumes:
@@ -23,7 +25,6 @@ services:
     ports:
         - 5432:5432
 
-
   redis:
     container_name: redis
     image:
@@ -40,6 +41,30 @@ services:
       - ../data/redis:/data
     restart: always
 
+  influxdb:
+    image: influxdb:1.8-alpine
+    container_name: "influxdb"
+    restart: always
+    volumes:
+      - "influxdb:/var/lib/influxdb"
+    environment: # см. файл .env (в репозитории - .env_dist)
+      - INFLUXDB_DB=${DB}
+      - INFLUXDB_ADMIN_USER=${DB_ADMIN_USER}  # Этот юзер нужен для создания базы
+      - INFLUXDB_ADMIN_USER_PASSWORD=${DB_ADMIN_PASS}
+      - INFLUXDB_USER=${DB_USER}  # Этот юзер для записи в БД и чтения со стороны Grafana
+      - INFLUXDB_USER_PASSWORD=${DB_PASS}
+      - INFLUXDB_HTTP_AUTH_ENABLED=true
+
+  grafana:
+      image: grafana/grafana:7.3.4
+      container_name: "grafana"
+      volumes:
+        - "grafana-data:/var/lib/grafana"
+      environment:
+        - GF_DATE_FORMATS_DEFAULT_TIMEZONE=browser
+      ports:
+        - "3000:3000"
+
   adminer:
     image:
        adminer

filter.py

@@ -1,23 +1,17 @@
+import os
+
 from aiogram import types
 from aiogram.dispatcher.filters import BoundFilter
-import helps
-
-
-class Base_bot_filter(BoundFilter):
-    key = 'is_master'
-
-    def __init__(self, is_admin=False):
-        self.is_admin = is_admin
-
-    async def check(self, message: types.Message):
-        pass
 
 
 class MasterFilter(BoundFilter):
     key = 'is_master'
 
     def __init__(self, is_admin=False):
         self.is_admin = is_admin
+        self.master = os.environ.get("MASTER")
 
     def check(self, message: types.Message):
-        return message.chat.id == helps.master
+        return message.chat.id == self.master
+
+

handlers/callback_handlers.py

@@ -3,23 +3,9 @@
 from aiogram import types
 
 import helps
-from core import posts_cb, proxy_list, Button, dp, pastebin, io_json_box, postgres, proxy_class
+from core import posts_cb, dp, pastebin, io_json_box, postgres
 from modules.db_pg import PastebinTable
-
-
-@dp.callback_query_handler(posts_cb.filter(action=['edit']))
-async def back(query: types.CallbackQuery):
-    """
-    :param query:
-    :return:
-    """
-    if len(proxy_list) < 1:
-        [proxy_list.append(i) for i in await proxy_class.main()]
-
-    await query.message.edit_text(text=helps.mes["new_proxy"],
-                                      reply_markup=Button.edit_proxy(text_button="не работает?", proxy=proxy_list[0],
-                                                                     callback="edit"))
-    proxy_list.pop(0)
+from modules.stat import detect, Command
 
 
 @dp.callback_query_handler(posts_cb.filter(action=["pastebin"]))
@@ -35,7 +21,7 @@ async def pastebin_(query: types.CallbackQuery) -> None:
 async def json_box(query: types.CallbackQuery):
     await postgres.connect(helps.POSTGRES)
     text = await PastebinTable.select("paste").where(PastebinTable.chat_id == query.message.chat.id).gino.scalar()
-    print(text)
     await query.message.edit_text(await io_json_box.create_box(
         text=text))
     await text.delete()
+    await detect(query.from_user.id, Command.JSONBOX)

handlers/inline_handlers.py

@@ -5,7 +5,7 @@
 from aiogram.types import InlineQuery, \
     InputTextMessageContent, InlineQueryResultArticle
 
-from core import dp, bot, lazy_get_text, cb as bank_api, crypto_price, proxy_class, Button
+from core import dp, bot, lazy_get_text, cb as bank_api, crypto_price, Button
 
 
 @dp.inline_handler()
@@ -56,19 +56,7 @@ async def inline_echo(inline_query: InlineQuery) -> InlineQueryResultArticle:
             title=lazy_get_text('{name} {price} btc ').format(name=text, price=(1 / price)),
             input_message_content=input_content
         )
-    elif text == "proxy":
-        proxy_url = await proxy_class.main()
-
-        input_content = InputTextMessageContent(f"proxy for you {proxy_url[0]}")
-
-        item = InlineQueryResultArticle(
-            id=result_id,
-            title=f"{proxy_url[0]}",
-            input_message_content=input_content,
-            reply_markup=Button.proxy(proxy_url)
-        )
     else:
-
         input_content = InputTextMessageContent(
             lazy_get_text("нет такой валюты\nдоступные {name}").format(name=list(res.keys())))
         result_id: str = hashlib.md5(text.encode()).hexdigest()
@@ -77,7 +65,5 @@ async def inline_echo(inline_query: InlineQuery) -> InlineQueryResultArticle:
             title=lazy_get_text("нет такой валюты"),
             input_message_content=input_content
         )
-
     result_list.append(item)
-
     return await bot.answer_inline_query(inline_query.id, results=result_list, cache_time=1)