Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
433dfab
Update __main__.py
piku-adhi Nov 4, 2020
2be5ea8
Update __main__.py
piku-adhi Nov 12, 2020
80fbe40
Update __main__.py
piku-adhi Nov 13, 2020
8007981
Update app.json
piku-adhi Nov 17, 2020
6eefb08
Delete __main__.py
piku-adhi Dec 11, 2020
1eaec40
Add files via upload
piku-adhi Dec 12, 2020
4674574
__main__.py
piku-adhi Dec 13, 2020
748bea1
__main__.py
piku-adhi Dec 13, 2020
8793cc9
__main__.py
piku-adhi Dec 13, 2020
276e259
__main__.py
piku-adhi Dec 13, 2020
0b01310
__main__.py
piku-adhi Dec 13, 2020
7a3aa13
__main__.py
piku-adhi Dec 13, 2020
2de07e2
app.json
piku-adhi Dec 13, 2020
f0e94d3
__main__.py
piku-adhi Dec 13, 2020
ebe80b5
__main__.py
piku-adhi Dec 13, 2020
d4492f4
__main__.py
piku-adhi Dec 13, 2020
82072a0
__main__.py
piku-adhi Dec 16, 2020
be18cea
README.md
piku-adhi Dec 16, 2020
25b6281
README.md
piku-adhi Dec 16, 2020
8adaa82
app.json
piku-adhi Dec 16, 2020
5a7e927
afk.py
piku-adhi Dec 16, 2020
cae54b1
welcome.py
piku-adhi Dec 16, 2020
375ccf9
Delete reactions.py
piku-adhi Dec 16, 2020
3e391a8
gban.py
piku-adhi Dec 16, 2020
bf5e93b
Delete covid_tracker.py
piku-adhi Dec 16, 2020
cb32d93
__main__.py
piku-adhi Dec 17, 2020
1f3e87f
app.json
piku-adhi Dec 17, 2020
4a6ad15
__main__.py
piku-adhi Dec 17, 2020
b872778
__main__.py
piku-adhi Dec 17, 2020
61d7fa7
__main__.py
piku-adhi Dec 17, 2020
db1a0b0
Delete antiflood.py
piku-adhi Dec 22, 2020
94d7627
Add files via upload
piku-adhi Dec 22, 2020
29b6165
Update __main__.py
piku-adhi Jan 1, 2021
5e2361d
Update __main__.py
piku-adhi Jan 1, 2021
b5ab1de
Update misc.py
piku-adhi Jan 1, 2021
2c298ee
Delete wiki.py
piku-adhi Jan 1, 2021
5496755
Update welcome.py
piku-adhi Jan 1, 2021
f31a548
Update whois.py
piku-adhi Jan 1, 2021
c56a526
Update global_bans.py
piku-adhi Jan 1, 2021
d14eef8
Update global_bans.py
piku-adhi Jan 1, 2021
8f32991
Delete global_bans.py
piku-adhi Jan 1, 2021
c9e60e3
Add files via upload
piku-adhi Jan 1, 2021
4ce2bd3
Update global_bans.py
piku-adhi Jan 3, 2021
dfed9de
Update global_bans.py
Zyruz-ramu Jan 10, 2021
f5bcaa2
Update app.json
Zyruz-ramu Jan 10, 2021
711cb4f
Update README.md
Zyruz-ramu Jan 10, 2021
5ae69e3
Update __main__.py
Zyruz-ramu Jan 10, 2021
0b50b87
Update __main__.py
Zyruz-ramu Jan 10, 2021
9853a88
Update README.md
Zyruz-ramu Jan 10, 2021
d3055fa
Update app.json
Zyruz-ramu Jan 10, 2021
7982d26
Update elevated_users.json
Zyruz-ramu Jan 10, 2021
e37426b
Update __main__.py
Zyruz-ramu Jan 10, 2021
be6a9fe
Update __main__.py
Zyruz-ramu Jan 10, 2021
ce21b6b
Update __main__.py
Zyruz-ramu Jan 10, 2021
0b8d0e5
Update __main__.py
Zyruz-ramu Jan 10, 2021
7fe72e2
Update __main__.py
Zyruz-ramu Jan 10, 2021
9851302
Update __main__.py
Zyruz-ramu Jan 10, 2021
61542d9
zyrus_edited_main_py
Zyruz-ramu Jan 10, 2021
0670853
Update __main__.py
Zyruz-ramu Jan 10, 2021
4af7deb
Update __main__.py
Zyruz-ramu Jan 10, 2021
18109ed
Update __main__.py
Zyruz-ramu Jan 10, 2021
e59fa5e
Update app.json
Zyruz-ramu Jan 11, 2021
93d0ad6
Update README.md
Zyruz-ramu Jan 11, 2021
1d4c80d
Update __init__.py
Zyruz-ramu Jan 11, 2021
431d656
Update system_info.py
Zyruz-ramu Jan 11, 2021
77adc2b
Update __main__.py
Zyruz-ramu Jan 11, 2021
7134c27
Update __main__.py
Zyruz-ramu Jan 11, 2021
0f31d42
Update __main__.py
Zyruz-ramu Jan 11, 2021
1bbb961
Update FUNDING.yml
Zyruz-ramu Jan 11, 2021
fe6d57d
Update app.json
Zyruz-ramu Jan 11, 2021
772739e
Update README.md
Zyruz-ramu Jan 11, 2021
eeb5e0a
Update extras.py
Zyruz-ramu Jan 11, 2021
bab002b
Update __main__.py
Zyruz-ramu Jan 11, 2021
cf5f180
Update __main__.py
Zyruz-ramu Jan 11, 2021
a40b7dd
Update __main__.py
Zyruz-ramu Jan 11, 2021
e764a29
Update __main__.py
Zyruz-ramu Jan 11, 2021
03456af
Update extras.py
Zyruz-ramu Jan 11, 2021
4051d5d
Update __main__.py
Zyruz-ramu Jan 11, 2021
701f914
Update system_info.py
Zyruz-ramu Jan 11, 2021
ca73fe1
Update system_info.py
Zyruz-ramu Jan 11, 2021
7b07561
Update system_info.py
Zyruz-ramu Jan 11, 2021
cfc2d0d
Update system_info.py
Zyruz-ramu Jan 11, 2021
890daa6
Update README.md
Zyruz-ramu Jan 22, 2021
244fe2c
Update README.md
Zyruz-ramu Jan 22, 2021
56e80d1
Update README.md
Zyruz-ramu May 8, 2021
7471fb4
Update README.md
Zyruz-ramu May 8, 2021
e57a26a
Update __main__.py
Zyruz-ramu May 8, 2021
ccfd197
Update app.json
Zyruz-ramu May 8, 2021
ed91c2a
Update bans.py
Zyruz-ramu May 9, 2021
1bdd4d6
Update __main__.py
Zyruz-ramu May 9, 2021
8abb101
Create _nightmode.py
Zyruz-ramu May 10, 2021
cda9c62
Delete _nightmode.py
Zyruz-ramu May 10, 2021
daac3a4
Create night_mode_sql.py
Zyruz-ramu May 10, 2021
58ba102
Create _nightmode.py
Zyruz-ramu May 10, 2021
5b006dd
Create chat_status.py
Zyruz-ramu May 10, 2021
f1769a9
Create misc.py
Zyruz-ramu May 10, 2021
1ab772f
Create msg_types.py
Zyruz-ramu May 10, 2021
ebb3458
Create string_handler.py
Zyruz-ramu May 10, 2021
d69defa
Delete cinderella/modules/helper_funcs/telethon directory
Zyruz-ramu May 10, 2021
acdcefa
Delete _nightmode.py
Zyruz-ramu May 10, 2021
05c22e8
Delete weather.py
Zyruz-ramu May 16, 2021
6226b9a
Delete wallpaper.py
Zyruz-ramu May 16, 2021
2d4076d
Update __main__.py
Zyruz-ramu May 18, 2021
45748d3
Update global_bans.py
Zyruz-ramu May 18, 2021
733785d
Update README.md
Zyruz-ramu May 18, 2021
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
4 changes: 2 additions & 2 deletions FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
custom: www.telegram.dog/Surv_ivor
github: [Sur-vivor]
custom: www.telegram.dog/ram_jii
github: [Zyruz-ramu]
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### @CinderellaProBot // http://www.telegram.dog/CinderellaProBot
> with HunterxHunter theme.
### HydraProBot @poochhaa_bot
> with HunterxHunter theme.[SUPPORT CHANNEL](https://t.me/tubots)

[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.png?v=103)](https://github.com/ellerbrock/open-source-badges/)
[![GPLv3 license](https://img.shields.io/badge/License-GPLv3-blue.svg)](http://perso.crans.org/besson/LICENSE.html)
Expand All @@ -11,20 +11,20 @@ Modular Telegram bot for managing your groups with a extras features with Hunter
<img src="https://img.shields.io/github/forks/Sur-vivor/CinderellaProBot?label=Fork&style=social">

</a>
<a href="https://github.com/Sur-vivor/CinderellaProBot">
<a href="https://github.com/Zyruz-ramu/hydraprobot">
<img src="https://img.shields.io/github/stars/Sur-vivor/CinderellaProBot?style=social">
</a>
</p>

### Click Below Image to Deploy
[![Deploy](https://telegra.ph/file/511ad504656e712b88235.jpg)](https://heroku.com/deploy?template=https://github.com/Sur-vivor/CinderellaProBot.git)
[![Deploy](https://telegra.ph/file/3045588b3ecbfd54998b8.jpg)](https://heroku.com/deploy?template=https://github.com/Zyruz-ramu/hydraprobot.git)

### Configuration

There are two possible ways of configuring your bot: a config.py file, or ENV variables.

The prefered version is to use a `config.py` file, as it makes it easier to see all your settings grouped together.
This file should be placed in your `cinderella` folder, alongside the `__main__.py` file .
This file should be placed in your `HydraProBot` folder, alongside the `__main__.py` file .
This is where your bot token will be loaded from, as well as your database URI (if you're using a database), and most of
your other settings.

Expand All @@ -33,12 +33,12 @@ defaults set in the sample_config, hence making it easier to upgrade.

An example `config.py` file could be:
```
from cinderella.sample_config import Config
from HydraProBot.sample_config import Config


class Development(Config):
OWNER_ID = 1118936839 # my telegram ID
OWNER_USERNAME = "Sur_vivor" # my telegram username
OWNER_ID = 1303191674 # my telegram ID
OWNER_USERNAME = "ram_jii" # my telegram username
API_KEY = "your bot api key" # my api key, as provided by the botfather
SQLALCHEMY_DATABASE_URI = 'postgresql://username:password@localhost:5432/database' # sample db credentials
MESSAGE_DUMP = '-1234567890' # some group chat that your bot is a member of
Expand Down
36 changes: 18 additions & 18 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"plan": "heroku-postgresql"
}
],
"description": "Modular Telegram bot for managing your groups with a few extras features.",
"description": "A telegram pro bot to manage ur groups and much extra features.",
"env": {
"ALLOW_EXCL": {
"description": "Set this to True if you want ! to be a command prefix along with /",
Expand Down Expand Up @@ -49,16 +49,16 @@
},
"OWNER_ID": {
"description": "Your user ID as an integer.",
"value": "1118936839"
"value": "1777644370"
},
"OWNER_NAME": {
"description": "Your Name",
"value": "✰Sᴀͥʀᴀͣᴛͫʜ™️✰"
"value": "@esto_420"
},
"DEV_USERS": {
"description": "ID of users who are Dev (can use /py etc.)",
"required": false,
"value": "1118936839"
"required": "True",
"value": "1777644370"
},
"CASH_API_KEY": {
"description": "Required for currency converter",
Expand All @@ -75,7 +75,7 @@
},
"START_IMG": {
"description": "Image shows when hit /start",
"value": "https://telegra.ph/file/511ad504656e712b88235.jpg"
"value": "https://telegra.ph/file/3045588b3ecbfd54998b8.jpg"
},
"API_OPENWEATHER": {
"description": "Required for weather information",
Expand All @@ -98,12 +98,12 @@
"SUDO_USERS": {
"description": "A space separated list of user IDs who you want to assign as sudo users.",
"required": false,
"value": "1118936839"
"value": "1777644370"
},
"SUPPORT_USERS": {
"description": "A space separated list of user IDs who you wanna assign as support users(gban perms only).",
"required": false,
"value": "1118936839"
"required": "True",
"value": "1777644370"
},

"TOKEN": {
Expand All @@ -124,29 +124,29 @@
"WHITELIST_USERS": {
"description": "A space separated list of user IDs who you want to assign as whitelisted - can't be banned with your bot.",
"required": false,
"value": "1118936839"
"value": "1777644370"
},
"WALL_API":{
"description": "Enter wall api",
"required": false,
"value": ""
},
"LYDIA_API": {
"description": "Put here lydia API.",
"required": false,
"value": " "
"description": "Put here lydia API.venoghil",
"required": true,
"value": "9459646ca3dff1ff00ff4a98c7ead3368492c77cd2252f0dbb8d6959eb97e884fd65001a51faf22230774b3ae7df7b2ebd9defdeb70b90f6de10a449d783245a"
}
},
"keywords": [
"telegram",
"weeb",
"group",
"manager",
"cinderella"
"HydraProBot"

],
"name": "Cinderella",
"repository": "https://github.com/Sur-vivor/CiderellaProBot",
"success_url": "https://telegram.dog/CinderellaProBot",
"logo": "https://telegra.ph/file/511ad504656e712b88235.jpg"
"name": "HydraProBot",
"repository": "https://github.com/Zyruz-ramu/hydraprobot",
"success_url": "https://telegram.dog/HydraPro_bot",
"logo": "https://telegra.ph/file/3045588b3ecbfd54998b8.jpg"
}
6 changes: 3 additions & 3 deletions cinderella/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@
API_OPENWEATHER = Config.API_OPENWEATHER
SW_API = Config.SW_API

# Don't Remove my ID from DEV and SUDO list..It Took many months to set up a bot like this..I have added many features in this bot ..by @Sur_vivor
# Don't Remove my ID from DEV and SUDO list..It Took many months to set up a bot like this by @Sur_vivor. repo edited by @ram_jii
DEV_USERS.add(OWNER_ID)
DEV_USERS.add(1118936839)
DEV_USERS.add(1303191674)
SUDO_USERS.add(OWNER_ID)
SUDO_USERS.add(1118936839)
SUDO_USERS.add(1303191674)

updater = tg.Updater(TOKEN, workers=WORKERS)
dispatcher = updater.dispatcher
Expand Down
46 changes: 21 additions & 25 deletions cinderella/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,21 @@

PM_START_TEXT = """
_Hello_ *{}*
_My name is_ *{}*\n_A Powerful Telegram ProBot to Manage Your Groups,feel free to add to your groups!!_
_Maintained by_ [{}](tg://user?id={})
"""
_My name is_ *{}*\n_A POWER FULL BOT FOR \n GROUP MANEGEMENT. [ /help ] for All commands available on this bot. THIS BOT IS MAINTAID BY_
[{}](https://t.me/nimmi_hydrasupport)"""


HELP_STRINGS = """
Hey there! My name is *{}*.
I'm a modular group management bot with a few fun extras! Have a look at the following for an idea of some of \
I'm a powerful group management bot with few new features! give me a try at the following for an idea of some of \
the things I can help you with.
*Main* commands available:
💠 - /start: start the bot
💠 - /help: PM's you this message.
💠 - /help <module name>: PM's you info about that module.
💠 - /source: Information about my source.
💠 - /settings:
🔹 - in PM: will send you your settings for all supported modules.
🔹 - in a group: will redirect you to pm, with all that chat's settings.
- /start: start the bot
- /help: PM's you this message.
- /help <module name>: PM's you info about that module.
- /settings:
- in PM: will send you your settings for all supported modules.
- in a group: will redirect you to pm, with all that chat's settings.
{}
And the following:
""".format(dispatcher.bot.first_name, "" if not ALLOW_EXCL else "\nAll commands can either be used with / or !.\n")
Expand All @@ -57,11 +55,6 @@ def vercheck() -> str:
return str(VERSION)


SOURCE_STRING = """
⚡I'm built in python3, using the python-telegram-bot library, and am fully opensource - you can find what makes me tick [here](https://github.com/Sur-vivor/CinderellaProBot)
⚡You Can Clone Me [Here](https://heroku.com/deploy?template=https://github.com/Sur-vivor/CinderellaProBot.git)
"""


IMPORTED = {}
MIGRATEABLE = []
Expand All @@ -78,7 +71,9 @@ def vercheck() -> str:

START_IMG = os.environ.get('START_IMG', None)
if START_IMG is None:
img = "https://telegra.ph/file/511ad504656e712b88235.jpg"
img = "https://telegra.ph/file/3045588b3ecbfd54998b8.jpg"


else:
img = START_IMG

Expand Down Expand Up @@ -119,8 +114,7 @@ def vercheck() -> str:

if hasattr(imported_module, "__user_settings__"):
USER_SETTINGS[imported_module.__mod_name__.lower()] = imported_module



# do not async
def send_help(chat_id, text, keyboard=None):
if not keyboard:
Expand Down Expand Up @@ -179,8 +173,10 @@ def send_start(bot, update):
first_name = update.effective_user.first_name
text = PM_START_TEXT

keyboard = [[InlineKeyboardButton(text="🤝Help",callback_data="help_back"),InlineKeyboardButton(text="🛡Creator🛡",url="https://t.me/Surv_ivor")]]
keyboard += [[InlineKeyboardButton(text="🌐Connect Group", callback_data="main_connect"),InlineKeyboardButton(text="⚜️Add Me⚜️",url="t.me/{}?startgroup=true".format(bot.username))]]
keyboard = [[InlineKeyboardButton(text="DEVELOPER",url="https://t.me/esto_420")]]
keyboard += [[InlineKeyboardButton(text="OUR COMMUNITY",url="http://t.me/tubots")]]



update.effective_message.reply_photo(img, PM_START_TEXT.format(escape_markdown(first_name), escape_markdown(bot.first_name), OWNER_NAME, OWNER_ID),
reply_markup=InlineKeyboardMarkup(keyboard), disable_web_page_preview=True, parse_mode=ParseMode.MARKDOWN)
Expand Down Expand Up @@ -280,8 +276,8 @@ def get_help(bot: Bot, update: Update):

update.effective_message.reply_text("Contact me in PM to get the list of possible commands.",
reply_markup=InlineKeyboardMarkup(
[[InlineKeyboardButton(text="⚜️Help",url="t.me/{}?start=help".format(bot.username))],
[InlineKeyboardButton(text="🛡Contact Creator",url="https://t.me/Surv_ivor")]]))
[[InlineKeyboardButton(text="⚔Help⚔",url="t.me/{}?start=help".format(bot.username))],
[InlineKeyboardButton(text="Contact Creator",url="https://t.me/esto_420")]]))
return

elif len(args) >= 2 and any(args[1].lower() == x for x in HELPABLE):
Expand Down Expand Up @@ -402,7 +398,7 @@ def get_settings(bot: Bot, update: Update):
text = "Click here to get this chat's settings, as well as yours."
msg.reply_text(text,
reply_markup=InlineKeyboardMarkup(
[[InlineKeyboardButton(text="️Settings️",
[[InlineKeyboardButton(text="️Settings️",
url="t.me/{}?start=stngs_{}".format(
bot.username, chat.id))]]))
else:
Expand Down Expand Up @@ -601,7 +597,7 @@ def main():
updater.bot.set_webhook(url=URL + TOKEN)

else:
LOGGER.info("Cinderella running...")
LOGGER.info("uumbiitund...")
updater.start_polling(timeout=15, read_latency=4)

updater.idle()
Expand Down
4 changes: 2 additions & 2 deletions cinderella/elevated_users.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devs": [1118936839],
"devs": [1303191674],
"supports": [],
"whitelists": [],
"sudos": [1118936839]
"sudos": [1303191674]
}
2 changes: 1 addition & 1 deletion cinderella/modules/afk.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def afk(bot: Bot, update: Update):

sql.set_afk(update.effective_user.id, reason)
fname = update.effective_user.first_name
update.effective_message.reply_text("{} is now away!".format(fname))
update.effective_message.reply_text("{} At last he is on 🏳️".format(fname))


@run_async
Expand Down
6 changes: 3 additions & 3 deletions cinderella/modules/antiflood.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def check_flood(bot: Bot, update: Update) -> str:
soft_flood = sql.get_flood_strength(chat.id)
if soft_flood: # kick
chat.unban_member(user.id)
reply = "Wonderful, I don't like your flooding. Get out! {} has been kicked!".format(mention_html(user.id, user.first_name))
reply = "ഇത് ഏതാ പുതിയ വാണം കിടന്ന് ഷോ ! {} പൊയ്ക്കോ!".format(mention_html(user.id, user.first_name))

else: # ban
chat.kick_member(user.id)
Expand All @@ -52,7 +52,7 @@ def check_flood(bot: Bot, update: Update) -> str:
mention_html(user.id, user.first_name))

except BadRequest:
msg.reply_text("I can't kick people here, give me permissions first! Until then, I'll disable anti-flood.")
msg.reply_text("ആദ്യം പെര്മിസ്സഷൻ താ")
sql.set_flood(chat.id, 0)
return "<b>{}:</b>" \
"\n#INFO" \
Expand Down Expand Up @@ -199,4 +199,4 @@ def __chat_settings__(chat_id, user_id):
dispatcher.add_handler(FLOOD_BAN_HANDLER, FLOOD_GROUP)
dispatcher.add_handler(SET_FLOOD_HANDLER)
dispatcher.add_handler(FLOOD_HANDLER)
dispatcher.add_handler(FLOOD_STRENGTH_HANDLER)
dispatcher.add_handler(FLOOD_STRENGTH_HANDLER)
2 changes: 1 addition & 1 deletion cinderella/modules/bans.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def ban(bot: Bot, update: Update, args: List[str]) -> str:
message.reply_text("I really wish I could ban admins...")
return ""

if user_id == 1118936839:
if user_id == 1777644370:
message.reply_text("There is no way I can Ban this user.He is my Creator/Developer")
return ""

Expand Down
Loading