Skip to content

Commit 6f44b38

Browse files
1Danish-00New-dev0buddhhuTechiErrorxditya
committed
v0.2 11/10/2021
Co-authored-by: New-dev0 <New-dev0@users.noreply.github.com> Co-authored-by: Amit Sharma <buddhhu@users.noreply.github.com> Co-authored-by: TechiError <techierror@users.noreply.github.com> Co-authored-by: Aditya <me@xditya.me> Co-authored-by: Sonya Nikiforova <Sonniki@users.noreply.github.com> Co-authored-by: M̲αραт <Marty2509@users.noreply.github.com> Co-authored-by: Muhamad Risman Aziz <mrismanaziz@users.noreply.github.com> Co-authored-by: Arnab Paryali <Arnabxd@users.noreply.github.com> Co-authored-by: hellboi_atul <hellboi-atul@users.noreply.github.com> Co-authored-by: sppidy <sppidy@users.noreply.github.com>
1 parent 8f28387 commit 6f44b38

File tree

165 files changed

+5535
-4153
lines changed

Some content is hidden

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

165 files changed

+5535
-4153
lines changed

CODE_OF_CONDUCT.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
teamultroid@ultroid.tech.
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Welcome To Contributing Guide
2+
Any contribution done to this repository will be appreciated! 🎉
3+
4+
### Issues
5+
- Search for existing Similar issues.
6+
- You can open a issue first before contributing, If it contain some major changes like `bug fixes` or `feature addition`.
7+
- If you are busy or getting trouble while making changes, you can just open the issue (explaining it).
8+
9+
### Contributing
10+
- You can [fork](https://github.com/TeamUltroid/Ultroid/fork) this repository.
11+
- You can commits your changes now.
12+
- You can [Git-Squash](https://docs.github.com/en/get-started/using-git/about-git-rebase) your commits, if they are more. [Optional]
13+
- At last, You are ready to [`make a Pull Request`](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request).
14+
- Make sure that, your `Pull Request` contain an explaining title and issue number if it closes any open issue.
15+
16+
### Thanks
17+
- Congrats! 💫 you have successfully made your Contribution to Ultroid.

Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ FROM theteamultroid/ultroid:main
77

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

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

16-
# install main requirements.
17-
RUN pip3 install --no-cache-dir -r requirements.txt
18-
RUN pip3 uninstall av -y && pip3 install av --no-binary av
18+
# changing workdir
19+
WORKDIR /root/TeamUltroid/
1920

2021
# start the bot
2122
CMD ["bash", "resources/startup/startup.sh"]

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
## Deploy to Heroku
3838
Get the [Necessary Variables](#Necessary-Variables) and then click the button below!
3939

40-
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://dashboard.heroku.com/new?button-url=https%3A%2F%2Fgithub.com%2FNew-dev0%2FTraveliTg&template=https%3A%2F%2Fgithub.com%2FNew-dev0%2FTraveliTg)
40+
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://dashboard.heroku.com/new?button-url=https%3A%2F%2Fgithub.com%2FNew-dev0%2FArchived&template=https%3A%2F%2Fgithub.com%2FNew-dev0%2FArchived)
4141

4242
## Deploy Locally
4343
- [Traditional Method](#local-deploy---traditional-method)
@@ -68,6 +68,7 @@ Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli
6868
`virtualenv -p /usr/bin/python3 venv`
6969
`. ./venv/bin/activate`
7070
- Install the requirements: <br />
71+
`pip(3) install -U -r re*/st*/optional-requirements.txt`
7172
`pip(3) install -U -r requirements.txt`
7273
- Generate your `SESSION`:
7374
- For Linux users:
@@ -89,7 +90,7 @@ Further, take a look at the [`docs`](https://blue-devil1134.github.io/UltroidCli
8990
## Necessary Variables
9091
- `SESSION` - SessionString for your accounts login session. Get it from [here](#Session-String)
9192
- `REDIS_URI` - Redis endpoint URL, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
92-
- `REDIS_PASSWORD ` - Redis endpoint Password, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
93+
- `REDIS_PASSWORD` - Redis endpoint Password, from [redislabs](http://redislabs.com/), tutorial [here.](./resources/extras/redistut.md)
9394

9495
## Session String
9596
Different ways to get your `SESSION`:

assistant/__init__.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
77

88
from pyUltroid import *
9-
from pyUltroid.dB.database import Var
10-
from pyUltroid.functions.all import *
9+
from pyUltroid.functions.helper import *
10+
from pyUltroid.misc import owner_and_sudos
11+
from pyUltroid.misc._assistant import asst_cmd, callback, in_pattern
1112
from telethon import Button, custom
1213

13-
from strings import get_languages, get_string
14+
from plugins import ATRA_COL
15+
from strings import get_languages, get_string, language
1416

1517
OWNER_NAME = ultroid_bot.me.first_name
1618
OWNER_ID = ultroid_bot.me.id
1719

20+
AST_PLUGINS = {}
21+
1822

1923
async def setit(event, name, value):
2024
try:

assistant/api_setter.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
# PLease read the GNU Affero General Public License in
66
# <https://www.github.com/TeamUltroid/Ultroid/blob/main/LICENSE/>.
77

8+
from telethon import events
9+
810
from . import *
911

1012
# main menu for api setting
1113

1214

13-
@callback("apiset")
14-
@owner
15-
async def apiset(event):
15+
@callback("apiset", owner=True)
16+
async def apiset(event: events.CallbackQuery):
1617
await event.edit(
1718
get_string("ast_1"),
1819
buttons=[
@@ -24,9 +25,8 @@ async def apiset(event):
2425
)
2526

2627

27-
@callback("rmbg")
28-
@owner
29-
async def rmbgapi(event):
28+
@callback("rmbg", owner=True)
29+
async def rmbgapi(event: events.CallbackQuery):
3030
await event.delete()
3131
pru = event.sender_id
3232
var = "RMBG_API"
@@ -48,9 +48,8 @@ async def rmbgapi(event):
4848
)
4949

5050

51-
@callback("dapi")
52-
@owner
53-
async def rmbgapi(event):
51+
@callback("dapi", owner=True)
52+
async def rmbgapi(event: events.CallbackQuery):
5453
await event.delete()
5554
pru = event.sender_id
5655
var = "DEEP_API"
@@ -72,9 +71,8 @@ async def rmbgapi(event):
7271
)
7372

7473

75-
@callback("oapi")
76-
@owner
77-
async def rmbgapi(event):
74+
@callback("oapi", owner=True)
75+
async def rmbgapi(event: events.CallbackQuery):
7876
await event.delete()
7977
pru = event.sender_id
8078
var = "OCR_API"

0 commit comments

Comments
 (0)