Code refactoring

This commit is contained in:
s-prechtl 2021-10-04 16:13:21 +02:00
parent 7c392eda3b
commit 0db532a1db

View file

@ -1,4 +1,5 @@
import json
import time
import discord, pickle
import requests
@ -46,16 +47,9 @@ class MyClient(discord.Client):
if message.content == (self.pref + "prefix"):
await message.channel.send(
"Your current prefix is: " + self.pref + ". To change it use " + self.pref + "prefix [new Prefix]")
elif self.getContentFromMessageWithPrefixCommand(message, ["prefix"]):
print("Prefix request sent in Channel " + str(message.channel.name))
try:
self.pref = message.content.split(" ")[1]
await message.channel.send("Prefix successfully changed to " + self.pref)
pickle.dump(self.pref, open("prefix.data", "wb"))
except:
await message.channel.send(
"Something went wrong while changing the prefix. To change it use " + self.pref + "prefix [new Prefix]")
print("Prefix change request sent in Channel " + str(message.channel.name) + " at " + str(time.time()))
self.changePrefix(message)
# HUBA
if self.getContentFromMessageWithPrefixCommand(message, ["hubaa"]):
@ -65,7 +59,38 @@ class MyClient(discord.Client):
# LEVEL
elif self.getContentFromMessageWithPrefixCommand(message, ["level", "Level", "lvl"]):
print("Summonerlevel request sent in Channel " + str(message.channel.name))
print("Summoner level request sent in Channel " + str(message.channel.name) + " at " + str(time.time()))
self.requestLevel(message)
# RANK
elif self.getContentFromMessageWithPrefixCommand(message, ["rank", "Rank", "RANK"]):
print("Summoner rank request sent in Channel " + str(message.channel.name) + " at " + str(time.time()))
self.requestRank(message)
# HIGHEST MASTERY
elif self.getContentFromMessageWithPrefixCommand(message,
["highestmastery", "highestMastery", "HM", "hm", "Hm",
"HighestMastery"]):
print("Summoner highest mastery request sent in Channel " + str(message.channel.name) + " at " + str(
time.time()))
self.requestHighestMastery(message)
elif self.getContentFromMessageWithPrefixCommand(message, ["cm", "CM", "Championmastery",
"championmastery"]): # get Mastery from Champion
print("Summoner champion mastery request sent in Channel " + str(message.channel.name) + " at " + str(
time.time()))
self.requestChampionMastery(message)
async def changePrefix(self, message: discord.Message):
try:
self.pref = message.content.split(" ")[1]
await message.channel.send("Prefix successfully changed to " + self.pref)
pickle.dump(self.pref, open("prefix.data", "wb"))
except:
await message.channel.send(
"Something went wrong while changing the prefix. To change it use " + self.pref + "prefix [new Prefix]")
async def requestLevel(self, message: discord.Message):
sumname = ""
try:
sumname = self.getSummonerNameFromMessage(message)
@ -76,8 +101,7 @@ class MyClient(discord.Client):
level = response["summonerLevel"]
await message.channel.send("Der Spieler " + sumname + " hat das Level " + str(level) + ".")
# RANK
elif self.getContentFromMessageWithPrefixCommand(message, ["rank", "Rank", "RANK"]):
async def requestRank(self, message: discord.Message):
sumname = ""
try:
sumname = self.getSummonerNameFromMessage(message)
@ -96,10 +120,7 @@ class MyClient(discord.Client):
wr = str(truncate((response["wins"] / (response["wins"] + response["losses"]) * 100), 2)) + "%"
await message.channel.send(sumname + ": " + str(rank) + " | WR: " + str(wr))
# HIGHEST MASTERY
elif self.getContentFromMessageWithPrefixCommand(message,
["highestmastery", "highestMastery", "HM", "hm", "Hm",
"HighestMastery"]):
async def requestHighestMastery(self, message: discord.Message):
sumname = ""
err = "Something went wrong.\nUsage: " + self.pref + "hm [count] [Summonername]"
firstIsInt = intTryParse(message.content.split(" ")[1])[1]
@ -134,8 +155,7 @@ class MyClient(discord.Client):
except Exception as e:
await message.channel.send(err)
elif self.getContentFromMessageWithPrefixCommand(message, ["cm", "CM", "Championmastery",
"championmastery"]): # get Mastery from Champion
async def requestChampionMastery(self, message: discord.Message):
err = "Something went wrong.\nUsage: " + self.pref + "cm [Championname] [Summonername]"
sumname = ""
try: