Compare V2 changes

.gitignore

@@ -6,6 +6,7 @@ test*
 *.mp3
 *.webm
 *.webp
+*.rdb
 *.mp4
 *.tgs
 *.txt
@@ -44,4 +45,6 @@ bin-release/
 *.raw
 
 # fly.io configs
-fly.toml
+fly.toml
+
+resources/webapp

assistant/__init__.py

@@ -13,8 +13,6 @@
 from pyUltroid._misc import owner_and_sudos
 from pyUltroid._misc._assistant import asst_cmd, callback, in_pattern
 from pyUltroid.fns.helper import *
-from pyUltroid.fns.tools import get_stored_file
-from strings import get_languages, get_string
 
 OWNER_NAME = ultroid_bot.full_name
 OWNER_ID = ultroid_bot.uid

assistant/callbackstuffs.py

@@ -26,6 +26,7 @@
 from telethon.utils import get_peer_id
 
 from pyUltroid.fns.helper import fast_download, progress
+from strings import get_string
 from pyUltroid.fns.tools import Carbon, async_searcher, get_paste, telegraph_client
 from pyUltroid.startup.loader import Loader
 

assistant/inlinestuff.py

@@ -621,3 +621,20 @@ async def inline_tl(ult):
         "Tʟ Sᴇᴀʀᴄʜ": "tl",
     }
 )
+
+# --------------- Handle users who haven't started the assistant bot ---------------
+@in_pattern("startbot")
+async def start_bot(event):
+        result = await event.builder.article(
+            title="Start Assistant Bot to Continue",
+            text=(
+                "To create or manage your sticker pack, you need to start the assistant bot first.\n\n"
+                "Click the button below to start it."
+            ),
+            buttons=[
+                [Button.url("Start Bot", f"https://t.me/{asst.me.username}")]
+            ]
+        )
+        await event.answer([result], private=True, cache_time=0, gallery=False)
+
+

assistant/localization.py

@@ -7,13 +7,12 @@
 
 import re
 
+from strings import get_languages, get_string
 from . import (
     Button,
     ULTConfig,
     callback,
     get_back_button,
-    get_languages,
-    get_string,
     udB,
 )
 

install-termux

@@ -9,7 +9,7 @@ if [ -d "resources" ]
 then
     echo "Current directory Identified.."
 else
-    apt install git -y
+    apt install git redis -y
     git clone https://github.com/TeamUltroid/Ultroid
     cd Ultroid
 fi

plugins/__init__.py

@@ -17,12 +17,13 @@
 from pyUltroid import *
 from pyUltroid._misc._assistant import asst_cmd, callback, in_pattern
 from pyUltroid._misc._decorators import ultroid_cmd
+from telethon.tl.types import Message
 from pyUltroid._misc._wrappers import eod, eor
 from pyUltroid.dB import DEVLIST, ULTROID_IMAGES
 from pyUltroid.fns.helper import *
 from pyUltroid.fns.misc import *
 from pyUltroid.fns.tools import *
-from pyUltroid.startup._database import _BaseDatabase as Database
+from pyUltroid.database.base import BaseDatabase as Database
 from pyUltroid.version import __version__, ultroid_version
 from strings import get_help, get_string
 from catbox import CatboxUploader
@@ -75,19 +76,6 @@ def inline_pic():
     -1001473548283,  # SharingUserbot
 ]
 
-KANGING_STR = [
-    "Using Witchery to kang this sticker...",
-    "Plagiarising hehe...",
-    "Inviting this sticker over to my pack...",
-    "Kanging this sticker...",
-    "Hey that's a nice sticker!\nMind if I kang?!..",
-    "Hehe me stel ur stiker...",
-    "Ay look over there (☉｡☉)!→\nWhile I kang this...",
-    "Roses are red violets are blue, kanging this sticker so my pack looks cool",
-    "Imprisoning this sticker...",
-    "Mr.Steal-Your-Sticker is stealing this sticker... ",
-]
-
 
 ATRA_COL = [
     "DarkCyan",
@@ -103,3 +91,41 @@ def inline_pic():
     "Moccasin",
     "PowderBlue",
 ]
+
+
+
+def deEmojify(inputString: str) -> str:
+    """Remove emojis and other non-safe characters from string"""
+    EMOJI_PATTERN = re.compile(
+    "["
+    "\U0001F1E0-\U0001F1FF"  # flags (iOS)
+    "\U0001F300-\U0001F5FF"  # symbols & pictographs
+    "\U0001F600-\U0001F64F"  # emoticons
+    "\U0001F680-\U0001F6FF"  # transport & map symbols
+    "\U0001F700-\U0001F77F"  # alchemical symbols
+    "\U0001F780-\U0001F7FF"  # Geometric Shapes Extended
+    "\U0001F800-\U0001F8FF"  # Supplemental Arrows-C
+    "\U0001F900-\U0001F9FF"  # Supplemental Symbols and Pictographs
+    "\U0001FA00-\U0001FA6F"  # Chess Symbols
+    "\U0001FA70-\U0001FAFF"  # Symbols and Pictographs Extended-A
+    "\U00002702-\U000027B0"  # Dingbats
+    "]+",)
+    return re.sub(EMOJI_PATTERN, "", inputString)
+
+
+async def something(e, msg, media, button, reply=True, chat=None):
+    if e.client._bot:
+        return await e.reply(msg, file=media, buttons=button)
+    num = len(STUFF) + 1
+    STUFF.update({num: {"msg": msg, "media": media, "button": button}})
+    try:
+        res = await e.client.inline_query(asst.me.username, f"stf{num}")
+        return await res[0].click(
+            chat or e.chat_id,
+            reply_to=bool(isinstance(e, Message) and reply),
+            hide_via=True,
+            silent=True,
+        )
+
+    except Exception as er:
+        LOGS.exception(er)