fix spelling

bot/app/__main__.py

@@ -57,7 +57,7 @@
     setup_web_app('ping')
     setup_web_app('prom_alert')
 
-    from callback_query_handlers import main_menu, subscribtions, accounts, misc, support
+    from callback_query_handlers import main_menu, subscriptions, accounts, misc, support
     from middlewares import acl
 
     web_runner = web.AppRunner(web_app)

bot/app/callback_query_handlers/main_menu.py

@@ -14,7 +14,7 @@ async def main_menu(message: Message):
 
     menu = MenuBuilder()
     menu.button(text="Open Grafana", url=grafana_url) + "size=1"
-    menu.button(text="Manage Subscribtions", callback_data=CbData(dst="sub_menu", data="", id=0).pack()) + "size=1"
+    menu.button(text="Manage Subscriptions", callback_data=CbData(dst="sub_menu", data="", id=0).pack()) + "size=1"
     menu.button(text="Help", callback_data=CbData(dst='support_menu', data="", id=0).pack()) + "size=1"
     menu.build()
 

bot/app/callback_query_handlers/subscribtions.py → bot/app/callback_query_handlers/subscriptions.py

@@ -7,7 +7,7 @@
 from callback_data.main import CbData
 from utils.menu_builder import MenuBuilder
 from utils.alerts import Alerts
-from forms.subscribtions import Form
+from forms.subscriptions import Form
 import re
 
 @router.callback_query(CbData.filter(F.dst == 'sub_menu'))
@@ -20,7 +20,7 @@ async def sub_menu(query: CallbackQuery):
 
     menu = MenuBuilder()
 
-    menu.button(text='📨 My Subscribtions', callback_data=CbData(dst="sub_manage", data="", id=0).pack()) + "size=1"
+    menu.button(text='📨 My Subscriptions', callback_data=CbData(dst="sub_manage", data="", id=0).pack()) + "size=1"
     menu.button(text="⚙️  My accounts", callback_data=CbData(dst="acc_menu", data="", id=0).pack()) + "size=1"
     menu.button(text="⬅️  Back", callback_data=CbData(dst="main_menu", data="", id=0).pack()) + "size=2"
 
@@ -155,7 +155,7 @@ async def sub_edit(query: CallbackQuery, state: FSMContext):
     mandatory_filters = alerts.get_variables(template=template)
 
     if isinstance(d, dict) and len(d.keys()) == 0:
-        await state.set_state(Form.subscribtions)
+        await state.set_state(Form.subscriptions)
 
         check_list = {'id': uniqueid, 'check_list':{i:{'data': 'undefined', 'emoji': '❌ '} for i in mandatory_filters if i != 'chat_id'}}
 
@@ -388,7 +388,7 @@ async def sub_save(query: CallbackQuery, state: FSMContext):
 
     alerts.add_rule(uniqueid=uniqueid, check_list=check_list, template=template)
 
-    await query.answer('Subscribtion has been added')
+    await query.answer('Subscription has been added')
     await sub_manage(query,state)
 
 @router.callback_query(CbData.filter(F.dst == 'sub_delete'))
@@ -400,5 +400,5 @@ async def sub_delete(query: CallbackQuery, state: FSMContext):
 
     alerts.delete_rule(uniqueid=uniqueid)
 
-    await query.answer('Subscribtion has been deleted')
+    await query.answer('Subscription has been deleted')
     await sub_manage(query,state)

bot/app/forms/subscribtions.py → bot/app/forms/subscriptions.py

@@ -1,4 +1,4 @@
 from aiogram.filters.state import State, StatesGroup
 
 class Form(StatesGroup):
-    subscribtions = State()
+    subscriptions = State()

bot/app/web_apps/prom_alert.py

@@ -11,8 +11,11 @@ async def handler(request: Request):
     a = await request.json()
     print(yaml.dump(a))
 
-    if isinstance(a, dict) and 'alerts' in a.keys(): 
-        chat_id = int(a['commonLabels']['chat_id'])
+    if isinstance(a, dict) and 'alerts' in a.keys():
+        try:
+            chat_id = int(a['commonLabels']['chat_id'])
+        except KeyError:
+            return web.Response(status=401)
         promalert_status = db.get_records('promalert_status', 'id', chat_id)
 
         if promalert_status == 'on':