v2.0.0 deployed version

brucewzj99 · brucewzj99 · commit 6029533e0172 · 2023-06-01T09:43:44.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -158,3 +158,7 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+.vercel
+
+# My stuff
+test_func.py
diff --git a/.vercelignore b/.vercelignore
@@ -0,0 +1,4 @@
+test.py
+LICENSE
+release_notes.md
+README.md
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Tele-Tracker Bot
 A python telegram bot to help track daily expenses onto google sheet, hosted on Vercel using Flask.
+
 [Version 1](https://github.com/brucewzj99/tele-tracker) was hosted locally with a different version of python-telegram-bot
 
 ## Release Notes
diff --git a/api/templates/app.html b/api/templates/app.html
@@ -71,7 +71,7 @@
   <body>
     <div class="container">
       <div class="child">
-        <img src="https://github.com/brucewzj99/tele-tracker-v2/tree/master/api/templates/logo.png" alt="Logo" class="logo" />
+        <img src="https://github.com/brucewzj99/tele-tracker-v2/blob/main/api/templates/logo.png?raw=true" alt="Logo" class="logo" />
         <h1 class="title">tele-tracker-bot</h1>
         <h2 class="subtitle">A python telegram bot to help track expenses!</h2>
         <p>You can access the bot using this <a href="https://t.me/telefinance_tracker_bot">link</a>.
diff --git a/bot/firebase.py b/bot/firebase.py
@@ -21,3 +21,17 @@ def check_if_user_exists(telegram_id):
 def get_user_sheet_id(telegram_id):
     ref = db.reference("/users/" + str(telegram_id) + "/sheet_id")
     return ref.get()
+
+
+def get_all_user_id():
+    ref = db.reference("/users/")
+    user_ids = [int(user_id) for user_id in ref.get().keys()]
+    return user_ids
+
+
+def get_all_sheet_id():
+    ref = db.reference("/users/")
+    sheet_ids = []
+    for value in ref.get().values():
+        sheet_ids.append(value["sheet_id"])
+    return sheet_ids
diff --git a/bot/telegram_bot.py b/bot/telegram_bot.py
@@ -123,14 +123,15 @@ def config(update, context):
     update.message.reply_text(
         "How can i help you today?", reply_markup=create_inline_markup(list)
     )
-    return CS.CONFIG__HANDLER
+    return CS.CONFIG_HANDLER
 
 
 def config_handler(update, context) -> int:
     reply = update.callback_query.data
     update.callback_query.answer()
     if reply == "Cancel":
-        cancel(update, context)
+        update.callback_query.edit_message_text(END_TEXT, reply_markup=None)
+        return ConversationHandler.END
     update.callback_query.edit_message_text(reply, reply_markup=None)
     if reply == "Change Google Sheet":
         update.callback_query.message.reply_text(SETUP_TEXT)
@@ -155,15 +156,15 @@ def config_handler(update, context) -> int:
                 return CS.CONFIG_SETUP
             elif reply == "Configure Quick Others":
                 context.user_data["config"] = EntryType.OTHERS
-                msg = f'This is your current Others settings.\nClick on "Add new" to add a new one (max 5).\nIf you wish to update, you will have to do so manually in the "Tracker" sheet.\n\nPayment, Category\n'
+                msg = QUICK_OTHER_TEXT
                 setting_list = gs.get_quick_add_others(context.user_data["sheet_id"])
                 keyboard_list = []
                 if setting_list == None:
                     msg = f"{msg}No settings found\n"
                 else:
                     for setting in setting_list:
                         msg = f"{msg}{setting}\n"
-                if len(setting_list) < 5:
+                if len(setting_list) < QUICK_OTHER_LIMIT:
                     keyboard_list.append("Add new")
                 keyboard_list.append("Cancel")
                 update.callback_query.message.reply_text(
@@ -192,7 +193,8 @@ def config_setup(update, context) -> int:
     except Exception as e:
         update.callback_query.message.reply_text(ERROR_TEXT)
         return ConversationHandler.END
-    cancel(update, context)
+    update.callback_query.edit_message_text(END_TEXT, reply_markup=None)
+    return ConversationHandler.END
 
 
 def config_category(update, context) -> int:
diff --git a/bot/text_str.py b/bot/text_str.py
@@ -41,14 +41,19 @@
 
 QUICK_SETUP_TRANSPORT = "You have not set up your quick add settings for transport yet, please do so by typing /config"
 QUICK_SETUP_OTHER = "You have not set up your quick add settings for others yet, please do so by typing /config"
+QUICK_OTHER_LIMIT = 5  # max i can go is 10, but testing with 5 first
+QUICK_OTHER_TEXT = f'This is your current Others settings.\nClick on "Add new" to add a new one (max {QUICK_OTHER_LIMIT}).\nIf you wish to update, you will have to do so manually in the "Tracker" sheet.\n\nPayment, Category\n'
 
 HELP_TEXT = (
     "To get started, please type /start\n"
     + "Remember to configure your Dropdown sheet to get started on this bot.\n\n"
-    + "To configure, type /config\n"
-    + "To add entry, type /addentry\n"
-    + "To add transport quickly, type /addtransport\n"
-    + "To add others quickly, type /addothers\n"
+    + "/config - Update Sheet Settings"
+    + "/addentry - Add Expense Entry\n"
+    + "/addtransport - Quick Add Transport Entry\n"
+    + "/addothers - Quick Add Other Entry\n"
+    + "/addincome - Add Income Entry\n"
+    + "/retrievetransaction - Retrieve transaction from dates\n"
+    + "/cancel - Cancel Conversation\n"
 )
 
 RETRIEVE_TRANSACTION_TEXT = "Please specify the date and month you wish to retrieve from in this format: DD MMM\ne.g 16 Mar\nor use /cancel to exit"
diff --git a/bot/updates.py b/bot/updates.py
@@ -0,0 +1,18 @@
+from telegram import Bot
+import os
+import bot.firebase as fb
+
+TOKEN = os.environ.get("BOT_TOKEN")
+bot = Bot(token=TOKEN)
+
+
+def send_new_feature_message(new_feature_message):
+    users = fb.get_all_user_id()
+    for user_id in users:
+        bot.send_message(chat_id=user_id, text=new_feature_message)
+
+
+def update_gsheet():
+    sheet_ids = fb.get_all_sheet_id()
+    for sheet_id in sheet_ids:
+        pass  # gs.update_gsheet(sheet_id)
diff --git a/vercel.json b/vercel.json
@@ -0,0 +1,5 @@
+{
+  "rewrites": [
+    { "source": "/(.*)", "destination": "/api/index" }
+  ]
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +test.py
 +LICENSE
 +release_notes.md
 +README.md