update

3 files changed, 8 insertions, 16 deletions

diff --git a/mgs.py b/mgs.py
index d63aea5..b750473 100644
--- a/mgs.py
+++ b/mgs.py
@@ -1,5 +1,4 @@
 import requests, textract, re, os, tempfile, random, string
-from argparse import ArgumentParser
 from bs4 import BeautifulSoup
 from typing import List, Dict
 
diff --git a/requirements.txt b/requirements.txt
index e5d29c3..2ba644c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 requests~=2.25.1
 textract~=1.6.3
 beautifulsoup4~=4.8.0
-jstate~=0.0.4
\ No newline at end of file
+ch1p~=0.0.3
diff --git a/telegram_notify.py b/telegram_notify.py
index 46c2854..d825ea5 100644
--- a/telegram_notify.py
+++ b/telegram_notify.py
@@ -1,16 +1,8 @@
-import requests, traceback
+import traceback
 from mgs import MGSPiracy
 from argparse import ArgumentParser
-from jstate import JState
-
-
-def send(text: str, token: str, chat_id: int):
-    r = requests.post('https://api.telegram.org/bot%s/sendMessage' % token, data={
-        'chat_id': chat_id,
-        'text': text
-    })
-    if r.status_code != 200:
-        print('error: telegram returned code %d' % r.status_code)
+from ch1p import State, telegram_notify
+from html import escape
 
 
 if __name__ == '__main__':
@@ -22,6 +14,7 @@ if __name__ == '__main__':
     parser.add_argument('--from', type=int, default=1, help='First page', dest='_from')
     parser.add_argument('--to', type=int, default=5, help='Last page')
     parser.add_argument('--domains', nargs='+', required=True)
+
     args = parser.parse_args()
 
     try:
@@ -30,7 +23,7 @@ if __name__ == '__main__':
         cases = mgs.get_cases()
 
         # read state
-        jst = JState(args.state_file, default=dict(cases=[]))
+        jst = State(file=args.state_file, default=dict(cases=[]))
         data = jst.read()
 
         # loop through cases
@@ -57,6 +50,6 @@ if __name__ == '__main__':
             text = '\n'.join(results)
             text = 'new mos-gorsud findings:\n' + text
 
-            send(text=text, token=args.token, chat_id=args.chat_id)
+            telegram_notify(text=escape(text), parse_mode='HTML', token=args.token, chat_id=args.chat_id)
     except:
-        send(text='error: '+traceback.format_exc(), token=args.token, chat_id=args.chat_id)
\ No newline at end of file
+        telegram_notify(text='error: '+escape(traceback.format_exc()), parse_mode='HTML', token=args.token, chat_id=args.chat_id)
\ No newline at end of file