Hexor/conf_bot
1
0
Fork 0
mirror of https://github.com/house-of-vanity/conf_bot.git synced 2025-07-06 14:24:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix logging. Update cert gen script.

Browse Source
This commit is contained in:
AB
2019-10-29 15:12:53 +00:00
parent e09ffd6fa6
commit 7f1f542be2
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/cert.sh
View File

@ -1,2 +1,2 @@
openssl req -newkey rsa:2048 -sha256 -nodes -keyout cert.key -x509 -days 3650 -out cert.pem -subj "/C=US/ST=New York/L=Brooklyn/O=Example Brooklyn Company/CN=des.hexor.ru" openssl req -newkey rsa:2048 -sha256 -nodes -keyout cert.key -x509 -days 3650 -out cert.pem -subj "/C=US/ST=New York/L=Brooklyn/O=Example Brooklyn Company/CN=des-rkn.hexor.ru"

3
webhook.py
View File

@ -30,7 +30,6 @@ class RequestHandler(SimpleHTTPRequestHandler):
length = self.headers.get('content-length') length = self.headers.get('content-length')
post_body = self.rfile.read(int(length)) post_body = self.rfile.read(int(length))
print(post_body)
msg = json.loads(post_body.decode("utf-8")) msg = json.loads(post_body.decode("utf-8"))
self.worker.handleUpdate(msg) self.worker.handleUpdate(msg)
@ -42,7 +41,7 @@ class WebHook:
def __init__(self, def __init__(self,
certfile, certfile,
keyfile, keyfile,
address='0.0.0.0', address=settings.parser.get('bot', 'bind_address'),
port=8443, port=8443,
RequestHandler=RequestHandler): RequestHandler=RequestHandler):

14
worker.py
View File

@ -76,7 +76,11 @@ class MessageWorker:
def handleUpdate(self, msg): def handleUpdate(self, msg):
try: try:
input_message = msg['message']['text'] try:
input_message = msg['message']['text']
except KeyError as excp:
print(f"KeyError: {excp}")
return True
if input_message == '/help': if input_message == '/help':
conf_id = msg['message']['chat']['id'] conf_id = msg['message']['chat']['id']
user_id = msg['message']['from']['id'] user_id = msg['message']['from']['id']
@ -97,9 +101,9 @@ class MessageWorker:
""" """
self.send(id=conf_id, msg=msg) self.send(id=conf_id, msg=msg)
if ('@here' in input_message) or (' @'+self.me['result']['username'] in input_message): if ('@here' in input_message) or (' @'+self.me['result']['username'] in input_message):
if str(msg['message']['chat']['id']) != "-1001233797421": # if str(msg['message']['chat']['id']) != "-1001233797421":
print("@here isn't available for '%s' (%s)" % (msg['message']['chat']['title'], msg['message']['chat']['id'])) # print("@here isn't available for '%s' (%s)" % (msg['message']['chat']['title'], msg['message']['chat']['id']))
return # return
conf_id = msg['message']['chat']['id'] conf_id = msg['message']['chat']['id']
user_id = msg['message']['from']['id'] user_id = msg['message']['from']['id']
if msg['message']['chat']['type'] == 'private': if msg['message']['chat']['type'] == 'private':
@ -352,7 +356,7 @@ class MessageWorker:
data = {'chat_id': id} data = {'chat_id': id}
files = {'photo': open('code.png', 'rb')} files = {'photo': open('code.png', 'rb')}
r = requests.post(url, files=files, data=data) r = requests.post(url, files=files, data=data)
print(r) #print(r)
except Exception as e: except Exception as e:
print(e) print(e)