Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compare Rewrite #432

Draft
wants to merge 106 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
fe461dc
Initiate
New-dev0 May 26, 2023
72ba897
Initiate
New-dev0 May 26, 2023
dce7906
Release Rewrite to beta testing
New-dev0 May 26, 2023
2a5a08c
fix carbon, unload plugin
New-dev0 May 27, 2023
a84b336
move
New-dev0 May 27, 2023
3b61b05
multiclient new impl
New-dev0 May 27, 2023
cafa39f
Update _help.py
New-dev0 May 27, 2023
f951756
add manager help
New-dev0 May 28, 2023
b6e62fa
Merge branch 'rewrite' of https://github.com/TeamUltroid/Ultroid into…
New-dev0 May 28, 2023
f183bbc
test
New-dev0 May 28, 2023
8bb238c
setup localization
New-dev0 May 28, 2023
9a9bb94
https://t.me/UltroidDevChat/4810
New-dev0 May 29, 2023
1371b50
Commit at right repo
New-dev0 Jun 16, 2023
1f009eb
hmm
New-dev0 Jun 18, 2023
fd912ed
Add file which I hate most
New-dev0 Jun 18, 2023
13647f7
Update tools.py
New-dev0 Jun 18, 2023
4678477
fix for restart and mediainfo. (#415)
lanowde Jun 19, 2023
e721aa7
Update mediainfo.py
New-dev0 Jun 19, 2023
a6ee48d
oops
New-dev0 Jun 19, 2023
4af772e
update vctools
New-dev0 Jun 20, 2023
adb4e1a
add docstrings
New-dev0 Jun 20, 2023
7b521b0
add help string
New-dev0 Jun 20, 2023
d31e81d
fix help back indexing
New-dev0 Jun 20, 2023
1377946
there is no place for owner tools
New-dev0 Jun 21, 2023
5a31573
fix strings
New-dev0 Jun 21, 2023
ee25255
Update
New-dev0 Jun 22, 2023
8da9e39
few more
New-dev0 Jun 22, 2023
2baae3a
on the go
New-dev0 Jun 22, 2023
4441779
..
New-dev0 Jun 23, 2023
4000eb4
...
New-dev0 Jun 23, 2023
776cf67
minor fix
New-dev0 Jun 24, 2023
9c909fd
Update devtools.py
New-dev0 Jun 25, 2023
9e63b83
sometimes clear answer doesnt exists
New-dev0 Jun 26, 2023
d61c7b8
Merge branch 'rewrite' of https://github.com/TeamUltroid/Ultroid into…
New-dev0 Jun 26, 2023
a3463c8
or answer exists
New-dev0 Jun 26, 2023
7831f5b
fix pack names
New-dev0 Jun 26, 2023
afb7f78
Rpcerrors are beautiful when short
New-dev0 Jun 27, 2023
6b41209
Update devtools.py
New-dev0 Jun 27, 2023
667b952
Update devtools.py
New-dev0 Jun 27, 2023
a722ddb
Update devtools.py
New-dev0 Jun 27, 2023
700aa88
Eat food either way it will go to stomach
New-dev0 Jun 27, 2023
d5cc7f5
lang
New-dev0 Jun 28, 2023
8ffc09f
update converters
New-dev0 Jun 28, 2023
31ce70f
recover file
New-dev0 Jun 28, 2023
d50a859
#todo: fix lottie on windows
New-dev0 Jun 28, 2023
d382849
Update BaseClient.py
buddhhu Jun 29, 2023
ff2cf9b
Update BaseClient.py
buddhhu Jun 29, 2023
7e89a1f
Update mediainfo.py
New-dev0 Jun 29, 2023
3c10711
nothing to say
New-dev0 Jun 29, 2023
3653f8b
Update _decorators.py
buddhhu Jun 29, 2023
57df77a
Update tools.py
New-dev0 Jun 30, 2023
8cb6dc1
Why do you exist
buddhhu Jul 20, 2023
cba26f8
Let it handle
buddhhu Jul 20, 2023
f1c60db
Update BaseClient.py
buddhhu Jul 20, 2023
30570f6
chore: update license year
xditya Aug 14, 2023
2801ca4
Merge branch 'rewrite' of https://github.com/TeamUltroid/Ultroid into…
xditya Aug 14, 2023
b4376d9
Introduce `creds`
TechiError Aug 14, 2023
f74995f
`AttributeError: 'PhotoSize' object has no attribute 'location'
buddhhu Aug 15, 2023
954594c
Revert
New-dev0 Aug 18, 2023
9b4a63c
Update _decorators.py
buddhhu Aug 18, 2023
ba9741d
Add files via upload
buddhhu Aug 18, 2023
a4719ef
Update gdrive.py
buddhhu Aug 18, 2023
5394324
Update gdrive.py
buddhhu Aug 18, 2023
6e46764
Highness at it's peak
buddhhu Aug 18, 2023
64c7071
Update helper.py
buddhhu Aug 18, 2023
0cd52e9
parse creds as dict not string
TechiError Aug 19, 2023
fe25ece
Gdrive files list
buddhhu Aug 20, 2023
fb8b07e
Gdrive files list
buddhhu Aug 20, 2023
1ebdc8f
Gdrive files list
buddhhu Aug 20, 2023
f748436
Gdrive files list
buddhhu Aug 20, 2023
616d046
Gdrive files list
buddhhu Aug 20, 2023
48a150d
Gdrive files list
buddhhu Aug 20, 2023
24babae
Wake bot after floodwait
buddhhu Aug 20, 2023
138edcc
Fix help
buddhhu Aug 20, 2023
a714f1c
Fix help
buddhhu Aug 20, 2023
24847d3
Fix help
buddhhu Aug 20, 2023
e872ae6
Fix help
buddhhu Aug 20, 2023
d1515ec
Fix help
buddhhu Aug 20, 2023
ecd31c8
Update _help.py
buddhhu Aug 20, 2023
9fba7b2
gDrive: cleanup service account auth
TechiError Aug 27, 2023
2c819eb
Fix jwt RS256 not found
TechiError Aug 27, 2023
655fda9
Waah
buddhhu Aug 29, 2023
e154d11
Update gdrive.py
buddhhu Sep 1, 2023
67b9cfa
Imports
buddhhu Sep 17, 2023
e1e65f4
Search files/folder in drive
buddhhu Sep 19, 2023
627a0b1
return on error
buddhhu Sep 19, 2023
934f883
Get files from every page
buddhhu Sep 21, 2023
e33617c
Push from local
New-dev0 Dec 11, 2023
bf3d093
Merge branch 'rewrite' of https://github.com/TeamUltroid/Ultroid into…
New-dev0 Dec 11, 2023
030d343
gdrive downloader
buddhhu Jan 1, 2024
96abe16
Update gdrive.py
buddhhu Jan 1, 2024
57f2f55
`TypeError: object of type 'int' has no attribute len()`
buddhhu Jan 1, 2024
61ee4e8
TimeoutError
buddhhu Jan 1, 2024
038b1d4
Return `refresh_token` everytime a user gets authorised
buddhhu Feb 8, 2024
dee0935
Update helper.py
buddhhu Feb 9, 2024
12f434c
Update gdrive.py
buddhhu Apr 12, 2024
c335f9e
stories plugin, minor fixes
New-dev0 May 13, 2024
6407667
add required modules back to base
New-dev0 May 16, 2024
dbf1f79
fix: stickers
New-dev0 May 17, 2024
0085b32
sync changes
New-dev0 May 17, 2024
d450659
#todo sessiongen
New-dev0 May 19, 2024
01d5e9d
feat: fix session path
xditya Jun 11, 2024
fe59bf0
https://t.me/c/1553123733/1146145
New-dev0 Jun 12, 2024
a6b4787
Merge branch 'rewrite' of https://github.com/TeamUltroid/Ultroid into…
New-dev0 Jun 12, 2024
967d3c0
add settings, fix translate
New-dev0 Jun 13, 2024
196dca5
Update gdrive.py
buddhhu Aug 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .env.sample

This file was deleted.

25 changes: 14 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,44 +1,47 @@
.env
*.session-journal
*.session
build
test*
*.mp3
*.webm
*.webp
*.mp4
*.tgs
*.txt
script*
!runtime.txt
!requirements.txt
/*.jpg
/*.png
/*.mp4
*.log
target/npmlist.json
package-lock.json
ultroid.json
resources/extras/thumbnail.jpg
temp*
resources/downloads/
push.bat
modules/channels/
modules/manager/
localization/strings/
ultroid*.json

# Directories
addons/
vcbot/
__pycache__/
venv/
node_modules/
glitch_me/
src/glitch-me
.idea/
.vscode/
temp/
bin-debug/
bin-release/
[Oo]bj/
[Bb]in/
.settings/
*.swf
*.air
*.ipa
*.apk
*.webp
*.cpp

.vs
env
# temporary files
*.raw

Expand Down
23 changes: 0 additions & 23 deletions CONTRIBUTING.md

This file was deleted.

13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
# Ultroid - UserBot
# Copyright (C) 2021-2022 TeamUltroid
# Copyright (C) 2020-2023 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/>.

FROM theteamultroid/ultroid:main
FROM python:latest

# set timezone
ENV TZ=Asia/Kolkata
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

COPY installer.sh .
ADD . /root/TeamUltroid

RUN bash installer.sh

# changing workdir
WORKDIR "/root/TeamUltroid"

RUN ./ultroid install

# start the bot.
CMD ["bash", "startup"]
CMD ["./ultroid", "start"]
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<p align="center">
<img src="./resources/extras/logo_readme.jpg" alt="TeamUltroid Logo">
<img src="./resources/ultroid.webp" alt="TeamUltroid Logo">
</p>
<h1 align="center">
<b>Ultroid - UserBot</b>
</h1>

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

[![](https://img.shields.io/badge/Ultroid-v0.8-crimson)](#)
[![](https://img.shields.io/badge/Ultroid-v1-blueviolet)](#)
[![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/)
Expand All @@ -33,7 +33,7 @@
# Tutorial
- Full Tutorial - [![Full Tutorial](https://img.shields.io/badge/Watch%20Now-blue)](https://www.youtube.com/watch?v=0wAV7pUzhDQ)

- Tutorial to get Redis URL and password - [here.](./resources/extras/redistut.md)
- Tutorial to get Redis URL and password - [here.](./resources/images/redistut.md)
---

## Deploy to Heroku
Expand Down Expand Up @@ -70,7 +70,7 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
`pip(3) install -U -r requirements.txt`
- Generate your `SESSION`:
- For Linux users:
`bash sessiongen`
`bash ./ultroid session`
or
`wget -O session.py https://git.io/JY9JI && python3 session.py`
- For Termux users:
Expand All @@ -81,16 +81,15 @@ Get the [Necessary Variables](#Necessary-Variables) and then click the button be
(You can either edit and rename the file or make a new file named `.env`.)
- Run the bot:
- Linux Users:
`bash startup`
`./ultroid start`
- Windows Users:
`python(3) -m pyUltroid`

---
## Necessary Variables
- `SESSION` - SessionString for your accounts login session. Get it from [here](#Session-String)

One of the following database:
- For **Redis** (tutorial [here](./resources/extras/redistut.md))
- For **Redis** (tutorial [here](./resources/images/redistut.md))
- `REDIS_URI` - Redis endpoint URL, from [redislabs](http://redislabs.com/).
- `REDIS_PASSWORD` - Redis endpoint Password, from [redislabs](http://redislabs.com/).
- For **MONGODB**
Expand Down Expand Up @@ -118,5 +117,5 @@ Ultroid is licensed under [GNU Affero General Public License](https://www.gnu.or
* [![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)
* [MarshalX](https://github.com/MarshalX) for [PyTgCalls.](https://github.com/MarshalX/tgcalls)

* [Dan](https://github.com/delivrance) for [TgCrypto.](https://github.com/pyrogram/tgcrypto)
> Made with 💕 by [@TeamUltroid](https://t.me/TeamUltroid).
34 changes: 0 additions & 34 deletions assistant/__init__.py

This file was deleted.

Loading
Loading