TeamUltroid · ufoptg · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/.env.sample b/.env.sample
@@ -1,12 +1,15 @@
-# Don't use quotes( " and ' )
+# Don't use quotes( " or ' )
 
 API_ID=
 API_HASH=
 SESSION=
 REDIS_URI=
 REDIS_PASSWORD=
+LOG_CHANNEL=
+BOT_TOKEN=
 
 # [OPTIONAL]
 
-LOG_CHANNEL=
-BOT_TOKEN=
+MONGO_URI=
+PMLOGGROUP=
+GOOGLEAPI=
diff --git a/.github/workflows/pylint.yaml b/.github/workflows/pylint.yaml
@@ -1,7 +1,9 @@
-name: PyLint
+name: PyLint Ultroid
 on:
   push:
-    branches: [ dev ]
+    branches:
+        - patch-1
+        - patch-2
     paths:
     - "**.py"
 jobs:
@@ -12,22 +14,26 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
+          python-version: 3.9
           cache: "pip"
       - name: Install Python lint libraries
         run: pip install autopep8 autoflake isort black
       - name: Check for showstoppers
         run: |
+          autopep8 --verbose --in-place --recursive --aggressive --aggressive pyUltroid/*.py
           autopep8 --verbose --in-place --recursive --aggressive --aggressive assistant/*.py
           autopep8 --verbose --in-place --recursive --aggressive --aggressive assistant/manager/*.py
           autopep8 --verbose --in-place --recursive --aggressive --aggressive plugins/*.py
       - name: Remove unused imports and variables
         run: |
+          autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports pyUltroid/*.py
           autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports assistant/*.py
           autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports assistant/manager/*.py
           autoflake --in-place --recursive --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports plugins/*.py
       - name: lint with isort and black
         run: |
+          isort --profile black pyUltroid/*.py
+          black --fast pyUltroid/*.py
           isort assistant/*.py
           isort assistant/manager/*.py
           black --fast assistant/*.py
@@ -37,9 +43,8 @@ jobs:
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: 'pylint: auto fixes'
-          commit_options: '--no-verify'
+          commit_options: '--verify'
           repository: .
-          commit_user_name: buddhhu
-          commit_user_email: [email protected]
-          commit_author: Amit Sharma <[email protected]>
-
+          commit_user_name: ufoptg
+          commit_user_email: [email protected]
+          commit_author: ufoptg <[email protected]>
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
 

diff --git a/assistant/__init__.py b/assistant/__init__.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/callbackstuffs.py b/assistant/callbackstuffs.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in
@@ -174,14 +174,21 @@ def text_to_url(event):
     "apiset": {
         "text": get_string("ast_1"),
         "buttons": [
-            [Button.inline("Remove.bg API", data="abs_rmbg")],
-            [Button.inline("DEEP API", data="abs_dapi")],
-            [Button.inline("OCR API", data="abs_oapi")],
+            [
+                Button.inline("RMBG API", data="abs_rmbg"),
+                Button.inline("DEEP API", data="abs_dapi"),
+                Button.inline("OCR API", data="abs_oapi"),
+            ],
+            [
+                Button.inline("OᴘᴇɴAI API", data="abs_openapi"),
+                Button.inline("🌀ʊʄ⊕ք🌀", data="abs_uapi"),
+                Button.inline("Google API", data="abs_gapi"),
+            ],
+            [Button.inline("OpenWeather API", data="abs_openwapi")],
             [Button.inline("« Back", data="setter")],
         ],
     },
 }
-
 _convo = {
     "rmbg": {
         "var": "RMBG_API",
@@ -192,13 +199,31 @@ def text_to_url(event):
     "dapi": {
         "var": "DEEP_AI",
         "name": "Deep AI Api Key",
-        "text": "Get Your Deep Api from deepai.org and send here.",
+        "text": "Get Your Deep Api from deepai.org and send here.\n\n /cancel to cancel",
         "back": "cbs_apiset",
     },
     "oapi": {
         "var": "OCR_API",
         "name": "Ocr Api Key",
-        "text": "Get Your OCR api from ocr.space and send that Here.",
+        "text": "Get Your OCR api from ocr.space and send that Here.\n\n /cancel to cancel",
+        "back": "cbs_apiset",
+    },
+    "openapi": {
+        "var": "OPENAI_API",
+        "name": "OPENAI API Key",
+        "text": "Visit openai.com for an OPENAI Api key!\n\n /cancel to cancel",
+        "back": "cbs_apiset",
+    },
+    "uapi": {
+        "var": "UFOPAPI",
+        "name": "UFoP API Key",
+        "text": "Contact 🌀ʊʄ⊕ք🌀 or Visit @PerthUnity_Bot/@UFoPInfo Support Group\n\n /cancel to cancel",
+        "back": "cbs_apiset",
+    },
+    "gapi": {
+        "var": "GOOGLEAPI",
+        "name": "Google Api Key",
+        "text": "Get Your GOOGLE API from https://makersuite.google.com/app/apikey \n\n /cancel to cancel",
         "back": "cbs_apiset",
     },
     "pmlgg": {
@@ -556,7 +581,9 @@ async def emoji(event):
     var = "EMOJI_IN_HELP"
     name = f"Emoji in `{HNDLR}help` menu"
     async with event.client.conversation(pru) as conv:
-        await conv.send_message("Send emoji u want to set 🙃.\n\nUse /cancel to cancel.")
+        await conv.send_message(
+            "Send emoji u want to set 🙃.\n\nUse /cancel to cancel."
+        )
         response = conv.wait_event(events.NewMessage(chats=pru))
         response = await response
         themssg = response.message.message

diff --git a/assistant/games.py b/assistant/games.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/initial.py b/assistant/initial.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/inlinestuff.py b/assistant/inlinestuff.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/localization.py b/assistant/localization.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/manager/__init__.py b/assistant/manager/__init__.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/manager/_help.py b/assistant/manager/_help.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/manager/_on_adds.py b/assistant/manager/_on_adds.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/manager/admins.py b/assistant/manager/admins.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/manager/afk.py b/assistant/manager/afk.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/manager/misc.py b/assistant/manager/misc.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in

diff --git a/assistant/manager/stickermanager.py b/assistant/manager/stickermanager.py
@@ -1,5 +1,5 @@
 # Ultroid - UserBot
-# Copyright (C) 2021-2023 TeamUltroid
+# Copyright (C) 2021-2024 TeamUltroid
 #
 # This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
 # PLease read the GNU Affero General Public License in