Skip to content

Commit 0df53ca

Browse files
New-dev0xditya1Danish-00amitkr-codesTechiError
authored
Ultroid v0.3 Updates
Co-authored-by: Aditya <xditya@ultroid.tech> Co-authored-by: Danish <danish@ultroid.tech> Co-authored-by: Amit Sharma <48654350+buddhhu@users.noreply.github.com> Co-authored-by: TechiError <error@notavailable.live> Co-authored-by: Avish Kumar <85635883+aviskumar@users.noreply.github.com> Co-authored-by: Vɪɴᴀʏᴀᴋ Pᴀɴᴅᴇʏ <87496159+harpia-vieillot@users.noreply.github.com> Co-authored-by: Shrimadhav U K <6317196+spechide@users.noreply.github.com> Co-authored-by: Dark <darkbeamer.official@gmail.com> Co-authored-by: Muhamad Risman Aziz <62795826+mrismanaziz@users.noreply.github.com> Co-authored-by: Ashik Muhammed <84127769+MR-JINN-OF-TG@users.noreply.github.com> Co-authored-by: MMETMA <79155572+MMETMA@users.noreply.github.com> Co-authored-by: amirmehdinzri <94852182+amirmehdinzri@users.noreply.github.com>
1 parent d780cd1 commit 0df53ca

File tree

158 files changed

+7821
-4554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+7821
-4554
lines changed

.github/ISSUE_TEMPLATE/bug-reports.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ body:
3030
label: Version
3131
description: What version of Ultroid are you running?
3232
options:
33+
- 0.3
3334
- 0.2
3435
- 0.1
3536
- 0.0.9
@@ -64,4 +65,4 @@ body:
6465
description: By submitting this issue, you agree that you have read the [docs](https://ultroid.tech) and gone through the [deploy tutorial](https://www.youtube.com/watch?v=9wF7k9qA0Q4) at first.
6566
options:
6667
- label: I have followed all of the above steps.
67-
required: true
68+
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: false
1+
blank_issues_enabled: true
22
contact_links:
33
- name: Ultroid Support
44
url: https://t.me/UltroidSupport

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@ detailed_description_here
66
### Issue Number [Optional] :
77
Issue Number here if your pull request close any issue or is linked to.
88

9-
----
10-
### What defines you?
11-
- [ ] Hacktoberfest Participant.
12-
- [ ] Contributor
9+
----

.github/stalebot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 50
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Label to use when marking an issue as stale
6+
staleLabel: inactive
7+
# Comment to post when marking an issue as stale. Set to `false` to disable
8+
markComment: >
9+
This issue has been automatically marked as stale because it has not had
10+
recent activity. It will be closed if no further activity occurs. Thank you
11+
for your contributions.
12+
# Comment to post when closing a stale issue. Set to `false` to disable
13+
closeComment: false

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,4 @@ jobs:
2424
languages: python
2525

2626
- name: Perform CodeQL Analysis
27-
uses: github/codeql-action/analyze@v1
28-
29-
# Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)
27+
uses: github/codeql-action/analyze@v1

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Welcome To Contributing Guide
22
Any contribution done to this repository will be appreciated! 🎉
33

4+
### About Ultroid
5+
- **Ultroid** is Telegram Userbot, which allow you to perform many task easily.
6+
- It's base core is a pip package named [`pyUltroid`](https://GitHub.com/TeamUltroid/pyUltroid).
7+
- This repository, contains Ultroid's official plugin files.
8+
- moreover, Ultroid User also have an option to get more plugins available at [`UltroidAddons`](https://github.com/TeamUltroid/UltroidAddons)
9+
410
### Issues
511
- Search for existing Similar issues.
612
- You can open a issue first before contributing, If it contain some major changes like `bug fixes` or `feature addition`.

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Ultroid - UserBot
2-
# Copyright (C) 2021 TeamUltroid
2+
# Copyright (C) 2021-2022 TeamUltroid
33
# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
44
# PLease read the GNU Affero General Public License in <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
55

@@ -9,14 +9,13 @@ FROM theteamultroid/ultroid:main
99
ENV TZ=Asia/Kolkata
1010

1111
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
12-
1312
# cloning the repo and installing requirements.
1413
&& git clone https://github.com/TeamUltroid/Ultroid.git /root/TeamUltroid/ \
1514
&& pip3 install --no-cache-dir -r root/TeamUltroid/requirements.txt \
16-
&& pip3 uninstall av -y && pip3 install av --no-binary av
15+
&& pip3 install av --no-binary av
1716

1817
# changing workdir
1918
WORKDIR /root/TeamUltroid/
2019

2120
# start the bot
22-
CMD ["bash", "resources/startup/startup.sh"]
21+
CMD ["bash", "startup"]

README.md

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@
55
<b>Ultroid - UserBot</b>
66
</h1>
77

8-
<b>A stable pluggable Telegram userbot + Voice & Video Call music bot, based on Telethon.</b>
8+
<b>A stable pluggable Telegram userbot + Voice & Video Call music bot, based on Telethon.</b>
99

10+
[![](https://img.shields.io/badge/Ultroid-v0.3-blue)](#)
1011
[![Stars](https://img.shields.io/github/stars/TeamUltroid/Ultroid?style=flat-square&color=yellow)](https://github.com/TeamUltroid/Ultroid/stargazers)
1112
[![Forks](https://img.shields.io/github/forks/TeamUltroid/Ultroid?style=flat-square&color=orange)](https://github.com/TeamUltroid/Ultroid/fork)
1213
[![Size](https://img.shields.io/github/repo-size/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/)
13-
[![Python](https://img.shields.io/badge/Python-v3.9.7-blue)](https://www.python.org/)
14+
[![Python](https://img.shields.io/badge/Python-v3.9.9-blue)](https://www.python.org/)
1415
[![CodeFactor](https://www.codefactor.io/repository/github/teamultroid/ultroid/badge/main)](https://www.codefactor.io/repository/github/teamultroid/ultroid/overview/main)
1516
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/TeamUltroid/Ultroid/graphs/commit-activity)
16-
[![Docker Pulls](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)
17-
[![Open Source Love svg2](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/TeamUltroid/Ultroid)
17+
[![Docker Pulls](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)](https://img.shields.io/docker/pulls/theteamultroid/ultroid?style=flat-square)
18+
[![Open Source Love svg2](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/TeamUltroid/Ultroid)
1819
[![Contributors](https://img.shields.io/github/contributors/TeamUltroid/Ultroid?style=flat-square&color=green)](https://github.com/TeamUltroid/Ultroid/graphs/contributors)
1920
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://makeapullrequest.com)
20-
[![License](https://img.shields.io/badge/License-AGPL-blue)](https://github.com/TeamUltroid/Ultroid/blob/main/LICENSE)
21+
[![License](https://img.shields.io/badge/License-AGPL-blue)](https://github.com/TeamUltroid/Ultroid/blob/main/LICENSE)
2122
[![Sparkline](https://stars.medv.io/Teamultroid/Ultroid.svg)](https://stars.medv.io/TeamUltroid/Ultroid)
2223
----
2324

@@ -29,7 +30,7 @@
2930
[![Documentation](https://img.shields.io/badge/Documentation-Ultroid-blue)](http://ultroid.tech/)
3031

3132
# Tutorial
32-
- Full Tutorial - [![Full Tutorial](https://img.shields.io/badge/Watch%20Now-blue)](https://www.youtube.com/watch?v=9wF7k9qA0Q4)
33+
- Full Tutorial - [![Full Tutorial](https://img.shields.io/badge/Watch%20Now-blue)](https://www.youtube.com/watch?v=0wAV7pUzhDQ)
3334

3435
- Tutorial to get Redis URL and password - [here.](./resources/extras/redistut.md)
3536
---
@@ -42,16 +43,7 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
4243
## Deploy Locally
4344
- [Traditional Method](#local-deploy---traditional-method)
4445
- [Easy Method](#local-deploy---easy-method)
45-
- [Latest UltroidCli](#local-deploy---latest-method)
46-
47-
48-
### Local Deploy - Latest Method
49-
This is the latest and most fastest method currently.<br>
50-
First, go to [UltroidCli](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the latest release from the Github Releases.<br>
51-
Then, do as it's given in the `README.md` to add the executable to your system path.
52-
53-
Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) to get more information.
54-
46+
- [Ultroid CLI](#Ultroid-CLI)
5547

5648
### Local Deploy - Easy Method
5749
- Linux - `bash -c "$(curl -fsSL https://git.io/JY9UM)"`
@@ -60,14 +52,14 @@ Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli
6052

6153
### Local Deploy - Traditional Method
6254
- Get your [Necessary Variables](#Necessary-Variables)
63-
- Clone the repository: <br />
55+
- Clone the repository:
6456
`git clone https://github.com/TeamUltroid/Ultroid.git`
65-
- Go to the cloned folder: <br />
57+
- Go to the cloned folder:
6658
`cd Ultroid`
67-
- Create a virtual env: <br />
59+
- Create a virtual env:
6860
`virtualenv -p /usr/bin/python3 venv`
6961
`. ./venv/bin/activate`
70-
- Install the requirements: <br />
62+
- Install the requirements:
7163
`pip(3) install -U -r re*/st*/optional-requirements.txt`
7264
`pip(3) install -U -r requirements.txt`
7365
- Generate your `SESSION`:
@@ -83,10 +75,23 @@ Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli
8375
(You can either edit and rename the file or make a new file named `.env`.)
8476
- Run the bot:
8577
- Linux Users:
86-
`bash resources/startup/startup.sh`
78+
`bash startup`
8779
- Windows Users:
8880
`python(3) -m pyUltroid`
8981

82+
### Ultroid CLI
83+
[Ultroid CLI](https://github.com/BLUE-DEVIL1134/UltroidCli) is a command-line interface for deploying Ultroid.
84+
85+
- **Installing** -
86+
Run the following code on a terminal, with curl installed.
87+
`ver=$(curl https://raw.githubusercontent.com/BLUE-DEVIL1134/UltroidCli/main/version.txt) && curl -L -o ultroid https://github.com/BLUE-DEVIL1134/UltroidCli/releases/download/$ver/ultroid.exe`
88+
OR
89+
Go to [UltroidCli](https://github.com/BLUE-DEVIL1134/UltroidCli) and install the version release from the Github Releases. Add the executable to your system path as specified in the [Readme](https://github.com/BLUE-DEVIL1134/UltroidCli#how-to-use-ultroidcli-).
90+
91+
- **Documentation** -
92+
Take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli/) for more detailed information.
93+
94+
---
9095
## Necessary Variables
9196
- `SESSION` - SessionString for your accounts login session. Get it from [here](#Session-String)
9297
- `REDIS_URI` - Redis endpoint URL, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
@@ -100,14 +105,17 @@ Different ways to get your `SESSION`:
100105
* Termux : `sh -c "$(curl -fsSL https://da.gd/termux-tel)"`
101106
* TelegramBot : [@SessionGeneratorBot](https://t.me/SessionGeneratorBot)
102107

103-
Made with 💕 by [@TeamUltroid](https://t.me/TeamUltroid). <br />
108+
---
104109

105110
# License
111+
[![License](https://www.gnu.org/graphics/agplv3-155x51.png)](LICENSE)
106112
Ultroid is licensed under [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.en.html) v3 or later.
107113

108-
[![License](https://www.gnu.org/graphics/agplv3-155x51.png)](LICENSE)
114+
---
109115

110116
# Credits
111117
* [![TeamUltroid-Devs](https://img.shields.io/static/v1?label=Teamultroid&message=devs&color=critical)](https://t.me/UltroidDevs)
112118
* [Lonami](https://github.com/LonamiWebs/) for [Telethon.](https://github.com/LonamiWebs/Telethon)
113119
* [MarshalX](https://github.com/MarshalX) for [PyTgCalls.](https://github.com/MarshalX/tgcalls)
120+
121+
> Made with 💕 by [@TeamUltroid](https://t.me/TeamUltroid).

assistant/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
# Ultroid - UserBot
2-
# Copyright (C) 2021 TeamUltroid
2+
# Copyright (C) 2021-2022 TeamUltroid
33
#
44
# This file is a part of < https://github.com/TeamUltroid/Ultroid/ >
55
# PLease read the GNU Affero General Public License in
66
# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
77

88
from pyUltroid import *
9+
from pyUltroid import _ult_cache
910
from pyUltroid.functions.helper import *
11+
from pyUltroid.functions.tools import get_stored_file
1012
from pyUltroid.misc import owner_and_sudos
1113
from pyUltroid.misc._assistant import asst_cmd, callback, in_pattern
1214
from telethon import Button, custom
1315

1416
from plugins import ATRA_COL
1517
from strings import get_languages, get_string, language
1618

17-
OWNER_NAME = ultroid_bot.me.first_name
18-
OWNER_ID = ultroid_bot.me.id
19+
OWNER_NAME = ultroid_bot.full_name
20+
OWNER_ID = ultroid_bot.uid
1921

2022
AST_PLUGINS = {}
2123

2224

2325
async def setit(event, name, value):
2426
try:
25-
udB.set(name, value)
27+
udB.set_key(name, value)
2628
except BaseException:
2729
return await event.edit("`Something Went Wrong`")
2830

assistant/api_setter.py

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)