diff --git a/1.2.5/test b/1.2.5/test deleted file mode 100644 index e8b0ce1..0000000 --- a/1.2.5/test +++ /dev/null @@ -1,10 +0,0 @@ -import schedule -import time -def test(): - print("deez") -schedule.every(1).minutes.do(test) -while 1 == 1: - print("joe") - time.sleep(5) - schedule.run_pending() - diff --git a/1.2/bot.conf b/1.2/bot.conf deleted file mode 100644 index b5491cc..0000000 --- a/1.2/bot.conf +++ /dev/null @@ -1,7 +0,0 @@ -[config] -token = OTg2NDA4MjM3Njg5NjMwNzYx.Gn3sV3.af4MeWrAct-e6FyN6oDWt-QaOfOHuYBY97Vw7k -replytobot = false - -[modules] -triggerbot = "true" -quotebot = "true" diff --git a/1.2/bot.py b/1.2/bot.py deleted file mode 100644 index 1346e50..0000000 --- a/1.2/bot.py +++ /dev/null @@ -1,70 +0,0 @@ -import discord -import time -import configparser -import random -client = discord.Client() -avgtimelst = [] - - -#loading config files -botconf = configparser.ConfigParser() -botconf.read("bot.conf") -triggerbotconf = configparser.ConfigParser() -triggerbotconf.read("triggerbot.conf") -quotebotconf = configparser.ConfigParser() -quotebotconf.read("quotebot.conf") - - -#bot info -@client.event -async def on_ready(): - print('We have logged in as {0.user}'.format(client)) - - -#main event -@client.event -async def on_message(message): - #defining variables - msg = str(message.content) - channel = str(message.channel.id) - author = str(message.author) - - #reply to bots - if message.author.bot and botconf["config"]["replytobot"] == "false": - return - - #start event timer - print("\n start client.event") - start = time.time() - - #triggerbot - b = 0 - found = "false" - triggersstr = (triggerbotconf["config"]["triggers"]) - triggers = triggersstr.split(",") - print(triggers) - print(type(triggers)) - while b < len(triggers) and found == "false": - if triggers[b] not in msg: - b = b+1 - elif triggers[b] in msg: - print("balls") - found = "true" - await message.channel.send(triggerbotconfig["replys"][""]) - else: - print("something happened") - - #daily quote - if channel == "1010042640508669982": - print("weeee") - - #end function timer - end = time.time() - eventime = (end - start) - reventime = str(round(eventime,3)) - avgtimelst.append(float(reventime)) - avgtime = str(sum(avgtimelst) / len(avgtimelst)) - print("\n end client.event \n time: " + str(reventime) + "\n average time: " + avgtime) - - -client.run(botconf["config"]["token"]) diff --git a/1.2/quotebot.conf b/1.2/quotebot.conf deleted file mode 100644 index e69de29..0000000 diff --git a/1.2/triggerbot.conf b/1.2/triggerbot.conf deleted file mode 100644 index 50a28be..0000000 --- a/1.2/triggerbot.conf +++ /dev/null @@ -1,8 +0,0 @@ -[config] -blacklist = ["1234567890","0987654321"] #blacklisted channels -triggers = hello,hi,howdy,sup -[replys] # add new replys as needed to respond custom triggers -hello = ["hello","top of the morning m8"] -hi = ["hi"] -howdy = ["howdy"] -sup = ["sup"] diff --git a/1.2.5/bot.py b/bot.py similarity index 100% rename from 1.2.5/bot.py rename to bot.py diff --git a/1.2.5/config/bot.conf b/config/bot.conf similarity index 100% rename from 1.2.5/config/bot.conf rename to config/bot.conf diff --git a/1.2.5/config/quotebot.conf b/config/quotebot.conf similarity index 100% rename from 1.2.5/config/quotebot.conf rename to config/quotebot.conf diff --git a/1.2.5/config/triggerbot.conf b/config/triggerbot.conf similarity index 100% rename from 1.2.5/config/triggerbot.conf rename to config/triggerbot.conf diff --git a/1.2.5/data/quotes.var b/data/quotes.var similarity index 100% rename from 1.2.5/data/quotes.var rename to data/quotes.var