Ultroid v0.1 Updates 13.09.2021

Co-authored-by: Danish <[email protected]> Co-authored-by: Aditya <[email protected]> Co-authored-by: Amit Sharma <[email protected]> Co-authored-by: sppidy <[email protected]> Co-authored-by: Arnab Paryali <[email protected]> Co-authored-by: divkix <[email protected]> Co-authored-by: hellboi_atul <[email protected]> Co-authored-by: Programming Error <[email protected]>
TeamUltroid · Sep 12, 2021 · 6c7af44 · 6c7af44
1 parent 1b1eb1d
commit 6c7af44
Show file tree

Hide file tree

Showing 152 changed files with 5,835 additions and 4,393 deletions.
diff --git a/.env.sample b/.env.sample
@@ -4,4 +4,9 @@ API_ID=
 API_HASH=
 SESSION=
 REDIS_URI=
-REDIS_PASSWORD=
+REDIS_PASSWORD=
+
+# [OPTIONAL]
+
+LOG_CHANNEL=
+BOT_TOKEN=
diff --git a/.github/ISSUE_TEMPLATE/bug-reports.yml b/.github/ISSUE_TEMPLATE/bug-reports.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: File a bug report
-title: "[BUG REPORT]: "
+title: "[BUG REPORT]"
 labels: [bug]
 assignees:
   - xditya

diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
@@ -0,0 +1,16 @@
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'Thanks for Opening This Issue, we will look into it soon!'
+        pr-message: 'Thanks for Your Contribution. It will be reviewed soon, Useless Prs are Closed Immediately'
diff --git a/.gitignore b/.gitignore
@@ -13,12 +13,29 @@ build
 *.log
 target/npmlist.json
 package-lock.json
+
 # Directories
 addons/
+pyUltroid/
 __pycache__/
 venv/
 node_modules/
 glitch_me/
+src/glitch-me
 .idea/
 .vscode/
-temp/
+temp/
+bin-debug/
+bin-release/
+[Oo]bj/
+[Bb]in/
+.settings/
+*.swf
+*.air
+*.ipa
+*.apk
+
+# temporary files
+*.raw
+tplugins
+tassistant
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 # 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/>.
 
-FROM programmingerror/ultroid:b0.1
+FROM theteamultroid/ultroid:main
 
 # set timezone
 ENV TZ=Asia/Kolkata
@@ -14,12 +14,8 @@ RUN git clone https://github.com/TeamUltroid/Ultroid.git /root/TeamUltroid/
 WORKDIR /root/TeamUltroid/
 
 # install main requirements.
-COPY requirements.txt /deploy/
-RUN pip3 install --no-cache-dir -r /deploy/requirements.txt
-
-# install addons requirements
-RUN wget -O /deploy/addons.txt https://git.io/JWdOk
-RUN pip3 install --no-cache-dir -r /deploy/addons.txt
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN pip3 uninstall av -y && pip3 install av --no-binary av
 
 # start the bot
 CMD ["bash", "resources/startup/startup.sh"]
diff --git a/README.md b/README.md
@@ -5,20 +5,20 @@
   <b>Ultroid - UserBot</b>
 </h1>
 
-<b>A stable pluggable Telegram userbot + vc music bot, based on Telethon.</b>   
+<b>A stable pluggable Telegram userbot + Voice & Video Call music bot, based on Telethon.</b>   
 
 [![Stars](https://img.shields.io/github/stars/TeamUltroid/Ultroid?style=flat-square&color=yellow)](https://github.com/TeamUltroid/Ultroid/stargazers)
 [![Forks](https://img.shields.io/github/forks/TeamUltroid/Ultroid?style=flat-square&color=orange)](https://github.com/TeamUltroid/Ultroid/fork)
 [![Size](https://img.shields.io/github/repo-size/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/)   
-[![Python](https://img.shields.io/badge/Python-v3.9-blue)](https://www.python.org/)
+[![Python](https://img.shields.io/badge/Python-v3.9.7-blue)](https://www.python.org/)
+[![CodeFactor](https://www.codefactor.io/repository/github/teamultroid/ultroid/badge/main)](https://www.codefactor.io/repository/github/teamultroid/ultroid/overview/main)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/TeamUltroid/Ultroid/graphs/commit-activity)
-[![Docker Pulls](https://img.shields.io/docker/pulls/programmingerror/ultroid?style=flat-square)](https://img.shields.io/docker/pulls/programmingerror/ultroid?style=flat-square)
+[![Docker Pulls](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)
 [![Open Source Love svg2](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/TeamUltroid/Ultroid)   
 [![Contributors](https://img.shields.io/github/contributors/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/graphs/contributors)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://makeapullrequest.com)
 [![License](https://img.shields.io/badge/License-AGPL-blue)](https://github.com/TeamUltroid/Ultroid/blob/main/LICENSE)
 [![Sparkline](https://stars.medv.io/Teamultroid/Ultroid.svg)](https://stars.medv.io/TeamUltroid/Ultroid)
-
 ----
 
 # Deploy
@@ -53,10 +53,10 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
 
 ### Local Deploy - Latest Method
 This is the latest and most fastest method currently.<br>
-First, goto [This Project](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the latest release from the Github Releases.<br>
-Then, do as its given in the `README.md` to add the executable to your system path.
+First, go to [This Project](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the latest release from the Github Releases.<br>
+Then, do as it's given in the `README.md` to add the executable to your system path.
 
-Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) to get more information on this.
+Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) to get more information.
 
 
 ### Local Deploy - Easy Method
@@ -93,8 +93,6 @@ Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli
     `python(3) -m pyUltroid`
 
 ## Necessary Variables
-- `API_ID` - Your API_ID from [my.telegram.org](https://my.telegram.org/)
-- `API_HASH` - Your API_HASH from [my.telegram.org](https://my.telegram.org/)
 - `SESSION` - SessionString for your accounts login session. Get it from [here](#Session-String)
 - `REDIS_URI` - Redis endpoint URL, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
 - `REDIS_PASSWORD ` - Redis endpoint Password, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
@@ -117,6 +115,5 @@ Ultroid is licensed under [GNU Affero General Public License](https://www.gnu.or
 # Credits
 * [![TeamUltroid-Devs](https://img.shields.io/static/v1?label=Teamultroid&message=devs&color=critical)](https://t.me/UltroidDevs)
 * [Lonami](https://github.com/LonamiWebs/) for [Telethon.](https://github.com/LonamiWebs/Telethon)
-* [Dan](https://github.com/delivrance) for [Pyrogram.](https://github.com/pyrogram/pyrogram)
-* [Pytgcalls](https://github.com/pytgcalls) for [PyTgCalls.](https://github.com/pytgcalls/pytgcalls)
+* [MarshalX](https://github.com/MarshalX) for [PyTgCalls.](https://github.com/MarshalX/tgcalls)
 
diff --git a/app.json b/app.json
@@ -37,12 +37,12 @@
             "value": ""
         },
         "HEROKU_API": {
-            "description": "Heroku API token. Needed if deploying on heroku ONLY.",
+            "description": "Heroku API token. Mandatory for Heroku Deploy...",
             "value": "",
             "required": false
         },
         "HEROKU_APP_NAME": {
-            "description": "Name of your heroku app, given in the first blank on this page. To be added if deploying to heroku ONLY.",
+            "description": "Name of your Heroku app, given in the first blank on this page. To be added if deploying to heroku ONLY.",
             "value": "",
             "required": false
         }

diff --git a/assistant/__init__.py b/assistant/__init__.py
@@ -24,5 +24,4 @@ async def setit(event, name, value):
 
 
 def get_back_button(name):
-    button = [Button.inline("« Bᴀᴄᴋ", data=f"{name}")]
-    return button
+    return [Button.inline("« Bᴀᴄᴋ", data=f"{name}")]
diff --git a/assistant/api_setter.py b/assistant/api_setter.py
@@ -41,12 +41,11 @@ async def rmbgapi(event):
                 "Cancelled!!",
                 buttons=get_back_button("apiset"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                f"{name} changed to {themssg}",
-                buttons=get_back_button("apiset"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("apiset"),
+        )
 
 
 @callback("dapi")
@@ -66,12 +65,11 @@ async def rmbgapi(event):
                 "Cancelled!!",
                 buttons=get_back_button("apiset"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                f"{name} changed to {themssg}",
-                buttons=get_back_button("apiset"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("apiset"),
+        )
 
 
 @callback("oapi")
@@ -91,9 +89,8 @@ async def rmbgapi(event):
                 "Cancelled!!",
                 buttons=get_back_button("apiset"),
             )
-        else:
-            await setit(event, var, themssg)
-            await conv.send_message(
-                f"{name} changed to {themssg}",
-                buttons=get_back_button("apiset"),
-            )
+        await setit(event, var, themssg)
+        await conv.send_message(
+            f"{name} changed to {themssg}",
+            buttons=get_back_button("apiset"),
+        )