Skip to content

Commit 6f7fb15

Browse files
committed
minor bug fix
1 parent c9c0ee7 commit 6f7fb15

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

bot.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG)
88

99
db = DBHelper()
10-
f = open("master.txt", "r")
11-
master = int(f.readline())
12-
if not master:
13-
logging.error("Error occurred, have you filled the master.txt file with your master id?")
14-
exit()
1510

1611

1712
handler = MessageHandler()
@@ -29,7 +24,8 @@
2924
# i found those code here https://apps.timwhitlock.info/emoji/tables/unicode :)
3025
emoji = {
3126
"moneybag": u'\U0001F4B0',
32-
"moneywings": u'\U0001F4B8'
27+
"moneywings": u'\U0001F4B8',
28+
"openhands": u'\U0001F450'
3329
}
3430

3531

@@ -70,16 +66,22 @@ def text_handler(text, chat_id):
7066
month = datetime.now().strftime("%m")
7167
rows = db.get_income(month)
7268
logging.info(rows)
73-
message = "Current month income list:\n\n"
74-
for r in rows:
75-
message = message + str(r).replace("(", "").replace(")", "").replace("'", "") + "\n"
69+
if rows:
70+
message = "Current month income list:\n\n"
71+
for r in rows:
72+
message = message + str(r).replace("(", "").replace(")", "").replace("'", "") + "\n"
73+
else:
74+
message = "No income to be displayed here " + emoji["openhands"]
7675
elif text == "/listoutcome":
7776
month = datetime.now().strftime("%m")
7877
rows = db.get_outcome(month)
7978
logging.info(rows)
80-
message = "Current month outcome list:\n\n"
81-
for r in rows:
82-
message = message+str(r).replace("(", "").replace(")", "").replace("'", "")+"\n"
79+
if rows:
80+
message = "Current month outcome list:\n\n"
81+
for r in rows:
82+
message = message+str(r).replace("(", "").replace(")", "").replace("'", "")+"\n"
83+
else:
84+
message = "No income to be displayed here " + emoji["openhands"]
8385
handler.send_message(message, chat_id)
8486

8587

messageHandler.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,17 @@
1515

1616
URL = "https://api.telegram.org/bot{}/".format(TOKEN)
1717

18+
f = open("master.txt", "r")
19+
master = int(f.readline())
20+
if not master:
21+
logging.error("Error occurred, have you filled the master.txt file with your master id?")
22+
exit()
23+
1824

1925
class MessageHandler:
2026

2127
def __init__(self):
22-
self.master = 58677785
28+
self.master = master
2329
self.allowed = [self.master]
2430

2531
#

0 commit comments

Comments
 (0)