Merge pull request #70 from dark0ghost/beta

update aiogram version, clean dead code

Author: dark0ghost

Makefile

@@ -1,4 +1,3 @@
 
-
 start :
-	docker run  postgres redis bot
+	docker-compose run -d postgres redis bot

config.json

@@ -69,5 +69,9 @@
   "proxy_use": false,
   "wallet": {
     "ton": ""
+  },
+  "master": "",
+  "etcherscan":{
+    "token": ""
   }
 }

core.py

@@ -1,53 +1,48 @@
 # This Python file uses the following encoding: utf-8
-import contextlib
+import logging
 import os
-
 from typing import List
 
-import typing
-
-import helps
 import aiohttp
-import logging
-import filter
-
-from modules.com.pastebin import Pastebin
-from modules import async_proxy, button, keyboard, i18n, CbApi, CryptoPrice, CheckerEmail, CatApi, IoJsonBox, db_pg, etherscan
+from aiogram import Bot, Dispatcher, types
 from aiogram.contrib.fsm_storage.memory import MemoryStorage
 from aiogram.contrib.fsm_storage.redis import RedisStorage2
-from aiogram import Bot, Dispatcher, types
-from aiosocksy.connector import ProxyConnector, ProxyClientRequest
 from aiogram.contrib.middlewares.logging import LoggingMiddleware
 from aiogram.utils.callback_data import CallbackData
+from aiograph import Telegraph
+from aiosocksy.connector import ProxyConnector, ProxyClientRequest
 
-from State import States
-from modules.com.virustotal.Virustotal import Virustotal
-from modules.org.ton.TON import TON
+import filter
+import helps
+from modules import async_proxy, 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
+from modules.org.ton.ton import TON
 from modules.qrtag import QrTag
 from set_loop import loop
-from aiograph import Telegraph
+from state import States
 
 print("build")
 # start set
 postgres = db_pg.Postgres()
 
 BASE_DIR: str = (os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + "/bot"
 
-checker_mail: CheckerEmail.CheckerEmail = CheckerEmail.CheckerEmail(hostname_mail=helps.smtp_host,
-                                                                    port=helps.smtp_port, password=helps.smtp_password,
-                                                                    login=helps.smtp_login)
-
+checker_mail: checker_email.CheckerEmail = checker_email.CheckerEmail(hostname_mail=helps.smtp_host,
+                                                                      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: IoJsonBox = IoJsonBox.IOJsonBox(session)
+io_json_box: io_json_box = io_json_box.IOJsonBox(session)
 
-crypto_price: CryptoPrice.CryptoPrice = CryptoPrice.CryptoPrice(session)
+crypto_price = crypto_price.CryptoPrice(session)
 
-catApi = CatApi.CatApi(session=session)
+catApi = cat_api.CatApi(session=session)
 
 ether_api: etherscan.EtherScan = etherscan.EtherScan(api_key=helps.ether_api, session=session)
 
@@ -56,11 +51,11 @@
 
 proxy_use: str = helps.proxy_use
 
-pastebin: Pastebin = Pastebin.Pastebin(token=helps.pastebian, session=session)
+pastebin: pastebin = pastebin.Pastebin(token=helps.pastebian, session=session)
 
 ton = TON(session=session)
 
-cb = CbApi.CenterBankApi(session)
+cb = ab_api.CenterBankApi(session)
 
 logging.basicConfig(filename="log_base.log", level=logging.INFO)
 
@@ -101,27 +96,26 @@
 
 
 # start def
-
 async def setproxy() -> None:
     """
     check  proxy and add to list
     @return:
     """
-    proxy_list = []
+    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_list.append(proxy)
+                    proxy_box.append(proxy)
 
         except Exception as e:
             logging.exception(e)
             log.info(f"warning {proxy} not valid")
 
-    if len(proxy_list) < 2:
+    if len(proxy_box) < 2:
         log.info(f"log new rec")
         await setproxy()
 
@@ -134,12 +128,9 @@ async def task():
     """
     bind = await postgres.connect(url=helps.POSTGRES)
     await telegraph.create_account((await bot.get_me())["first_name"])
-    # await postgres.make_migrate()
 
 
 # end def
-
-
 if proxy_use:
     bot = Bot(token=helps.token, loop=loop,
               parse_mode=types.ParseMode.HTML,
@@ -156,11 +147,8 @@ async def task():
 
 
 # end set
-
-
 async def shutdown(dispatcher: Dispatcher):
     """
-
     :param dispatcher:
     :return:
     """

filter.py

@@ -1,5 +1,3 @@
-from abc import ABC
-
 from aiogram import types
 from aiogram.dispatcher.filters import BoundFilter
 import helps

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, session, Button
+from core import dp, bot, lazy_get_text, cb as bank_api, crypto_price, proxy_class, Button
 
 
 @dp.inline_handler()

handlers/message_handler.py

@@ -18,15 +18,13 @@
 
 @dp.message_handler(commands=['start'])
 async def process_start_command(message: types.Message) -> None:
-    m = message.get_args()
     await State.get_mail.set()
     await bot.send_message(message.chat.id, text=helps.mes['start'],
                            reply_markup=keyboard.keyboard_all(lazy_get_text("отмена")))
 
 
 @dp.message_handler(commands=['language'])
 async def cmd_language(message: types.Message, state: FSMContext) -> None:
-    # track('command', message.from_user, command='language')
     await state.set_state('wait_language')
     await message.reply(
         lazy_get_text('Choose the language in which you are more comfortable to communicate'),
@@ -38,7 +36,6 @@ async def cmd_language(message: types.Message, state: FSMContext) -> None:
 async def wait_language(message: types.Message, state: FSMContext, user: User) -> None:
     # track('command', message.from_user, command='done_language')
     if message.text in lang:
-        # await user.set_language(message.text)
         lazy_get_text.ctx_locale.set(message.text)
         await message.reply(lazy_get_text('New language is: <b>English</b>'), reply_markup=types.ReplyKeyboardRemove())
         await state.finish()
@@ -95,7 +92,6 @@ async def buy(message: types.Message) -> None:
                            photo_height=512,  # !=0/None or picture won't be shown
                            photo_width=512,
                            photo_size=512,
-                           # is_flexible=1,  # True If you need to set up Shipping Fee
                            prices=price.price,
                            start_parameter='time-machine-example',
                            payload='HAPPY FRIDAYS COUPON')

handlers/shoping_handler.py

@@ -1,13 +1,11 @@
 # This Python file uses the following encoding: utf-8
-from core import dp,bot
+from core import dp, bot
 from aiogram import types
 
-
 import price
 
 
-
 @dp.shipping_query_handler()
 async def shipping(shipping_query: types.ShippingQuery):
     await bot.answer_shipping_query(shipping_query.id, ok=True, shipping_options=price.shipping_options,
-                                    error_message=f'доставка не работает!')
+                                    error_message=f'доставка не работает!')

helps.py

@@ -9,7 +9,7 @@
 from typing import Tuple, Dict, Union, Any
 
 # or config.json
-with open("config_pro.json", "r") as file:
+with open("config.json", "r") as file:
     file_dict: Dict[str, str] = json.loads(file.read())
 
 token: str = file_dict["token"]

modules/__init__.py

@@ -1,3 +1,3 @@
-from modules import IoJsonBox, CatApi, CheckerEmail, CryptoPrice
+from modules import io_json_box, cat_api, checker_email, crypto_price
 
-__all__ = [IoJsonBox.IOJsonBox, CheckerEmail.CheckerEmail, CatApi.CatApi, CryptoPrice.CryptoPrice]
+__all__ = [io_json_box.IOJsonBox, checker_email.CheckerEmail, cat_api.CatApi, crypto_price.CryptoPrice]