From 75d3f26d21a313bf15949a11902f7a460fc6f3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=B6stner?= Date: Thu, 7 Nov 2019 23:10:56 +0100 Subject: [PATCH] some files deleted and get them together in one file --- README.md | 23 ++++++++++------------- pyrobot/modules/DeleteMessages.py | 7 ------- pyrobot/modules/Dice.py | 14 -------------- pyrobot/modules/GayTester.py | 23 ----------------------- pyrobot/modules/RandomPersonCreator.py | 9 --------- pyrobot/modules/admin.py | 6 ++++++ pyrobot/modules/memes.py | 22 ++++++++++++++++++++++ pyrobot/modules/misc.py | 20 ++++++++++++++++++++ 8 files changed, 58 insertions(+), 66 deletions(-) delete mode 100644 pyrobot/modules/DeleteMessages.py delete mode 100644 pyrobot/modules/Dice.py delete mode 100644 pyrobot/modules/GayTester.py delete mode 100644 pyrobot/modules/RandomPersonCreator.py diff --git a/README.md b/README.md index 660d176..17d3a12 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ !cclean = Kicks all deletes account (if they have less permissions than you) +?d = Reply to a messages to delete it + ### BlackWWHelper.py .sg = Start a game @@ -56,20 +58,11 @@ .kill = Kills a player in a game -### DeleteMessages.py -?d = Reply to a messages to delete it - -### Dice.py -.d X = Random Number between 1 and X - ### evaluation.py .eval = Evaluates Python Code .exec = Execute Python Code -### GayTester.py -.gay = Test your Gay percentage (German) - ### get_info.py !admins = Show all admins in actual group @@ -88,9 +81,15 @@ dog = shows a picture of a dog .ggl TEXT = Shows a Sticker to google TEXT +.gay = Test your Gay percentage (German) + ### misc.py .up = Shows how long your bot has been online since last start +.d X = Random Number between 1 and X + +.p = Creates a random person (German) + ### PictureKillerGlitch.py .glitch X = As reply to a picture glitches a picture X times (Just try it) @@ -114,12 +113,10 @@ Answer2 ?purgeme = Deletes all of your messages below the replyed -### RandomPersonCreator.py -.p = Creates a random person (German) - -### ScriptsLightwerewolf.py +### offtopic.py #offtopic = Sends the link to the german offtopic group +###StealRateGerman.py #steal = Give a list with stealrate (German) ### TextToVoice.py diff --git a/pyrobot/modules/DeleteMessages.py b/pyrobot/modules/DeleteMessages.py deleted file mode 100644 index 6838883..0000000 --- a/pyrobot/modules/DeleteMessages.py +++ /dev/null @@ -1,7 +0,0 @@ -from pyrobot import BOT -from pyrogram import Filters, Message - -@BOT.on_message(Filters.command("d", "?") & Filters.me) -def delete(bot: BOT, message: Message): - message.delete() - BOT.delete_messages(message.chat.id, message.reply_to_message.message_id) diff --git a/pyrobot/modules/Dice.py b/pyrobot/modules/Dice.py deleted file mode 100644 index cea194f..0000000 --- a/pyrobot/modules/Dice.py +++ /dev/null @@ -1,14 +0,0 @@ -from pyrobot import BOT -from pyrogram import Filters, Message - -from random import randint - - -@BOT.on_message(Filters.command("d", '.')) -def dice(bot: BOT, message: Message): - max = int(message.command[1]) - dice=randint(1,max) - message.delete() - max=str(max) - dice=str(dice) - bot.send_message(message.chat.id, "Deine Zahl aus 1 und "+ max + " beträgt: " + dice) diff --git a/pyrobot/modules/GayTester.py b/pyrobot/modules/GayTester.py deleted file mode 100644 index b9c8f78..0000000 --- a/pyrobot/modules/GayTester.py +++ /dev/null @@ -1,23 +0,0 @@ -from pyrobot import BOT -from pyrogram import Filters, Message -from random import randint - -@BOT.on_message(Filters.command("gay", ".") & ~Filters.user('xxmeliodas') & ~Filters.user(617318636)) -def gay_expect_me_and_geric(bot: BOT, message:Message): - userid=str(message.from_user.id) - username=message.from_user.first_name - gaypercent=randint(0,100) - percent=str(gaypercent) - message.reply('['+username+'](tg://user?id='+userid+'), du bist ' +percent +'% Schwul!') - -@BOT.on_message(Filters.command("gay", ".") & Filters.user('xxmeliodas')) -def gay_me(bot: BOT, message:Message): - username=message.from_user.first_name - userid=str(message.from_user.id) - message.reply('['+username+'](tg://user?id='+userid+'), du bist 0% Schwul!') - -@BOT.on_message(Filters.command("gay", ".") & Filters.user(617318636)) -def gay_eric(bot: BOT, message:Message): - username=message.from_user.first_name - userid=str(message.from_user.id) - message.reply('['+username+'](tg://user?id='+userid+'), du bist 100% Schwul!') diff --git a/pyrobot/modules/RandomPersonCreator.py b/pyrobot/modules/RandomPersonCreator.py deleted file mode 100644 index d1bc4e5..0000000 --- a/pyrobot/modules/RandomPersonCreator.py +++ /dev/null @@ -1,9 +0,0 @@ -from pyrobot import BOT -from pyrogram import Filters, Message -from pyzufall.person import Person - -@BOT.on_message(Filters.command("p", ".")) -def person(bot: BOT, message: Message): - person = Person() - message.delete() - bot.send_message(message.chat.id, person) diff --git a/pyrobot/modules/admin.py b/pyrobot/modules/admin.py index 440d1f9..cae99ad 100644 --- a/pyrobot/modules/admin.py +++ b/pyrobot/modules/admin.py @@ -228,3 +228,9 @@ def clean_deleted(bot: BOT, message: Message): sleep(e.x) message.edit(f"Removed {len(removed)} deleted accounts.") + +#Delete Message +@BOT.on_message(Filters.command("d", "?") & Filters.me) +def delete(bot: BOT, message: Message): + message.delete() + BOT.delete_messages(message.chat.id, message.reply_to_message.message_id) diff --git a/pyrobot/modules/memes.py b/pyrobot/modules/memes.py index 53f9711..c3b8ce4 100644 --- a/pyrobot/modules/memes.py +++ b/pyrobot/modules/memes.py @@ -1,5 +1,6 @@ from time import sleep +from random import randint import requests from pyrogram import Filters, Message @@ -91,3 +92,24 @@ def google_sticker(bot: BOT, message: Message): message.edit("@StickerizerBot didn't respond in time.") sleep(2) message.delete() + +#GayTester +@BOT.on_message(Filters.command("gay", ".") & ~Filters.user('xxmeliodas') & ~Filters.user(617318636)) +def gay_expect_me_and_geric(bot: BOT, message:Message): + userid=str(message.from_user.id) + username=message.from_user.first_name + gaypercent=randint(0,100) + percent=str(gaypercent) + message.reply('['+username+'](tg://user?id='+userid+'), du bist ' +percent +'% Schwul!') + +@BOT.on_message(Filters.command("gay", ".") & Filters.user('xxmeliodas')) +def gay_me(bot: BOT, message:Message): + username=message.from_user.first_name + userid=str(message.from_user.id) + message.reply('['+username+'](tg://user?id='+userid+'), du bist 0% Schwul!') + +@BOT.on_message(Filters.command("gay", ".") & Filters.user(617318636)) +def gay_eric(bot: BOT, message:Message): + username=message.from_user.first_name + userid=str(message.from_user.id) + message.reply('['+username+'](tg://user?id='+userid+'), du bist 100% Schwul!') diff --git a/pyrobot/modules/misc.py b/pyrobot/modules/misc.py index 85eabfc..5599b21 100644 --- a/pyrobot/modules/misc.py +++ b/pyrobot/modules/misc.py @@ -4,6 +4,10 @@ from pyrobot import BOT, START_TIME +from random import randint + +from pyzufall.person import Person + # -- Constants -- # UPTIME = "Current Uptime\n{}" @@ -16,3 +20,19 @@ def uptime(bot: BOT, message: Message): now = datetime.now() uptime = now - START_TIME message.edit(UPTIME.format(str(uptime).split('.')[0])) + +#Dice +@BOT.on_message(Filters.command("d", '.')) +def dice(bot: BOT, message: Message): + max = int(message.command[1]) + dice=randint(1,max) + message.delete() + max=str(max) + dice=str(dice) + bot.send_message(message.chat.id, "Deine Zahl aus 1 und "+ max + " beträgt: " + dice) + +@BOT.on_message(Filters.command("p", ".")) +def person(bot: BOT, message: Message): + person = Person() + message.delete() + bot.send_message(message.chat.id, person)