Skip to content

Commit 9c91418

Browse files
brucewzj99brucewzj99
authored
added new google form (#50)
1 parent 98fab78 commit 9c91418

File tree

3 files changed

+37
-31
lines changed

3 files changed

+37
-31
lines changed

‎bot/telegram_bot.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def start(update, context):
7474
return CS.SET_UP
7575
except Exception as e:
7676
update.message.reply_text(
77-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
77+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
7878
)
7979
return ConversationHandler.END
8080

@@ -126,11 +126,11 @@ def set_up(update, context) -> int:
126126

127127
except GoogleSheetError as e:
128128
update.message.reply_text(
129-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
129+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
130130
)
131131
except DatabaseError as e:
132132
update.message.reply_text(
133-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
133+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
134134
)
135135
except Exception as e:
136136
update.message.reply_text(GSHEET_ERROR_TEXT)
@@ -207,7 +207,7 @@ def config_handler(update, context) -> int:
207207
return CS.CONFIG_SETUP
208208
except Exception as e:
209209
update.callback_query.message.reply_text(
210-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
210+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
211211
)
212212
return ConversationHandler.END
213213

@@ -228,7 +228,7 @@ def config_setup(update, context) -> int:
228228
return CS.CONFIG_CATEGORY
229229
except Exception as e:
230230
update.callback_query.message.reply_text(
231-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
231+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
232232
)
233233
return ConversationHandler.END
234234
update.callback_query.edit_message_text(END_TEXT, reply_markup=None)
@@ -264,7 +264,7 @@ def config_category(update, context) -> int:
264264
return CS.CONFIG_SUBCATEGORY
265265
except Exception as e:
266266
update.callback_query.reply_text(
267-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
267+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
268268
)
269269
return ConversationHandler.END
270270

@@ -288,7 +288,7 @@ def config_subcategory(update, context) -> int:
288288
return CS.CONFIG_PAYMENT
289289
except Exception as e:
290290
update.callback_query.message.reply_text(
291-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
291+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
292292
)
293293
return ConversationHandler.END
294294

@@ -309,7 +309,7 @@ def config_payment(update, context) -> int:
309309
return CS.CONFIG_SUBPAYMENT
310310
except Exception as e:
311311
update.callback_query.message.reply_text(
312-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
312+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
313313
)
314314
return ConversationHandler.END
315315

@@ -336,7 +336,7 @@ def config_subpayment(update, context) -> int:
336336
return ConversationHandler.END
337337
except Exception as e:
338338
update.callback_query.message.reply_text(
339-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
339+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
340340
)
341341
return ConversationHandler.END
342342

@@ -358,7 +358,7 @@ def add_entry(update, context):
358358
return CS.ENTRY
359359
except Exception as e:
360360
update.message.reply_text(
361-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
361+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
362362
)
363363
return ConversationHandler.END
364364

@@ -407,7 +407,7 @@ def remarks(update: Update, context) -> int:
407407
return CS.CATEGORY
408408
except Exception as e:
409409
update.message.reply_text(
410-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
410+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
411411
)
412412
return ConversationHandler.END
413413

@@ -453,7 +453,7 @@ def category(update, context) -> int:
453453
return CS.PAYMENT
454454
except Exception as e:
455455
update.callback_query.reply_text(
456-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
456+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
457457
)
458458
return ConversationHandler.END
459459

@@ -481,7 +481,7 @@ def subcategory(update, context) -> int:
481481
return CS.PAYMENT
482482
except Exception as e:
483483
update.callback_query.message.reply_text(
484-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
484+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
485485
)
486486
return ConversationHandler.END
487487

@@ -513,7 +513,7 @@ def payment(update, context) -> int:
513513
update.callback_query.message.reply_text("Transaction logged.")
514514
except Exception as e:
515515
update.callback_query.message.reply_text(
516-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
516+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
517517
)
518518
return ConversationHandler.END
519519

@@ -542,7 +542,7 @@ def subpayment(update, context) -> int:
542542
update.callback_query.message.reply_text("Transaction logged.")
543543
except Exception as e:
544544
update.callback_query.message.reply_text(
545-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
545+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
546546
)
547547
return ConversationHandler.END
548548

@@ -671,7 +671,7 @@ def add_transport(update, context):
671671
)
672672
except Exception as e:
673673
update.callback_query.message.reply_text(
674-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
674+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
675675
)
676676
return ConversationHandler.END
677677

@@ -700,7 +700,7 @@ def add_transport(update, context):
700700
return CS.QUICK_ADD_TRANSPORT
701701
except Exception as e:
702702
update.message.reply_text(
703-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
703+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
704704
)
705705
return ConversationHandler.END
706706

@@ -719,7 +719,7 @@ def add_others(update, context):
719719
)
720720
except Exception as e:
721721
update.callback_query.message.reply_text(
722-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
722+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
723723
)
724724
return ConversationHandler.END
725725

@@ -737,7 +737,7 @@ def add_others(update, context):
737737
)
738738
except Exception as e:
739739
update.message.reply_text(
740-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
740+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
741741
)
742742
return CS.QUICK_ADD_CATEGORY
743743

@@ -775,7 +775,7 @@ def quick_add(update, context) -> int:
775775
return ConversationHandler.END
776776
except Exception as e:
777777
update.message.reply_text(
778-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
778+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
779779
)
780780
return ConversationHandler.END
781781
except Exception as e:
@@ -784,7 +784,7 @@ def quick_add(update, context) -> int:
784784

785785

786786
def help(update, context):
787-
update.message.reply_text(HELP_TEXT)
787+
update.message.reply_text(HELP_TEXT, parse_mode=ParseMode.HTML)
788788

789789

790790
def get_day_transaction(update, context):
@@ -799,7 +799,7 @@ def get_day_transaction(update, context):
799799
return CS.HANDLE_GET_TRANSACTION
800800
except Exception as e:
801801
update.message.reply_text(
802-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
802+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
803803
)
804804
return ConversationHandler.END
805805

@@ -816,7 +816,7 @@ def get_overall(update, context):
816816
return CS.HANDLE_GET_OVERALL
817817
except Exception as e:
818818
update.message.reply_text(
819-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
819+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
820820
)
821821
return ConversationHandler.END
822822

@@ -860,7 +860,7 @@ def handle_get_transaction(update, context):
860860
return CS.HANDLE_GET_TRANSACTION
861861
except Exception as e:
862862
update.message.reply_text(
863-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
863+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
864864
)
865865
return ConversationHandler.END
866866

@@ -898,7 +898,7 @@ def handle_get_overall(update, context):
898898
return CS.HANDLE_GET_OVERALL
899899
except Exception as e:
900900
update.message.reply_text(
901-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
901+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
902902
)
903903
return ConversationHandler.END
904904

@@ -915,7 +915,7 @@ def add_income(update, context):
915915
return CS.INCOME
916916
except Exception as e:
917917
update.message.reply_text(
918-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
918+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
919919
)
920920
return ConversationHandler.END
921921

@@ -944,7 +944,7 @@ def income(update, context) -> int:
944944
return CS.WORK_PLACE
945945
except Exception as e:
946946
update.message.reply_text(
947-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
947+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
948948
)
949949
return ConversationHandler.END
950950

@@ -978,7 +978,7 @@ def cpf(update, context) -> int:
978978
update.callback_query.message.reply_text(INCOME_LIMIT_TEXT)
979979
except Exception as e:
980980
update.callback_query.message.reply_text(
981-
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
981+
ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
982982
)
983983
return ConversationHandler.END
984984

@@ -1102,7 +1102,7 @@ def notify_preview(update, context):
11021102
query.edit_message_text(text="Message sending cancelled.")
11031103
except Exception as e:
11041104
query.edit_message_text(
1105-
text=ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e))
1105+
text=ERROR_TEXT + "\nError:\n" + utils.sanitize_error_message(str(e)), parse_mode=ParseMode.HTML
11061106
)
11071107
return ConversationHandler.END
11081108

‎bot/text_str.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
GOOGLE_API_EMAIL = os.getenv("GOOGLE_API_EMAIL")
44
GOOGLE_TEMPLATE = "http://tinyurl.com/ymm-2024-expense-sheet"
5+
GOOGLE_FORM = "https://forms.gle/kXySdv3Wjv7QmSug7"
56
SETUP_TEXT = (
67
"Please set up your Google sheet by following the steps below.\n\n"
78
+ f"1. Head over to <a href='{GOOGLE_TEMPLATE}'>Expense Tracker Template</a>\n"
@@ -14,7 +15,7 @@
1415
+ "6. Copy your entire Google Sheet URL and send it over\n"
1516
+ "Example: https://docs.google.com/spreadsheets/d/abcd1234/edit\n"
1617
)
17-
ERROR_TEXT = "There seems to be an error, please try again later. If the problem persists, please report it at github.com/brucewzj99/tele-tracker-v2/issues\nwith the error message.\n"
18+
ERROR_TEXT = f"There seems to be an error, please try again later. If the problem persists, please report it over at this <a href='{GOOGLE_FORM}'>form.</a>\n"
1819
SUCCESS_LINK_TEXT = "Google sheet successfully linked! Please proceed to configure your Dropdown sheet.\nOnce completed, type /addentry to add your first entry!"
1920
GSHEET_ERROR_TEXT = f"There seems to be an error linking your google sheet, have you shared your Google Sheet with {GOOGLE_API_EMAIL} yet?"
2021
GSHEET_WRONG_TEXT = (
@@ -49,13 +50,14 @@
4950
+ "Remember to configure your Dropdown sheet to get started on this bot.\n\n"
5051
+ "/config - Update Sheet Settings\n"
5152
+ "/addentry - Add Expense Entry\n"
53+
+ "/backlog - Add transaction in the past\n"
5254
+ "/addtransport - Quick Add Transport Entry\n"
5355
+ "/addothers - Quick Add Other Entry\n"
5456
+ "/addincome - Add Income Entry\n"
5557
+ "/getdaytransaction - Retrieve transaction from dates\n"
5658
+ "/getoverall - Retrieve overall transaction for a month\n"
5759
+ "/cancel - Cancel Conversation\n"
58-
+ "\nTo report bugs or request any features, please create a issue at https://github.com/brucewzj99/tele-tracker-v2/issues\n"
60+
+ f"\nTo report bugs, give your feedback or request any features, please do so via this <a href='{GOOGLE_FORM}'>form.</a>\n"
5961
+ "\nYou can support me by buying me a coffee at https://ko-fi.com/brucewzj"
6062
)
6163

‎release_notes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Release Notes
2+
## Version 2.4.1 - Date 12 May 2024
3+
### Enhancement 🔥
4+
- Added google form for reporting bugs, feedbacks and feature requests
5+
26
## Version 2.4 - Date 6 May 2024
37
### Enhancement 🔥
48
- Clearer error messages for users

0 commit comments

Comments
 (0)