change onboarding and better copy

ffmemes · Jun 8, 2024 · cd747a8 · cd747a8
1 parent 8948845
commit cd747a8
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 210 deletions.
diff --git a/src/tgbot/app.py b/src/tgbot/app.py
@@ -45,10 +45,6 @@
 )
 from src.tgbot.handlers.admin.forward_channel import handle_forwarded_from_tgchannelru
 from src.tgbot.handlers.admin.user_info import delete_user_data, handle_show_user_info
-from src.tgbot.handlers.admin.waitlist import (
-    handle_waitlist_invite,
-    handle_waitlist_invite_before,
-)
 from src.tgbot.handlers.chat.chat_member import handle_chat_member_update
 from src.tgbot.handlers.chat.explain_meme import explain_meme_en, explain_meme_ru
 from src.tgbot.handlers.chat.feedback import (
@@ -198,21 +194,6 @@ def add_handlers(application: Application) -> None:
     )
 
     ############## admin
-    # invite user from waitlist
-    application.add_handler(
-        CommandHandler(
-            "invite",
-            handle_waitlist_invite,
-            filters=filters.ChatType.PRIVATE & filters.UpdateType.MESSAGE,
-        )
-    )
-    application.add_handler(
-        CommandHandler(
-            "invite_before",
-            handle_waitlist_invite_before,
-            filters=filters.ChatType.PRIVATE & filters.UpdateType.MESSAGE,
-        )
-    )
 
     application.add_handler(
         MessageHandler(

diff --git a/src/tgbot/handlers/admin/waitlist.py b/src/tgbot/handlers/admin/waitlist.py
@@ -45,49 +45,49 @@ async def handle_waitlist_invite(
     await update.message.reply_text(f"✅ You invited @{username}.")
 
 
-async def handle_waitlist_invite_before(
-    update: Update, context: ContextTypes.DEFAULT_TYPE
-) -> None:
-    """Gives access to everyone, who registered before a certain date"""
-    user = await get_user_info(update.effective_user.id)
-    if user["type"] != UserType.ADMIN:
-        return
-
-    message_split = update.message.text.split(" ")
-    if len(message_split) != 2:
-        await update.message.reply_text(
-            "USAGE: /invite_before yyyy-mm-dd\n"
-            "Invites everyone registered before specified date."
-        )
-        return
-
-    date_str = message_split[1]
-    try:
-        date = datetime.strptime(date_str, "%Y-%m-%d")
-    except ValueError:
-        await update.message.reply_text(
-            "Invalid date format. Use /invite_before yyyy-mm-dd"
-        )
-        return
-
-    # get all users registered that day
-    users = await get_waitlist_users_registered_before(date)
-    await update.message.reply_text(
-        f"Inviting {len(users)} users registered before {date_str}."
-    )
-    await log(f"Inviting {len(users)} users registered before {date_str}.", context.bot)
-
-    for i, user in enumerate(users):
-        await invite_user(user["id"])
-        await asyncio.sleep(0.2)
-        if i % 50 == 0 and i != 0:
-            await update.message.reply_text(
-                f"⏳ Invited {i + 1}/{len(users)} users registered before {date_str}.",
-            )
-
-    await update.message.reply_text(
-        f"✅ Invited {len(users)} users registered before {date_str}."
-    )
+# async def handle_waitlist_invite_before(
+#     update: Update, context: ContextTypes.DEFAULT_TYPE
+# ) -> None:
+#     """Gives access to everyone, who registered before a certain date"""
+#     user = await get_user_info(update.effective_user.id)
+#     if user["type"] != UserType.ADMIN:
+#         return
+
+#     message_split = update.message.text.split(" ")
+#     if len(message_split) != 2:
+#         await update.message.reply_text(
+#             "USAGE: /invite_before yyyy-mm-dd\n"
+#             "Invites everyone registered before specified date."
+#         )
+#         return
+
+#     date_str = message_split[1]
+#     try:
+#         date = datetime.strptime(date_str, "%Y-%m-%d")
+#     except ValueError:
+#         await update.message.reply_text(
+#             "Invalid date format. Use /invite_before yyyy-mm-dd"
+#         )
+#         return
+
+#     # get all users registered that day
+#     users = await get_waitlist_users_registered_before(date)
+#     await update.message.reply_text(
+#         f"Inviting {len(users)} users registered before {date_str}."
+#     )
+#     await log(f"Inviting {len(users)} users registered before {date_str}.", context.bot)
+
+#     for i, user in enumerate(users):
+#         await invite_user(user["id"])
+#         await asyncio.sleep(0.2)
+#         if i % 50 == 0 and i != 0:
+#             await update.message.reply_text(
+#                 f"⏳ Invited {i + 1}/{len(users)} users registered before {date_str}.",
+#             )
+
+#     await update.message.reply_text(
+#         f"✅ Invited {len(users)} users registered before {date_str}."
+#     )
 
 
 async def invite_user(user_id: int) -> None:

diff --git a/src/tgbot/handlers/onboarding.py b/src/tgbot/handlers/onboarding.py
@@ -21,16 +21,16 @@ async def onboarding_flow(update: Update, bot: Bot):
             parse_mode=ParseMode.HTML,
         )
 
-        await asyncio.sleep(10)
+        await asyncio.sleep(3)
 
         m = await update.effective_user.send_message("3️⃣")
         await asyncio.sleep(2)
         m = await m.edit_text("2️⃣")
         await asyncio.sleep(2)
         m = await m.edit_text("1️⃣")
         await asyncio.sleep(2)
-        m = await m.edit_text("💣")
-        await asyncio.sleep(2.5)
+        # m = await m.edit_text("💣")
+        # await asyncio.sleep(2.5)
         await m.delete()
 
     return await next_message(