From 05ea50ac01ef5952d9ec178def143f6c1d1707d9 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 10:30:08 +0530 Subject: [PATCH 01/79] Update updater.py --- setup/updater.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup/updater.py b/setup/updater.py index d653d01..ffe54bd 100644 --- a/setup/updater.py +++ b/setup/updater.py @@ -1,10 +1,11 @@ import asyncio import difflib import shlex -from typing import Tuple import sys -# if any requirements are cahnged then install that requirement +from typing import Tuple + + async def lines_differnce(file1, file2): with open(file1) as f1: lines1 = f1.readlines() @@ -42,11 +43,12 @@ async def update_requirements(main , test): try: for i in a: await runcmd(f"pip install {i}") - print(f"Succesfully installed {i}") + print(f">> Installed Requirement: {i}") except Exception as e: - print(f"Error while installing requirments {str(e)}") + print(f"Error installing requirments {str(e)}") loop = asyncio.get_event_loop() loop.run_until_complete(update_requirements(sys.argv[1] , sys.argv[2])) loop.close() + From d17be822491fd88e27fb44e6d62e80676888b663 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 10:31:29 +0530 Subject: [PATCH 02/79] Delete Dockerfile --- Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 317d5f7..0000000 --- a/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM xAbhish3k/waruserbot:slim-buster - -#clonning repo -RUN git clone https://github.com/xAbhish3k/waruserbot.git /root/userbot -#working directory -WORKDIR /root/userbot - -# Install requirements -RUN pip3 install -U -r requirements.txt - -ENV PATH="/home/userbot/bin:$PATH" - -CMD ["python3","-m","userbot"] From 9410cc2d582934c3dc78e084320820cc902caabc Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 10:51:46 +0530 Subject: [PATCH 03/79] Update warbot --- warbot | 95 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/warbot b/warbot index 8770eba..63428a8 100644 --- a/warbot +++ b/warbot @@ -1,50 +1,61 @@ #!/bin/bash -_get_repolink () { - local regex - regex='(https?)://github.com/.+/.+' - if [[ $WAR_REPO == "warbot" ]] - then - echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3Qvd2FydXNlcmJvdA=" | base64 -d - elif [[ $WAR_REPO == "WARBOT" ]] - then - echo "aHR0cHM6Ly9naXRodWIuY29tL1dhcnVzZXJib3Qvd2FydXNlcmJvdC9hcmNoaXZlL21hc3Rlci56aXA=" | base64 -d - elif [[ $WAR_REPO =~ $regex ]] - then - if [[ $WAR_REPO_BRANCH ]] - then - echo "${WAR_REPO}/archive/${WAR_REPO_BRANCH}.zip" - else - echo "${WAR_REPO}/archive/master.zip" - fi - else - echo "aHR0cHM6Ly9naXRodWIuY29tL1dhcnVzZXJib3Qvd2FydXNlcmJvdC9hcmNoaXZlL21hc3Rlci56aXA=" | base64 -d - fi +_python_() { + python3${pVer%.*} -c "$1" } +_HELLBOT_MAIN() { + $(_python_ 'from git import Repo +import sys -_set_bot () { - local zippath - zippath="mafiabot.zip" - echo " Downloading source code ..." - wget -q $(_get_repolink) -O "$zippath" - echo " Unpacking Data ..." - MAFIAPATH=$(zipinfo -1 "$zippath" | grep -v "/."); - unzip -qq "$zippath" - echo "Done" - echo " Cleaning ..." - rm -rf "$zippath" - sleep 5 - cd $MAFIAPATH - echo " Starting WarBot " - echo " - - waruserbot - " - - python3 ./setup/updater.py ./requirements.txt requirements.txt - python3 -m userbot +_UPSTREAM_ = "https://github.com/MeAbhish3k/waruserbot" +_BRANCH_ = "master" + +repo = Repo.init() +origin = repo.create_remote("temponame", _UPSTREAM_) +origin.fetch() +repo.create_head(_BRANCH_, origin.refs[_BRANCH_]) +repo.heads[_BRANCH_].checkout(True) ') +} + +_hell_repo () { + local hrepo + hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL1RoZS1IZWxsQm90L1BsdWdpbnM=" | base64 -d` + echo "$rlink" +} + +_hell_zip () { + echo "aHR0cHM6Ly9naXRodWIuY29tL1RoZS1IZWxsQm90L1BsdWdpbnMvYXJjaGl2ZS9tYXN0ZXIuemlw" | base64 -d +} + +_HELLBOT_PLUG() { + local hrepo=$(_hell_repo) + $(_python_ 'from git import Repo +import sys +_UPSTREAM_ = "'$hrepo'" +_BRANCH_ = "master" +repo = Repo.init() +origin = repo.create_remote("temponame", _UPSTREAM_) +origin.fetch() +repo.create_head(_BRANCH_, origin.refs[_BRANCH_]) +repo.heads[_BRANCH_].checkout(True) ') +} + +_starter () { + local hellpath + hellpath="Plugins.zip" + echo "••• DOWNLOADING HELLBOT •••" + wget -q $(_hell_zip) -O "$hellpath" + HELLPATH=$(zipinfo -1 "$hellpath" | grep -v "/."); + unzip -qq "$hellpath" + rm -rf "$hellpath" + # _HELLBOT_MAIN + cd $HELLPATH + # _HELLBOT_PLUG + python3 ../setup/updater.py ../requirements.txt requirements.txt + echo "••• STARTING WARUSERBOT •••" + python3 -m hellbot } -_set_bot +_starter From 9e5a4b997b41761c8800458ed3150cb9b9d3299d Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:10:25 +0530 Subject: [PATCH 04/79] Update warbot --- warbot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/warbot b/warbot index 63428a8..f76703a 100644 --- a/warbot +++ b/warbot @@ -21,12 +21,12 @@ repo.heads[_BRANCH_].checkout(True) ') _hell_repo () { local hrepo - hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL1RoZS1IZWxsQm90L1BsdWdpbnM=" | base64 -d` + hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucw==" | base64 -d` echo "$rlink" } _hell_zip () { - echo "aHR0cHM6Ly9naXRodWIuY29tL1RoZS1IZWxsQm90L1BsdWdpbnMvYXJjaGl2ZS9tYXN0ZXIuemlw" | base64 -d + echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucy9hcmNoaXZlL21hc3Rlci56aXA= " | base64 -d } _HELLBOT_PLUG() { From f0e23fe2f74abd506643609465a9590d7809df00 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:14:51 +0530 Subject: [PATCH 05/79] Update stringsetup.py --- stringsetup.py | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/stringsetup.py b/stringsetup.py index 11c6a8a..b891e68 100644 --- a/stringsetup.py +++ b/stringsetup.py @@ -1,21 +1,32 @@ -#!/usr/bin/env python3 -# (c) https://t.me/TelethonChat/37677 -# This Source Code Form is subject to the terms of the GNU -# General Public License, v.3.0. If a copy of the GPL was not distributed with this -# file, You can obtain one at https://www.gnu.org/licenses/gpl-3.0.en.html. - +import os +os.system("pip install telethon") +os.system("pip install pyrogram") +from pyrogram import Client from telethon.sessions import StringSession from telethon.sync import TelegramClient -print( - """Please go-to my.telegram.org -Login using your Telegram account -Click on API Development Tools -Create a new application, by entering the required details""" -) -APP_ID = int(input("Enter APP ID here: ")) -API_HASH = input("Enter API HASH here: ") -with TelegramClient(StringSession(), APP_ID, API_HASH) as client: - print(client.session.save()) - client.send_message("me", client.session.save()) +print("••• WARUSERBOT SESSION GENERATOR •••") +print("\nHello!! Welcome to WarBot Session Generator\n") +okvai = input("Enter 69 to continue: ") +if okvai == "69": + print("Choose the string session type: \n1. WARUSERBOT \n2. Music Bot") + library = input("\nYour Choice: ") + if library == "1": + print("\nTelethon Session For WarUserBot") + APP_ID = int(input("\nEnter APP ID here: ")) + API_HASH = input("\nEnter API HASH here: ") + with TelegramClient(StringSession(), APP_ID, API_HASH) as hellbot: + print("\nYour Waruserbot Session Is sent in your Telegram Saved Messages.") + hellbot.send_message("me", f"#WARUSERBOT #WARUSERBOT_SESSION \n\n`{hellbot.session.save()}`") + elif library == "2": + print("Pyrogram Session for Music Bot") + APP_ID = int(input("\nEnter APP ID here: ")) + API_HASH = input("\nEnter API HASH here: ") + with Client(':memory:', api_id=APP_ID, api_hash=API_HASH) as hellbot: + print("\nYour HellBot Session Is sent in your Telegram Saved Messages.") + hellbot.send_message("me", f"#WARUSERBOT_MUSIC #WARUSERBOT_SESSION\n\n`{hellbot.export_session_string()}`") + else: + print("Please Enter 1 or 2 only.") +else: + print("DONE") From 054d780e61af7cea271e09d1c330ce0697fee1ab Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:15:50 +0530 Subject: [PATCH 06/79] Update runtime.txt --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index 9bff0e0..250d1e3 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.9.6 +python-3.10.2 From fcf4b8586f88eba1d982909648e7439ddc900115 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:20:04 +0530 Subject: [PATCH 07/79] Update requirements.txt --- requirements.txt | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index 655832f..a5f14a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,14 +2,10 @@ aiofiles aiohttp apscheduler cairosvg -cloudscraper +cfscrape colour -covid -cowpy -dataclasses DateTime emoji -fake_useragent fonttools geopy gitpython @@ -17,7 +13,7 @@ glitch_this google-api-python-client google-auth-httplib2 google-auth-oauthlib -googletrans==4.0.0-rc1 +gsearch gtts hachoir heroku3 @@ -28,11 +24,9 @@ jikanpy justwatch lottie lyricsgenius -markdown -motor -moviepy nekos.py opencv-python-headless +patool Pillow prettytable psutil @@ -42,33 +36,33 @@ PyGithub pygments pylast pymediainfo -PyMuPDF pySmartDL python-barcode python-dotenv pytz qrcode -randomstuff.py regex requests search-engine-parser selenium -setuptools==47.1.1 -ShazamAPI +setuptools spamwatch speedtest-cli -sqlalchemy-json sqlalchemy==1.3.23 telegraph -git+https://github.com/sandy1709/Telethon +telethon tgcrypto -tswift -ujson -urlextract validators +vcam vcsi wand wget -git+https://github.com/goldsmith/Wikipedia -youtube-search-python -youtube_dl +wheel + +git+https://github.com/xabhish3k/py-googletrans + +git+https://github.com/HellBoy-OP/Wikipedia + +git+https://github.com/HellBoy-OP/yt-fork + +git+https://github.com/HellBoy-OP/yt-search-python From ce68f848a515199f9d248df8639c40f23f403b7c Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:24:12 +0530 Subject: [PATCH 08/79] Update stringsetup.py --- stringsetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stringsetup.py b/stringsetup.py index b891e68..341d55c 100644 --- a/stringsetup.py +++ b/stringsetup.py @@ -24,7 +24,7 @@ APP_ID = int(input("\nEnter APP ID here: ")) API_HASH = input("\nEnter API HASH here: ") with Client(':memory:', api_id=APP_ID, api_hash=API_HASH) as hellbot: - print("\nYour HellBot Session Is sent in your Telegram Saved Messages.") + print("\nYour WarBot Session Is sent in your Telegram Saved Messages.") hellbot.send_message("me", f"#WARUSERBOT_MUSIC #WARUSERBOT_SESSION\n\n`{hellbot.export_session_string()}`") else: print("Please Enter 1 or 2 only.") From bd52683e728fb40adf85af2e119a6808182c4a3f Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:41:17 +0530 Subject: [PATCH 09/79] Update app.json --- app.json | 73 ++++++++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/app.json b/app.json index f0c83a0..d329e79 100644 --- a/app.json +++ b/app.json @@ -1,65 +1,54 @@ { - "name": "Waruserbot", - "description": "A simple Telegram userbot based on Telethon . Maintained by Abhishek Singh", - "logo": "https://telegra.ph/file/4b0a3d49d8bf1e2e85fea.jpg", + "name": "WARUSERBOT", + "description": "One of the best Userbot for Telegram. Known for its Smoothness, Design, Support.", + "logo": "https://telegra.ph/file/44edfd6fa6faaf5284264.jpg", "keywords": [ + "telegram", + "userbot", "plugin", + "telethon", + "waruserbot", "modular", "productivity" ], - "repository": "https://github.com/xAbhish3k/waruserbot", - "website": "#TODO", - "success_url": "#TODO", + "repository": "https://github.com/MeAbhish3k/waruserbot/", "env": { - "ALIVE_NAME": { - "description": "give your name", - "value": "" + "ENV": { + "description": "Setting this to ANYTHING will enable heroku.", + "value": "ANYTHING" + }, + "ABUSE": { + "description": "Leave it blank if you dont want Profanity in HellBot. Else Fill ON.", + "value": "ON", + "required": false + }, + "HANDLER": { + "description": "Your command handler. Default is ' . ' (dot).", + "value": "." }, "APP_ID": { - "description": "Get this value from my.telegram.org! Please do not steal", + "description": "Get this value from my.telegram.org", "value": "" }, "API_HASH": { - "description": "Get this value from my.telegram.org! Please do not steal", + "description": "Get this value from my.telegram.org", "value": "" }, - "STRING_SESSION": { - "description": "Get this value by running python3 telesetup.py locally or https://generatestringsession.xabhish3k.repl.run", + "WARUSERBOT_SESSION": { + "description": "Get this value by using repl or termux. Refer to Repo for more info.", "value": "" }, - "TG_BOT_TOKEN": { - "description": "Needed for inline buttons maker. Make a bot at http://telegram.dog/BotFather and get the token of your bot.Worth it. Get it.", - "value": "" - }, - "COMMAND_HAND_LER": { - "description": "Set this one with only one the symbol to use it before your command to run like . , ' `", - "value": ".", - "required": false - }, - "ENV": { - "description": "Setting this to ANYTHING will enable heroku.", - "value": "ANYTHING", - "required": false - }, "HEROKU_API_KEY": { - "description": "Required for updating the bot and other stuff get it from https://dashboard.heroku.com/account", - "value": "", - "required": false + "description": "Go to https://dashboard.heroku.com/account, scroll down and press Reveal API. Required for updater to work.", + "value": "" }, "HEROKU_APP_NAME": { - "description": "YOUR app name ", - "value": "", - "required": false - }, - "TZ": { - "description": "Required for Correct Time on autopic/get time. Know your timezone from http://www.timezoneconverter.com/cgi-bin/findzone.tzc", - "value": "Asia/Kolkata", - "required": false + "description": "The Value of App Name you filled in right on top. Required for updater to work.", + "value": "" }, - "UPSTREAM_REPO": { - "description": "Don't change", - "value": "https://Github.com/xAbhish3k/Waruserbot", - "required": false + "BOT_TOKEN": { + "description": "Make a bot from @BotFather and paste the bot token here.", + "value": "" } }, "addons": [{ From 903ba1b389672e64e2464c889c516aa4dc6e02a8 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:42:37 +0530 Subject: [PATCH 10/79] Delete heroku.yml --- heroku.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 heroku.yml diff --git a/heroku.yml b/heroku.yml deleted file mode 100644 index 11ed7a9..0000000 --- a/heroku.yml +++ /dev/null @@ -1,5 +0,0 @@ -build: - docker: - worker: Dockerfile -run: - worker: python3 -m userbot From 8bf246bb76825e17dcf6e5a0936829aeeffecb22 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:57:22 +0530 Subject: [PATCH 11/79] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index d329e79..c0ff200 100644 --- a/app.json +++ b/app.json @@ -34,7 +34,7 @@ "description": "Get this value from my.telegram.org", "value": "" }, - "WARUSERBOT_SESSION": { + "HELLBOT_SESSION": { "description": "Get this value by using repl or termux. Refer to Repo for more info.", "value": "" }, From 3acbd555b73d9109161322b70256b5d7ca7ca695 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 14:58:04 +0530 Subject: [PATCH 12/79] Rename stringsetup.py to hell_string.py --- stringsetup.py => hell_string.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename stringsetup.py => hell_string.py (100%) diff --git a/stringsetup.py b/hell_string.py similarity index 100% rename from stringsetup.py rename to hell_string.py From 58ed1c1aaa9e773aed1bd2e01f32e9fef188f8fd Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:04:47 +0530 Subject: [PATCH 13/79] Update warbot --- warbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbot b/warbot index f76703a..5c820d2 100644 --- a/warbot +++ b/warbot @@ -21,7 +21,7 @@ repo.heads[_BRANCH_].checkout(True) ') _hell_repo () { local hrepo - hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucw==" | base64 -d` + hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucw=" | base64 -d` echo "$rlink" } From 5d918ac15285514e870d266a508a9e3a78855021 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:24:10 +0530 Subject: [PATCH 14/79] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index a5f14a2..428a393 100644 --- a/requirements.txt +++ b/requirements.txt @@ -59,10 +59,10 @@ wand wget wheel -git+https://github.com/xabhish3k/py-googletrans - +git+https://github.com/HellBoy-op/py-googletrans git+https://github.com/HellBoy-OP/Wikipedia + git+https://github.com/HellBoy-OP/yt-fork git+https://github.com/HellBoy-OP/yt-search-python From 5362a2929d334de1d2d0a875dace31b7f7427fa6 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:29:32 +0530 Subject: [PATCH 15/79] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 428a393..3fbbbd4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -61,8 +61,8 @@ wheel git+https://github.com/HellBoy-op/py-googletrans git+https://github.com/HellBoy-OP/Wikipedia +git+https://github.com/HellBoy-OP/yt-fork +git+https://github.com/HellBoy-OP/yt-search-python -git+https://github.com/HellBoy-OP/yt-fork -git+https://github.com/HellBoy-OP/yt-search-python From e76afa53800d594ce89464e78dec57ea4661d348 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:39:37 +0530 Subject: [PATCH 16/79] Update requirements.txt --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3fbbbd4..a0a147a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -59,10 +59,10 @@ wand wget wheel -git+https://github.com/HellBoy-op/py-googletrans -git+https://github.com/HellBoy-OP/Wikipedia -git+https://github.com/HellBoy-OP/yt-fork -git+https://github.com/HellBoy-OP/yt-search-python +git+https://github.com/HellBoy-Op/py-googletrans@master +git+https://github.com/HellBoy-OP/Wikipedia@master +git+https://github.com/HellBoy-OP/yt-fork@master +git+https://github.com/HellBoy-OP/yt-search-python@master From ab460b340fc75006a96ab9a4727c0a932fbc6e81 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 15:54:49 +0530 Subject: [PATCH 17/79] Update warbot --- warbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbot b/warbot index 5c820d2..aacd9f7 100644 --- a/warbot +++ b/warbot @@ -55,7 +55,7 @@ _starter () { # _HELLBOT_PLUG python3 ../setup/updater.py ../requirements.txt requirements.txt echo "••• STARTING WARUSERBOT •••" - python3 -m hellbot + python3 -m warbot } _starter From 9eb003f189367eebd44f8ae2d8c224956dee6deb Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 16:00:22 +0530 Subject: [PATCH 18/79] Update warbot --- warbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbot b/warbot index aacd9f7..5c820d2 100644 --- a/warbot +++ b/warbot @@ -55,7 +55,7 @@ _starter () { # _HELLBOT_PLUG python3 ../setup/updater.py ../requirements.txt requirements.txt echo "••• STARTING WARUSERBOT •••" - python3 -m warbot + python3 -m hellbot } _starter From 9669a8b6e5be97b8b116cbd4d2dcb5b264251fac Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 8 Jul 2022 18:32:02 +0530 Subject: [PATCH 19/79] Update warbot --- warbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbot b/warbot index 5c820d2..44c37d8 100644 --- a/warbot +++ b/warbot @@ -45,7 +45,7 @@ repo.heads[_BRANCH_].checkout(True) ') _starter () { local hellpath hellpath="Plugins.zip" - echo "••• DOWNLOADING HELLBOT •••" + echo "••• DOWNLOADING WARUSERBOT •••" wget -q $(_hell_zip) -O "$hellpath" HELLPATH=$(zipinfo -1 "$hellpath" | grep -v "/."); unzip -qq "$hellpath" From f559a6e9f4b58d72eb45e48d5b6925b127da084b Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 07:59:42 +0530 Subject: [PATCH 20/79] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index c0ff200..b62a303 100644 --- a/app.json +++ b/app.json @@ -34,7 +34,7 @@ "description": "Get this value from my.telegram.org", "value": "" }, - "HELLBOT_SESSION": { + "STRING_SESSION": { "description": "Get this value by using repl or termux. Refer to Repo for more info.", "value": "" }, From 3b4088838b916a2ab158043062d20577e16c08b3 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 08:40:09 +0530 Subject: [PATCH 21/79] Update requirements.txt --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index a0a147a..d09ea96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -59,10 +59,10 @@ wand wget wheel -git+https://github.com/HellBoy-Op/py-googletrans@master -git+https://github.com/HellBoy-OP/Wikipedia@master -git+https://github.com/HellBoy-OP/yt-fork@master -git+https://github.com/HellBoy-OP/yt-search-python@master +git+https://github.com/xabhish3k/py-googletrans@master +git+https://github.com/xabhish3k/Wikipedia@master +git+https://github.com/xabhish3k/yt-fork@master +git+https://github.com/xabhish3k/yt-search-python@master From 7b89de9456c1068504565fb70cea959b12de152d Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 08:50:54 +0530 Subject: [PATCH 22/79] Update requirements.txt --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index d09ea96..8f03083 100644 --- a/requirements.txt +++ b/requirements.txt @@ -59,10 +59,10 @@ wand wget wheel -git+https://github.com/xabhish3k/py-googletrans@master -git+https://github.com/xabhish3k/Wikipedia@master -git+https://github.com/xabhish3k/yt-fork@master -git+https://github.com/xabhish3k/yt-search-python@master +git+https://github.com/xabhish3k/py-googletrans +git+https://github.com/xabhish3k/Wikipedia +git+https://github.com/xabhish3k/yt-fork +git+https://github.com/xabhish3k/yt-search-python From 447ebdecd8b2ceb0637df3540038220e9c5662a7 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 08:56:40 +0530 Subject: [PATCH 23/79] Update requirements.txt --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8f03083..d09ea96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -59,10 +59,10 @@ wand wget wheel -git+https://github.com/xabhish3k/py-googletrans -git+https://github.com/xabhish3k/Wikipedia -git+https://github.com/xabhish3k/yt-fork -git+https://github.com/xabhish3k/yt-search-python +git+https://github.com/xabhish3k/py-googletrans@master +git+https://github.com/xabhish3k/Wikipedia@master +git+https://github.com/xabhish3k/yt-fork@master +git+https://github.com/xabhish3k/yt-search-python@master From 581f8a9f056aa811ab419cf969f85183663d0836 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 09:08:20 +0530 Subject: [PATCH 24/79] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d09ea96..d157ad3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -61,7 +61,7 @@ wheel git+https://github.com/xabhish3k/py-googletrans@master git+https://github.com/xabhish3k/Wikipedia@master -git+https://github.com/xabhish3k/yt-fork@master + git+https://github.com/xabhish3k/yt-search-python@master From 153f7a24b24f7661f99b365ade593fcfaec4a457 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 13:16:47 +0530 Subject: [PATCH 25/79] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97e96b4..cd8499f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ ## credits ❤️ -[catuserbot] +[🤨] From f545e4b3457c4bd34b306971fa8b3cf4b2b226ad Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 13:18:04 +0530 Subject: [PATCH 26/79] Rename hell_string.py to stringsetup.py --- hell_string.py => stringsetup.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename hell_string.py => stringsetup.py (100%) diff --git a/hell_string.py b/stringsetup.py similarity index 100% rename from hell_string.py rename to stringsetup.py From 548f0a6cfe3d21a1f91bf4207ed66754034f741e Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Sun, 10 Jul 2022 15:33:56 +0530 Subject: [PATCH 27/79] Update warbot --- warbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbot b/warbot index 44c37d8..75a75a8 100644 --- a/warbot +++ b/warbot @@ -21,7 +21,7 @@ repo.heads[_BRANCH_].checkout(True) ') _hell_repo () { local hrepo - hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucw=" | base64 -d` + hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucw==" | base64 -d` echo "$rlink" } From 31f6622d2d707a1e4cc818f085220ec530f7fdc7 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Tue, 12 Jul 2022 14:18:45 +0530 Subject: [PATCH 28/79] Update warbot --- warbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbot b/warbot index 75a75a8..d648ecf 100644 --- a/warbot +++ b/warbot @@ -55,7 +55,7 @@ _starter () { # _HELLBOT_PLUG python3 ../setup/updater.py ../requirements.txt requirements.txt echo "••• STARTING WARUSERBOT •••" - python3 -m hellbot + python3 -m warbot } _starter From 9061e518dc9c31d4b5df636580ad403d814eb877 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Tue, 12 Jul 2022 14:40:40 +0530 Subject: [PATCH 29/79] Update stringsetup.py --- stringsetup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stringsetup.py b/stringsetup.py index 341d55c..8299fb6 100644 --- a/stringsetup.py +++ b/stringsetup.py @@ -18,14 +18,14 @@ API_HASH = input("\nEnter API HASH here: ") with TelegramClient(StringSession(), APP_ID, API_HASH) as hellbot: print("\nYour Waruserbot Session Is sent in your Telegram Saved Messages.") - hellbot.send_message("me", f"#WARUSERBOT #WARUSERBOT_SESSION \n\n`{hellbot.session.save()}`") + warbot.send_message("me", f"#WARUSERBOT #WARUSERBOT_SESSION \n\n`{warbot.session.save()}`") elif library == "2": print("Pyrogram Session for Music Bot") APP_ID = int(input("\nEnter APP ID here: ")) API_HASH = input("\nEnter API HASH here: ") with Client(':memory:', api_id=APP_ID, api_hash=API_HASH) as hellbot: print("\nYour WarBot Session Is sent in your Telegram Saved Messages.") - hellbot.send_message("me", f"#WARUSERBOT_MUSIC #WARUSERBOT_SESSION\n\n`{hellbot.export_session_string()}`") + warbot.send_message("me", f"#WARUSERBOT_MUSIC #WARUSERBOT_SESSION\n\n`{warbot.export_session_string()}`") else: print("Please Enter 1 or 2 only.") else: From d8498afc9aa3de94f6c7d493c82e24c6204a1029 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Thu, 14 Jul 2022 07:29:59 +0530 Subject: [PATCH 30/79] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd8499f..3313a57 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ ## credits ❤️ -[🤨] +[Full Credit Hellbot] From 76371605cc328748d1a5a572528a1a2576aa020c Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Wed, 27 Jul 2022 12:18:36 +0530 Subject: [PATCH 31/79] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index b62a303..0ef4e54 100644 --- a/app.json +++ b/app.json @@ -19,7 +19,7 @@ }, "ABUSE": { "description": "Leave it blank if you dont want Profanity in HellBot. Else Fill ON.", - "value": "ON", + "value": "", "required": false }, "HANDLER": { From 8aa299a830787577cb16580431b7fcac0c5761ce Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Tue, 30 Aug 2022 21:48:27 +0530 Subject: [PATCH 32/79] Update runtime.txt --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index 250d1e3..7a33c42 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.10.2 +python-3.10.6 From 995ec138c3c14adb5670e4a84b978a0169b945ab Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Wed, 31 Aug 2022 10:37:47 +0530 Subject: [PATCH 33/79] Update runtime.txt --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index 7a33c42..250d1e3 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.10.6 +python-3.10.2 From 7eef0627833a79c909a10901ceb6fcea01429467 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Sun, 11 Sep 2022 17:26:40 +0530 Subject: [PATCH 34/79] Update runtime.txt --- runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime.txt b/runtime.txt index 250d1e3..7a33c42 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.10.2 +python-3.10.6 From ec399ad3f02ece42e5d3c98a9ea86a43a5ecc085 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 09:08:01 +0530 Subject: [PATCH 35/79] Update warbot --- warbot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/warbot b/warbot index d648ecf..70183b1 100644 --- a/warbot +++ b/warbot @@ -21,12 +21,12 @@ repo.heads[_BRANCH_].checkout(True) ') _hell_repo () { local hrepo - hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucw==" | base64 -d` + hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucy1U==" | base64 -d` echo "$rlink" } _hell_zip () { - echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucy9hcmNoaXZlL21hc3Rlci56aXA= " | base64 -d + echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucy1U= " | base64 -d } _HELLBOT_PLUG() { From ae5c3a335fdca779a3dc15d85f051cf34fd7eee1 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 09:09:51 +0530 Subject: [PATCH 36/79] Delete requirements.txt --- requirements.txt | 68 ------------------------------------------------ 1 file changed, 68 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index d157ad3..0000000 --- a/requirements.txt +++ /dev/null @@ -1,68 +0,0 @@ -aiofiles -aiohttp -apscheduler -cairosvg -cfscrape -colour -DateTime -emoji -fonttools -geopy -gitpython -glitch_this -google-api-python-client -google-auth-httplib2 -google-auth-oauthlib -gsearch -gtts -hachoir -heroku3 -html-telegraph-poster -humanize -IMDbPY -jikanpy -justwatch -lottie -lyricsgenius -nekos.py -opencv-python-headless -patool -Pillow -prettytable -psutil -psycopg2 -pyfiglet -PyGithub -pygments -pylast -pymediainfo -pySmartDL -python-barcode -python-dotenv -pytz -qrcode -regex -requests -search-engine-parser -selenium -setuptools -spamwatch -speedtest-cli -sqlalchemy==1.3.23 -telegraph -telethon -tgcrypto -validators -vcam -vcsi -wand -wget -wheel - -git+https://github.com/xabhish3k/py-googletrans@master -git+https://github.com/xabhish3k/Wikipedia@master - -git+https://github.com/xabhish3k/yt-search-python@master - - - From 290301d5b10e6887cb40e91827146895d7ac2ded Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 09:12:00 +0530 Subject: [PATCH 37/79] Create requirements.txt --- requirements.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..53f2329 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,50 @@ +aiohttp +cairosvg +DateTime +emoji +geopy +gitpython +glitch_this +google-api-python-client +google-auth-httplib2 +google-auth-oauthlib +gsearch +gtts +hachoir +heroku3 +html-telegraph-poster +httpx[http2] +humanize +IMDbPY +instagrapi +justwatch +lottie +lyricsgenius +moviepy +nekos.py +opencv-python-headless +Pillow +psycopg2 +pyfiglet +PyGithub +pymediainfo +pySmartDL +python-barcode +pytz +qrcode +regex +requests +search-engine-parser +selenium +spotdl +sqlalchemy==1.3.23 +telegraph +telethon==1.24.0 +tgcrypto +validators +vcam + +git+https://github.com/xAbhish3k/py-googletrans +git+https://github.com/xAbhish3k/Wikipedia +git+https://github.com/xAbhish3k/yt-dp-fork +git+https://github.com/xAbhish3k/yt-search-python From 52d9b2e5e862177d698229a90c70b67b2927b273 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 12:57:58 +0530 Subject: [PATCH 38/79] Update warbot --- warbot | 55 +++++++++++++++---------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/warbot b/warbot index 70183b1..191b09c 100644 --- a/warbot +++ b/warbot @@ -1,45 +1,22 @@ #!/bin/bash -_python_() { - python3${pVer%.*} -c "$1" -} - -_HELLBOT_MAIN() { - $(_python_ 'from git import Repo -import sys - -_UPSTREAM_ = "https://github.com/MeAbhish3k/waruserbot" -_BRANCH_ = "master" - -repo = Repo.init() -origin = repo.create_remote("temponame", _UPSTREAM_) -origin.fetch() -repo.create_head(_BRANCH_, origin.refs[_BRANCH_]) -repo.heads[_BRANCH_].checkout(True) ') -} - -_hell_repo () { - local hrepo - hrepo=`echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucy1U==" | base64 -d` - echo "$rlink" -} - _hell_zip () { - echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucy1U= " | base64 -d + if [[ $GIT_REPO ]] + then + echo "https://github.com/${GIT_REPO}/archive/master.zip" + else + echo "aHR0cHM6Ly9naXRodWIuY29tL1dhcnVzZXJib3QvUGx1Z2lucy1U=" | base64 -d + fi } -_HELLBOT_PLUG() { - local hrepo=$(_hell_repo) - $(_python_ 'from git import Repo -import sys -_UPSTREAM_ = "'$hrepo'" -_BRANCH_ = "master" -repo = Repo.init() -origin = repo.create_remote("temponame", _UPSTREAM_) -origin.fetch() -repo.create_head(_BRANCH_, origin.refs[_BRANCH_]) -repo.heads[_BRANCH_].checkout(True) ') +_library () { + if [[ $BOT_LIBRARY == "pyrogram" ]] + then + python3 -m PyrogramHell + else + python3 -m TelethonHell + fi } _starter () { @@ -50,12 +27,10 @@ _starter () { HELLPATH=$(zipinfo -1 "$hellpath" | grep -v "/."); unzip -qq "$hellpath" rm -rf "$hellpath" - # _HELLBOT_MAIN cd $HELLPATH - # _HELLBOT_PLUG - python3 ../setup/updater.py ../requirements.txt requirements.txt + python3 ../updater.py ../requirements.txt requirements.txt echo "••• STARTING WARUSERBOT •••" - python3 -m warbot + _library } _starter From 466ef98e535b74a75356952e73125b89e14bc8d4 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 12:59:51 +0530 Subject: [PATCH 39/79] Update app.json --- app.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app.json b/app.json index 0ef4e54..71b2b3b 100644 --- a/app.json +++ b/app.json @@ -1,17 +1,17 @@ { - "name": "WARUSERBOT", + "name": "Hêllẞø†", "description": "One of the best Userbot for Telegram. Known for its Smoothness, Design, Support.", - "logo": "https://telegra.ph/file/44edfd6fa6faaf5284264.jpg", + "logo": "https://telegra.ph/file/7decf235312af8536e9aa.jpg ", "keywords": [ "telegram", "userbot", "plugin", "telethon", - "waruserbot", + "hellbot", "modular", "productivity" ], - "repository": "https://github.com/MeAbhish3k/waruserbot/", + "repository": "https://github.com/The-HellBot/HellBot/", "env": { "ENV": { "description": "Setting this to ANYTHING will enable heroku.", @@ -19,7 +19,7 @@ }, "ABUSE": { "description": "Leave it blank if you dont want Profanity in HellBot. Else Fill ON.", - "value": "", + "value": "ON", "required": false }, "HANDLER": { @@ -34,7 +34,7 @@ "description": "Get this value from my.telegram.org", "value": "" }, - "STRING_SESSION": { + "HELLBOT_SESSION": { "description": "Get this value by using repl or termux. Refer to Repo for more info.", "value": "" }, From ed5b07fdd0611e17f2a4aefad3f79c502d1db4ea Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 13:02:13 +0530 Subject: [PATCH 40/79] Create hell_string.py --- hell_string.py | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 hell_string.py diff --git a/hell_string.py b/hell_string.py new file mode 100644 index 0000000..4f7f3d9 --- /dev/null +++ b/hell_string.py @@ -0,0 +1,86 @@ +from random import randint + +from instagrapi import Client as IClient +from instagrapi.exceptions import ChallengeRequired, TwoFactorRequired +from pyrogram import Client as PClient +from telethon.sessions import StringSession +from telethon.sync import TelegramClient + + +def main(): + print("T E A M H E L L B O T ! !") + print("Hello!! Welcome to HellBot Session Generator\n") + print("Human Verification Required !!") + while True: + verify = int(randint(1, 50)) + okvai = int(input(f"Enter {verify} to continue: ")) + if okvai == verify: + print("\nChoose the string session type: \n1. HellBot (Telethon) \n2. Music Bot (Pyrogram) \n3. Instagram Session") + while True: + library = input("\nYour Choice: ") + if library == "1": + generate_telethon_session() + break + elif library == "2": + generate_pyro_session() + break + elif library == "3": + generate_insta_session() + break + else: + print("Please enter integer values (1/2/3 only).") + break + else: + print("Verification Failed! Try Again:") + + +def generate_pyro_session(): + print("Pyrogram Session for Music Bot!") + APP_ID = int(input("\nEnter APP ID here: ")) + API_HASH = input("\nEnter API HASH here: ") + with PClient(':memory:', api_id=APP_ID, api_hash=API_HASH) as hellbot: + print("\nYour HellBot Session Is sent in your Telegram Saved Messages.") + hellbot.send_message( + "me", + f"#HELLBOT_MUSIC #HELLBOT_SESSION #PYROGRAM\n\n`{hellbot.export_session_string()}`", + ) + + +def generate_telethon_session(): + print("\nTelethon Session For HellBot!") + APP_ID = int(input("\nEnter APP ID here: ")) + API_HASH = input("\nEnter API HASH here: ") + with TelegramClient(StringSession(), APP_ID, API_HASH) as hellbot: + print("\nYour HellBot Session Is sent in your Telegram Saved Messages.") + hellbot.send_message( + "me", + f"#HELLBOT #HELLBOT_SESSION #TELETHON \n\n`{hellbot.session.save()}`", + ) + + +def generate_insta_session(): + print("Instagram Session For HellBot!") + cl = IClient() + username = input("Enter your Instagram Username: ") + password = input("Enter your Instagram Password: ") + try: + cl.login(username, password) + xyz = cl.get_settings() + sessionid = xyz['authorization_data']['sessionid'] + print(f"Your Instagram Session is: \n>>> {sessionid}") + print("\nCopy it from here and remember not to share it with anyone!") + except (ChallengeRequired, TwoFactorRequired, Exception) as e: + print(e) + + +def challenge_code(username, choice): + while True: + otp = input("Enter the OTP sent to your Email: ") + if otp.isdigit(): + break + else: + print("Enter digits only!") + return otp + + +main() From e9dc73eabf082a8f378ac76a3fe45ea039a77b2c Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 13:04:00 +0530 Subject: [PATCH 41/79] Create updater.py --- updater.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 updater.py diff --git a/updater.py b/updater.py new file mode 100644 index 0000000..0f8b565 --- /dev/null +++ b/updater.py @@ -0,0 +1,54 @@ +import asyncio +import difflib +import shlex +import sys + +from typing import Tuple + + +async def lines_differnce(file1, file2): + with open(file1) as f1: + lines1 = f1.readlines() + lines1 = [line.rstrip("\n") for line in lines1] + with open(file2) as f2: + lines2 = f2.readlines() + lines2 = [line.rstrip("\n") for line in lines2] + diff = difflib.unified_diff( + lines1, lines2, fromfile=file1, tofile=file2, lineterm="", n=0 + ) + lines = list(diff)[2:] + added = [line[1:] for line in lines if line[0] == "+"] + removed = [line[1:] for line in lines if line[0] == "-"] + additions = [i for i in added if i not in removed] + removedt = [i for i in removed if i not in added] + return additions, removedt + + +async def runcmd(cmd: str) -> Tuple[str, str, int, int]: + args = shlex.split(cmd) + process = await asyncio.create_subprocess_exec( + *args, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await process.communicate() + return ( + stdout.decode("utf-8", "replace").strip(), + stderr.decode("utf-8", "replace").strip(), + process.returncode, + process.pid, + ) + + +async def update_requirements(main , test): + a, r = await lines_differnce(main, test) + try: + for i in a: + await runcmd(f"pip install {i}") + print(f">> Installed Requirement: {i}") + except Exception as e: + print(f"Error installing requirments {str(e)}") + + +# loop = asyncio.get_running_loop() +# loop.run_until_complete(update_requirements(sys.argv[1] , sys.argv[2])) +# loop.close() +asyncio.run(update_requirements(sys.argv[1] , sys.argv[2])) From 7f3066eacf4a2010a6b34217abf20733f486a919 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 13:04:51 +0530 Subject: [PATCH 42/79] Delete __init__.py --- setup/__init__.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 setup/__init__.py diff --git a/setup/__init__.py b/setup/__init__.py deleted file mode 100644 index 8b13789..0000000 --- a/setup/__init__.py +++ /dev/null @@ -1 +0,0 @@ - From 8601082ce1bc38be157d8494e2649c2e41285ff2 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 13:05:02 +0530 Subject: [PATCH 43/79] Delete updater.py --- setup/updater.py | 54 ------------------------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 setup/updater.py diff --git a/setup/updater.py b/setup/updater.py deleted file mode 100644 index ffe54bd..0000000 --- a/setup/updater.py +++ /dev/null @@ -1,54 +0,0 @@ -import asyncio -import difflib -import shlex -import sys - -from typing import Tuple - - -async def lines_differnce(file1, file2): - with open(file1) as f1: - lines1 = f1.readlines() - lines1 = [line.rstrip("\n") for line in lines1] - with open(file2) as f2: - lines2 = f2.readlines() - lines2 = [line.rstrip("\n") for line in lines2] - diff = difflib.unified_diff( - lines1, lines2, fromfile=file1, tofile=file2, lineterm="", n=0 - ) - lines = list(diff)[2:] - added = [line[1:] for line in lines if line[0] == "+"] - removed = [line[1:] for line in lines if line[0] == "-"] - additions = [i for i in added if i not in removed] - removedt = [i for i in removed if i not in added] - return additions, removedt - - -async def runcmd(cmd: str) -> Tuple[str, str, int, int]: - args = shlex.split(cmd) - process = await asyncio.create_subprocess_exec( - *args, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE - ) - stdout, stderr = await process.communicate() - return ( - stdout.decode("utf-8", "replace").strip(), - stderr.decode("utf-8", "replace").strip(), - process.returncode, - process.pid, - ) - - -async def update_requirements(main , test): - a, r = await lines_differnce(main, test) - try: - for i in a: - await runcmd(f"pip install {i}") - print(f">> Installed Requirement: {i}") - except Exception as e: - print(f"Error installing requirments {str(e)}") - - -loop = asyncio.get_event_loop() -loop.run_until_complete(update_requirements(sys.argv[1] , sys.argv[2])) -loop.close() - From 3c8112c1c6f8d73e9b67a382be379f3246a1d843 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 13:24:13 +0530 Subject: [PATCH 44/79] Delete stringsetup.py --- stringsetup.py | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 stringsetup.py diff --git a/stringsetup.py b/stringsetup.py deleted file mode 100644 index 8299fb6..0000000 --- a/stringsetup.py +++ /dev/null @@ -1,32 +0,0 @@ -import os -os.system("pip install telethon") -os.system("pip install pyrogram") -from pyrogram import Client -from telethon.sessions import StringSession -from telethon.sync import TelegramClient - - -print("••• WARUSERBOT SESSION GENERATOR •••") -print("\nHello!! Welcome to WarBot Session Generator\n") -okvai = input("Enter 69 to continue: ") -if okvai == "69": - print("Choose the string session type: \n1. WARUSERBOT \n2. Music Bot") - library = input("\nYour Choice: ") - if library == "1": - print("\nTelethon Session For WarUserBot") - APP_ID = int(input("\nEnter APP ID here: ")) - API_HASH = input("\nEnter API HASH here: ") - with TelegramClient(StringSession(), APP_ID, API_HASH) as hellbot: - print("\nYour Waruserbot Session Is sent in your Telegram Saved Messages.") - warbot.send_message("me", f"#WARUSERBOT #WARUSERBOT_SESSION \n\n`{warbot.session.save()}`") - elif library == "2": - print("Pyrogram Session for Music Bot") - APP_ID = int(input("\nEnter APP ID here: ")) - API_HASH = input("\nEnter API HASH here: ") - with Client(':memory:', api_id=APP_ID, api_hash=API_HASH) as hellbot: - print("\nYour WarBot Session Is sent in your Telegram Saved Messages.") - warbot.send_message("me", f"#WARUSERBOT_MUSIC #WARUSERBOT_SESSION\n\n`{warbot.export_session_string()}`") - else: - print("Please Enter 1 or 2 only.") -else: - print("DONE") From 3490a997575015b92af1e0b45264a1fd21d21d9f Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 14:33:11 +0530 Subject: [PATCH 45/79] Update requirements.txt From 5feebe3ec9b0ca63042affea45df5ab40745b7e1 Mon Sep 17 00:00:00 2001 From: MeAbhish3k <108892152+MeAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 18:55:24 +0530 Subject: [PATCH 46/79] Update warbot --- warbot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warbot b/warbot index 191b09c..59e8c5a 100644 --- a/warbot +++ b/warbot @@ -6,7 +6,7 @@ _hell_zip () { then echo "https://github.com/${GIT_REPO}/archive/master.zip" else - echo "aHR0cHM6Ly9naXRodWIuY29tL1dhcnVzZXJib3QvUGx1Z2lucy1U=" | base64 -d + echo "aHR0cHM6Ly9naXRodWIuY29tL3dhcnVzZXJib3QvUGx1Z2lucy1UL2FyY2hpdmUvbWFzdGVyLnppcA==" | base64 -d fi } From 3527d02b2e8569e291059396d0555c85baa08a56 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 21:01:12 +0530 Subject: [PATCH 47/79] Update requirements.txt --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 53f2329..9bb6e20 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,7 @@ tgcrypto validators vcam -git+https://github.com/xAbhish3k/py-googletrans -git+https://github.com/xAbhish3k/Wikipedia -git+https://github.com/xAbhish3k/yt-dp-fork -git+https://github.com/xAbhish3k/yt-search-python +git+https://github.com/xAbhish3k/py-googletrans@master +git+https://github.com/xAbhish3k/Wikipedia@master +git+https://github.com/xAbhish3k/yt-dp-fork@master +git+https://github.com/xAbhish3k/yt-search-python@master From d5c4f7d52a072d6a0df550bd6743f884dbefb9fc Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Mon, 12 Sep 2022 21:10:47 +0530 Subject: [PATCH 48/79] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9bb6e20..b1b23a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -46,5 +46,4 @@ vcam git+https://github.com/xAbhish3k/py-googletrans@master git+https://github.com/xAbhish3k/Wikipedia@master -git+https://github.com/xAbhish3k/yt-dp-fork@master git+https://github.com/xAbhish3k/yt-search-python@master From 92b69e86d91818daef22ccc9d42eae90a2948ba3 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Tue, 13 Sep 2022 08:19:11 +0530 Subject: [PATCH 49/79] Update hell_string.py --- hell_string.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hell_string.py b/hell_string.py index 4f7f3d9..5080ae2 100644 --- a/hell_string.py +++ b/hell_string.py @@ -8,14 +8,14 @@ def main(): - print("T E A M H E L L B O T ! !") - print("Hello!! Welcome to HellBot Session Generator\n") + print("T E A M W A R B O T ! !") + print("Hello!! Welcome to WaruserBot Session Generator\n") print("Human Verification Required !!") while True: verify = int(randint(1, 50)) okvai = int(input(f"Enter {verify} to continue: ")) if okvai == verify: - print("\nChoose the string session type: \n1. HellBot (Telethon) \n2. Music Bot (Pyrogram) \n3. Instagram Session") + print("\nChoose the string session type: \n1. WaruserBot (Telethon) \n2. Music Bot (Pyrogram) \n3. Instagram Session") while True: library = input("\nYour Choice: ") if library == "1": @@ -39,27 +39,27 @@ def generate_pyro_session(): APP_ID = int(input("\nEnter APP ID here: ")) API_HASH = input("\nEnter API HASH here: ") with PClient(':memory:', api_id=APP_ID, api_hash=API_HASH) as hellbot: - print("\nYour HellBot Session Is sent in your Telegram Saved Messages.") + print("\nYour WaruserBot Session Is sent in your Telegram Saved Messages.") hellbot.send_message( "me", - f"#HELLBOT_MUSIC #HELLBOT_SESSION #PYROGRAM\n\n`{hellbot.export_session_string()}`", + f"#WarUserBOT_MUSIC #WARUSERBOT_SESSION #PYROGRAM\n\n`{hellbot.export_session_string()}`", ) def generate_telethon_session(): - print("\nTelethon Session For HellBot!") + print("\nTelethon Session For WarUserBot!") APP_ID = int(input("\nEnter APP ID here: ")) API_HASH = input("\nEnter API HASH here: ") with TelegramClient(StringSession(), APP_ID, API_HASH) as hellbot: - print("\nYour HellBot Session Is sent in your Telegram Saved Messages.") + print("\nYour WarUserBot Session Is sent in your Telegram Saved Messages.") hellbot.send_message( "me", - f"#HELLBOT #HELLBOT_SESSION #TELETHON \n\n`{hellbot.session.save()}`", + f"#WARUSERBOT #WARBOT_SESSION #TELETHON \n\n`{hellbot.session.save()}`", ) def generate_insta_session(): - print("Instagram Session For HellBot!") + print("Instagram Session For WARBot!") cl = IClient() username = input("Enter your Instagram Username: ") password = input("Enter your Instagram Password: ") From b5a31575fb06937f5a5bf91b058661734c3a57e0 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Tue, 13 Sep 2022 09:39:24 +0530 Subject: [PATCH 50/79] Update app.json --- app.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.json b/app.json index 71b2b3b..3a34c5e 100644 --- a/app.json +++ b/app.json @@ -19,7 +19,7 @@ }, "ABUSE": { "description": "Leave it blank if you dont want Profanity in HellBot. Else Fill ON.", - "value": "ON", + "value": "OFF", "required": false }, "HANDLER": { @@ -34,7 +34,7 @@ "description": "Get this value from my.telegram.org", "value": "" }, - "HELLBOT_SESSION": { + "STRING_SESSION": { "description": "Get this value by using repl or termux. Refer to Repo for more info.", "value": "" }, From 48fc09ea5b87f02ca9630584298340250b12b8b9 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Tue, 13 Sep 2022 13:26:21 +0530 Subject: [PATCH 51/79] Update app.json --- app.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app.json b/app.json index 3a34c5e..e71abbd 100644 --- a/app.json +++ b/app.json @@ -1,17 +1,17 @@ { - "name": "Hêllẞø†", + "name": "WarUserBot", "description": "One of the best Userbot for Telegram. Known for its Smoothness, Design, Support.", - "logo": "https://telegra.ph/file/7decf235312af8536e9aa.jpg ", + "logo": "https://telegra.ph/file/d871194e87181a0c0e5f2.jpg", "keywords": [ "telegram", "userbot", "plugin", "telethon", - "hellbot", + "warbot", "modular", "productivity" ], - "repository": "https://github.com/The-HellBot/HellBot/", + "repository": "https://github.com/xabhish3k/waruserbot/", "env": { "ENV": { "description": "Setting this to ANYTHING will enable heroku.", From 016553bbad4169feb634e6c4a861397b7350cd79 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Tue, 13 Sep 2022 13:33:55 +0530 Subject: [PATCH 52/79] Update app.json --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index e71abbd..03941b4 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "name": "WarUserBot", "description": "One of the best Userbot for Telegram. Known for its Smoothness, Design, Support.", - "logo": "https://telegra.ph/file/d871194e87181a0c0e5f2.jpg", + "logo": "https://telegra.ph/file/5cadf9784f067a75dc51c.jpg", "keywords": [ "telegram", "userbot", From 8fb7e7054022c7942a55d46d1fc50eb54931cefd Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 25 Nov 2022 19:39:06 +0530 Subject: [PATCH 53/79] Update Aptfile --- Aptfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Aptfile b/Aptfile index f32119a..7efa4ab 100644 --- a/Aptfile +++ b/Aptfile @@ -1,4 +1,4 @@ pv tree mediainfo -p7zip-full + From 5e12b8fd045f709bcc0dd1c63ef76563bb8846c0 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 25 Nov 2022 19:39:55 +0530 Subject: [PATCH 54/79] Update app.json --- app.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.json b/app.json index 03941b4..0ec8805 100644 --- a/app.json +++ b/app.json @@ -63,8 +63,8 @@ "url":"https://github.com/heroku/heroku-buildpack-google-chrome" },{ "url":"https://github.com/heroku/heroku-buildpack-chromedriver" - },{ - "url": "https://github.com/opendoor-labs/heroku-buildpack-p7zip" + + },{ "url": "https://github.com/heroku/heroku-buildpack-apt.git" },{ From 7bfeb9349a4a69264cda128616563cfc48cbc163 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 25 Nov 2022 20:57:53 +0530 Subject: [PATCH 55/79] Delete Aptfile --- Aptfile | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Aptfile diff --git a/Aptfile b/Aptfile deleted file mode 100644 index 7efa4ab..0000000 --- a/Aptfile +++ /dev/null @@ -1,4 +0,0 @@ -pv -tree -mediainfo - From 935784ce18fd827f771a64a779b56d1354dd0386 Mon Sep 17 00:00:00 2001 From: Abhishek singh <84198635+xAbhish3k@users.noreply.github.com> Date: Fri, 25 Nov 2022 20:59:30 +0530 Subject: [PATCH 56/79] Create Aptfile --- Aptfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Aptfile diff --git a/Aptfile b/Aptfile new file mode 100644 index 0000000..09b431f --- /dev/null +++ b/Aptfile @@ -0,0 +1,3 @@ +pv +tree +mediainfo From feb50693e215f51e13a3a68761158a333004d4fa Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:21:20 +0530 Subject: [PATCH 57/79] Create server.py --- server.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 server.py diff --git a/server.py b/server.py new file mode 100644 index 0000000..4ba6a53 --- /dev/null +++ b/server.py @@ -0,0 +1,13 @@ +import os +from flask import Flask +from flask_restful import Resource, Api + +app = Flask(name) +api = Api(app) + +class Greeting (Resource): + def get(self): + return "WarBot is running !" + +api.add_resource(Greeting, '/') +app.run(host="0.0.0.0", port=os.environ.get("PORT", 8080)) From cdcf871b3d1424e39b97fbec56ac8211cb392274 Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:22:16 +0530 Subject: [PATCH 58/79] Update requirements.txt --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index b1b23a0..b50a7aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,8 @@ DateTime emoji geopy gitpython +flask +flask_restful glitch_this google-api-python-client google-auth-httplib2 From c4f9c25207994a11f8c3c6714fc538e7ddbf01aa Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:25:35 +0530 Subject: [PATCH 59/79] Create logging.conf --- logging.conf | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 logging.conf diff --git a/logging.conf b/logging.conf new file mode 100644 index 0000000..eba9050 --- /dev/null +++ b/logging.conf @@ -0,0 +1,32 @@ +[loggers] +keys=root + +[handlers] +keys=consoleHandler,fileHandler + +[formatters] +keys=consoleFormatter,fileFormatter + +[logger_root] +level=DEBUG +handlers=consoleHandler,fileHandler + +[handler_consoleHandler] +class=StreamHandler +level=INFO +formatter=consoleFormatter +args=(sys.stdout,) + +[handler_fileHandler] +class=FileHandler +level=ERROR +formatter=fileFormatter +args=('TelegramBot.log','w',) + +[formatter_consoleFormatter] +format=%(asctime)s - %(lineno)d - %(name)s - %(module)s - %(levelname)s - %(message)s +datefmt=%I:%M:%S %p + +[formatter_fileFormatter] +format=[%(asctime)s:%(name)s:%(lineno)d:%(levelname)s] %(message)s +datefmt=%m/%d/%Y %I:%M:%S %p From 3f7028a3f4e292175b3ebc298c24b6b9e36f6f3f Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:26:36 +0530 Subject: [PATCH 60/79] Create render.yaml --- render.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 render.yaml diff --git a/render.yaml b/render.yaml new file mode 100644 index 0000000..034f3f8 --- /dev/null +++ b/render.yaml @@ -0,0 +1,27 @@ +services: + - type: web + plan: free + name: War + env: python + buildCommand: pip install -U -r requirements.txt + startCommand: python3 server.py & bash warbot + repo: https://github.com/TECHNOBOT-OP/warbot + branch: master + envVars: + - key: ABUSE + sync: false + - key: APP_ID + sync: false + - key: API_HASH + sync: false + - key: BOT_TOKEN + sync: false + - key: ENV + sync: false + - key: STRING_SESSION + sync: false + - key: DATABASE_URL + sync: false + - PYTHON_VERSION + sync: false + autoDeploy: false From 1ee46ef9dd4b935abf7067510dc54250fcf33b40 Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:28:44 +0530 Subject: [PATCH 61/79] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3313a57..9fc34d8 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,8 @@

⚙️ D E P L O Y I N G ⚙️

- -

STRING SESSION

- [![GenerateString](https://img.shields.io/badge/repl.it-generateString-yellowgreen)](https://generatestringsession.xabhish3k.repl.run) ``Telethon`` @@ -31,6 +28,10 @@ [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) +

DEPLOY TO RENDER

+ +[![Deploy](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/TECHNOBOT-OP/warbot) + ### Official Supports From f8d4cb2b221fa63056721506c5f1bd1580f05bd3 Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:30:10 +0530 Subject: [PATCH 62/79] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fc34d8..2a3757e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

❤️ 🅆🄰🅁🅄🅂🄴🅁🄱🄾🅃 ❤️

- +

The owner would not be responsible for any kind of bans due to the bot.

From e6abd22f1d5b98a6b19625c282d77ac49f7bf2e0 Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:38:39 +0530 Subject: [PATCH 63/79] Update render.yaml --- render.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render.yaml b/render.yaml index 034f3f8..05b31e6 100644 --- a/render.yaml +++ b/render.yaml @@ -5,7 +5,7 @@ services: env: python buildCommand: pip install -U -r requirements.txt startCommand: python3 server.py & bash warbot - repo: https://github.com/TECHNOBOT-OP/warbot + repo: https://github.com/MeAbhish3k/waruserbot branch: master envVars: - key: ABUSE From aa464cac94722ef48aa47d7144d9d964acfd1192 Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:40:28 +0530 Subject: [PATCH 64/79] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 2a3757e..eb73171 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,12 @@ [![Deploy](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/TECHNOBOT-OP/warbot) +## SAFETY GUIDE LINES + +👉 Don't use New Tg Id (use 7,8 month old id) +👉 Don't use Fake Number +👉 Don't use Fake Gmail Id + ### Official Supports From ca7210aacbdfc7c78f548495f29ae3ced033549d Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:41:26 +0530 Subject: [PATCH 65/79] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eb73171..a8152a0 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ [![Deploy](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/TECHNOBOT-OP/warbot) ## SAFETY GUIDE LINES - +``` 👉 Don't use New Tg Id (use 7,8 month old id) 👉 Don't use Fake Number 👉 Don't use Fake Gmail Id - +``` ### Official Supports From d2df32dd927ff0a22787d9dc42ecfc16b7ab59cd Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:44:24 +0530 Subject: [PATCH 66/79] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a8152a0..24cf87a 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@

DEPLOY TO RENDER

-[![Deploy](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/TECHNOBOT-OP/warbot) +[![Deploy](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/MeAbhish3k/waruserbot) ## SAFETY GUIDE LINES ``` From b345a14ae78b9eb27173a1a12d416ac891a5d144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D1=82=D1=94=C2=A2=D0=BD=CE=B7=CF=83=20=D0=B2=CF=83=D1=83?= <116170524+TECHNOBOT-OP@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:47:53 +0530 Subject: [PATCH 67/79] Update render.yaml --- render.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/render.yaml b/render.yaml index 05b31e6..9c7e9bf 100644 --- a/render.yaml +++ b/render.yaml @@ -1,7 +1,7 @@ services: - type: web plan: free - name: War + name: WarBot env: python buildCommand: pip install -U -r requirements.txt startCommand: python3 server.py & bash warbot @@ -22,6 +22,6 @@ services: sync: false - key: DATABASE_URL sync: false - - PYTHON_VERSION + - key: PYTHON_VERSION sync: false autoDeploy: false From 5a5f9134d64fe4105cc7ebf6fbd24aed01ffd552 Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 10:48:14 +0530 Subject: [PATCH 68/79] Update render.yaml --- render.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/render.yaml b/render.yaml index 05b31e6..3915d4f 100644 --- a/render.yaml +++ b/render.yaml @@ -24,4 +24,5 @@ services: sync: false - PYTHON_VERSION sync: false + autoDeploy: false From 75a5e2c7eaa0b028e23e35ead5dc4a13af22771b Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 11:59:55 +0530 Subject: [PATCH 69/79] Update render.yaml --- render.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render.yaml b/render.yaml index 3bfe0c0..a42c278 100644 --- a/render.yaml +++ b/render.yaml @@ -23,6 +23,6 @@ services: - key: DATABASE_URL sync: false - key: PYTHON_VERSION - sync: false + value: 3.10.6 autoDeploy: false From d18c8002c5d7aea19b6f38d13b161eb8ecd9871a Mon Sep 17 00:00:00 2001 From: PyroUserBot <129763781+PyroUserBot@users.noreply.github.com> Date: Sun, 27 Aug 2023 12:01:29 +0530 Subject: [PATCH 70/79] Update render.yaml --- render.yaml | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/render.yaml b/render.yaml index a42c278..942ec39 100644 --- a/render.yaml +++ b/render.yaml @@ -1,28 +1,28 @@ services: - - type: web - plan: free - name: WarBot - env: python - buildCommand: pip install -U -r requirements.txt - startCommand: python3 server.py & bash warbot - repo: https://github.com/MeAbhish3k/waruserbot - branch: master - envVars: - - key: ABUSE - sync: false - - key: APP_ID - sync: false - - key: API_HASH - sync: false - - key: BOT_TOKEN - sync: false - - key: ENV - sync: false - - key: STRING_SESSION - sync: false - - key: DATABASE_URL - sync: false - - key: PYTHON_VERSION - value: 3.10.6 - - autoDeploy: false + - type: web + plan: free + name: WarBot + env: python + buildCommand: pip install -U -r requirements.txt + startCommand: python server.py & bash warbot + repo: https://github.com/MeAbhish3k/waruserbot + branch: master + envVars: + - key: ABUSE + sync: false + - key: APP_ID + sync: false + - key: API_HASH + sync: false + - key: BOT_TOKEN + sync: false + - key: ENV + value: ANYTHING + - key: STRING_SESSION + sync: false + - key: DATABASE_URL + sync: false + - key: PYTHON_VERSION + value: 3.10.6 + + autoDeploy: false From b5c0d44a1d25ae5140b7fb40231fca5ff4650040 Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:29:52 +0530 Subject: [PATCH 71/79] Create SECURITY.md --- SECURITY.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..034e848 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,21 @@ +# Security Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Version | Supported | +| ------- | ------------------ | +| 5.1.x | :white_check_mark: | +| 5.0.x | :x: | +| 4.0.x | :white_check_mark: | +| < 4.0 | :x: | + +## Reporting a Vulnerability + +Use this section to tell people how to report a vulnerability. + +Tell them where to go, how often they can expect to get an update on a +reported vulnerability, what to expect if the vulnerability is accepted or +declined, etc. From c45b735a7d2b0059eb3a35ddcc43bf1eef5aad8b Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:34:10 +0530 Subject: [PATCH 72/79] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 24cf87a..d8a72c8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

❤️ 🅆🄰🅁🅄🅂🄴🅁🄱🄾🅃 ❤️

+

𝙒𝙖𝙧𝙐𝙨𝙚𝙧𝘽𝙤𝙩 {🇮🇳}

From c54c5f309dda7a27f86ecd4ded44b64582abbff0 Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:40:10 +0530 Subject: [PATCH 73/79] Update README.md --- README.md | 95 ++++++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index d8a72c8..f438c70 100644 --- a/README.md +++ b/README.md @@ -1,67 +1,62 @@ -

𝙒𝙖𝙧𝙐𝙨𝙚𝙧𝘽𝙤𝙩 {🇮🇳}

-

- + WarUserBot Image

-

The owner would not be responsible for any kind of bans due to the bot.

- -

FORK AT YOUR OUR OWN RISK

- -

Don't forget to star this repo if you liked it.!!💝

- -

⚙️ D E P L O Y I N G ⚙️

- - -

STRING SESSION

- -[![GenerateString](https://img.shields.io/badge/repl.it-generateString-yellowgreen)](https://generatestringsession.xabhish3k.repl.run) ``Telethon`` - - -- Click On Generate String - - Then Click On Green Run Button. - - Wait for a while then fill the details. - - String will be saved in your Saved Message. - - -

DEPLOY TO HEROKU

- -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) - -

DEPLOY TO RENDER

- -[![Deploy](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/MeAbhish3k/waruserbot) - -## SAFETY GUIDE LINES -``` -👉 Don't use New Tg Id (use 7,8 month old id) -👉 Don't use Fake Number -👉 Don't use Fake Gmail Id -``` - -### Official Supports - -

-

- - - -## credits ❤️ - -[Full Credit Hellbot] - - +

𝙒𝙖𝙧𝙐𝙨𝙚𝙧𝘽𝙤𝙩 {🇮🇳}

+

The owner would not be responsible for any kind of bans due to the bot.

+

FORK AT YOUR OWN RISK

+

Don't forget to star this repo if you liked it.!!💝

+

⚙️ D E P L O Y I N G ⚙️

+

+ GenerateString Badge + `Telethon` +

+

+ - Click On Generate String
+ - Then Click On Green Run Button.
+ - Wait for a while then fill the details.
+ - String will be saved in your Saved Message. +

+

+ + Deploy to Heroku + +

+

+ + Deploy to Render + +

+

SAFETY GUIDE LINES

+

+ - Don't use a new Telegram ID (use an ID that is 7-8 months old).
+ - Don't use a fake number.
+ - Don't use a fake Gmail ID. +

+

OFFICIAL SUPPORTS

+

+ + Channel Support + + + Group Support + +

+

CREDITS ❤️

+

+ [Full Credit Hellbot] +

From 4542c9c94258476425b6993347e150973fd30983 Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:42:53 +0530 Subject: [PATCH 74/79] Update warbot --- warbot | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/warbot b/warbot index 59e8c5a..973ba9d 100644 --- a/warbot +++ b/warbot @@ -1,6 +1,5 @@ #!/bin/bash - _hell_zip () { if [[ $GIT_REPO ]] then @@ -28,9 +27,15 @@ _starter () { unzip -qq "$hellpath" rm -rf "$hellpath" cd $HELLPATH + echo "••• UPDATING WARUSERBOT •••" + git pull python3 ../updater.py ../requirements.txt requirements.txt echo "••• STARTING WARUSERBOT •••" _library } -_starter +if [[ "$1" == "upgrade" ]]; then + _starter +else + echo "Usage: $0 upgrade" +fi From 4f131a4700720e06b73b6c5d44b2e4a5c11e622e Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:44:16 +0530 Subject: [PATCH 75/79] Update updater.py --- updater.py | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/updater.py b/updater.py index 0f8b565..0807f6f 100644 --- a/updater.py +++ b/updater.py @@ -2,20 +2,16 @@ import difflib import shlex import sys - from typing import Tuple - -async def lines_differnce(file1, file2): +async def lines_difference(file1, file2): with open(file1) as f1: lines1 = f1.readlines() lines1 = [line.rstrip("\n") for line in lines1] with open(file2) as f2: lines2 = f2.readlines() lines2 = [line.rstrip("\n") for line in lines2] - diff = difflib.unified_diff( - lines1, lines2, fromfile=file1, tofile=file2, lineterm="", n=0 - ) + diff = difflib.unified_diff(lines1, lines2, fromfile=file1, tofile=file2, lineterm="", n=0) lines = list(diff)[2:] added = [line[1:] for line in lines if line[0] == "+"] removed = [line[1:] for line in lines if line[0] == "-"] @@ -23,8 +19,7 @@ async def lines_differnce(file1, file2): removedt = [i for i in removed if i not in added] return additions, removedt - -async def runcmd(cmd: str) -> Tuple[str, str, int, int]: +async def run_command(cmd: str) -> Tuple[str, str, int, int]: args = shlex.split(cmd) process = await asyncio.create_subprocess_exec( *args, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE @@ -37,18 +32,18 @@ async def runcmd(cmd: str) -> Tuple[str, str, int, int]: process.pid, ) - -async def update_requirements(main , test): - a, r = await lines_differnce(main, test) +async def update_requirements(main, test): + additions, removed = await lines_difference(main, test) try: - for i in a: - await runcmd(f"pip install {i}") - print(f">> Installed Requirement: {i}") + for requirement in additions: + await run_command(f"pip install {requirement}") + print(f">> Installed Requirement: {requirement}") except Exception as e: - print(f"Error installing requirments {str(e)}") - - -# loop = asyncio.get_running_loop() -# loop.run_until_complete(update_requirements(sys.argv[1] , sys.argv[2])) -# loop.close() -asyncio.run(update_requirements(sys.argv[1] , sys.argv[2])) + print(f"Error installing requirements: {str(e)}") + +if __name__ == "__main__": + if len(sys.argv) != 3: + print("Usage: python script.py ") + sys.exit(1) + + asyncio.run(update_requirements(sys.argv[1], sys.argv[2])) From 2a023bacee9ca6e8aeddc6cedb4dfde8363743d3 Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:46:12 +0530 Subject: [PATCH 76/79] Update app.json --- app.json | 59 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/app.json b/app.json index 0ec8805..a7a6f1e 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ { "name": "WarUserBot", - "description": "One of the best Userbot for Telegram. Known for its Smoothness, Design, Support.", + "description": "One of the best Userbots for Telegram. Known for its Smoothness, Design, Support.", "logo": "https://telegra.ph/file/5cadf9784f067a75dc51c.jpg", "keywords": [ "telegram", @@ -14,11 +14,11 @@ "repository": "https://github.com/xabhish3k/waruserbot/", "env": { "ENV": { - "description": "Setting this to ANYTHING will enable heroku.", + "description": "Setting this to ANYTHING will enable Heroku.", "value": "ANYTHING" }, "ABUSE": { - "description": "Leave it blank if you dont want Profanity in HellBot. Else Fill ON.", + "description": "Leave it blank if you don't want Profanity in WarUserBot. Else Fill ON.", "value": "OFF", "required": false }, @@ -35,15 +35,15 @@ "value": "" }, "STRING_SESSION": { - "description": "Get this value by using repl or termux. Refer to Repo for more info.", + "description": "Get this value by using repl or Termux. Refer to the Repo for more info.", "value": "" }, "HEROKU_API_KEY": { - "description": "Go to https://dashboard.heroku.com/account, scroll down and press Reveal API. Required for updater to work.", + "description": "Go to https://dashboard.heroku.com/account, scroll down, and press Reveal API. Required for the updater to work.", "value": "" }, "HEROKU_APP_NAME": { - "description": "The Value of App Name you filled in right on top. Required for updater to work.", + "description": "The Value of App Name you filled in right on top. Required for the updater to work.", "value": "" }, "BOT_TOKEN": { @@ -51,25 +51,32 @@ "value": "" } }, - "addons": [{ - "plan": "heroku-postgresql", - "options": { - "version": "12" + "addons": [ + { + "plan": "heroku-postgresql", + "options": { + "version": "12" + } } - }], - "buildpacks": [{ - "url": "https://github.com/jonathanong/heroku-buildpack-ffmpeg-latest" - },{ - "url":"https://github.com/heroku/heroku-buildpack-google-chrome" - },{ - "url":"https://github.com/heroku/heroku-buildpack-chromedriver" - - - },{ - "url": "https://github.com/heroku/heroku-buildpack-apt.git" - },{ - "url": "https://github.com/chrismytton/heroku-buildpack-jq" - },{ - "url": "heroku/python" - }] + ], + "buildpacks": [ + { + "url": "https://github.com/jonathanong/heroku-buildpack-ffmpeg-latest" + }, + { + "url": "https://github.com/heroku/heroku-buildpack-google-chrome" + }, + { + "url": "https://github.com/heroku/heroku-buildpack-chromedriver" + }, + { + "url": "https://github.com/heroku/heroku-buildpack-apt.git" + }, + { + "url": "https://github.com/chrismytton/heroku-buildpack-jq" + }, + { + "url": "heroku/python" + } + ] } From 458f6c5fd9eb533e68ef8be69bbb919c9179bf0b Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:51:20 +0530 Subject: [PATCH 77/79] Update requirements.txt --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index b50a7aa..b65ae5a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -45,7 +45,9 @@ telethon==1.24.0 tgcrypto validators vcam +speedtest-cli git+https://github.com/xAbhish3k/py-googletrans@master git+https://github.com/xAbhish3k/Wikipedia@master git+https://github.com/xAbhish3k/yt-search-python@master + From 747c08f520e6ef7e1cc3f324985f14a8b57e8686 Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 04:54:17 +0530 Subject: [PATCH 78/79] Update Aptfile --- Aptfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Aptfile b/Aptfile index 09b431f..4213726 100644 --- a/Aptfile +++ b/Aptfile @@ -1,3 +1,4 @@ +git -y pv tree mediainfo From 65874aef566b71b9e7d29454a683852b99051a77 Mon Sep 17 00:00:00 2001 From: Kunal Gaikwad <129763781+AnimeCampus@users.noreply.github.com> Date: Sat, 13 Jan 2024 07:34:57 +0530 Subject: [PATCH 79/79] Update warbot --- warbot | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/warbot b/warbot index 973ba9d..59e8c5a 100644 --- a/warbot +++ b/warbot @@ -1,5 +1,6 @@ #!/bin/bash + _hell_zip () { if [[ $GIT_REPO ]] then @@ -27,15 +28,9 @@ _starter () { unzip -qq "$hellpath" rm -rf "$hellpath" cd $HELLPATH - echo "••• UPDATING WARUSERBOT •••" - git pull python3 ../updater.py ../requirements.txt requirements.txt echo "••• STARTING WARUSERBOT •••" _library } -if [[ "$1" == "upgrade" ]]; then - _starter -else - echo "Usage: $0 upgrade" -fi +_starter