Skip to content

Added command decorators. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mailstorm-ctrl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added command decorators. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
922a4b9
Added updating from google sheet automatically
LoganTutt Jun 25, 2019
a22f48b
Added command decorators.
Mailstorm-ctrl Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions gsheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import gspread
from oauth2client.service_account import ServiceAccountCredentials

from itertools import zip_longest

class Sheet:

def __init__(self):
scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
creds = ServiceAccountCredentials.from_json_keyfile_name('StratRouletteKey.json', scope)
self.client = gspread.authorize(creds)

self.sheet = self.client.open('DP strat roulette').sheet1

def get_table(self):
cols = [self.sheet.col_values(i) for i in range(1,5)]
table = [row for row in zip_longest(*cols) if len(row) == 4 and row[0]]

return table[1:]

if __name__ == "__main__":
sheet = Sheet()
print(sheet.get_table()[0])
209 changes: 134 additions & 75 deletions strat-bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,99 +1,159 @@
import discord
from discord.ext import commands
import random
from gsheet import Sheet
import datetime
# import asyncio

print(discord.version_info)
token = open("token.txt","r").readline()
#This should work? If not, idk
client = commands.Bot(command_prefix='!', case_insensitive=True, description='memer strat bot.')
bot.remove_command('help')

client = discord.Client()
user = []
voices = []
UPDATE_RATE=30 #Minutes between updates

stratsFile = open("strat-source.tsv")
token = open("token.txt","r").readline()
sheet = Sheet()
stratDatabase = sheet.get_table()

stratDatabase = [line.split('\t')[:4] for line in stratsFile.readlines()]

last_update = datetime.datetime.now()
def update_if_needed(database):
global last_update
now = datetime.datetime.now()
if (now - last_update).total_seconds() > UPDATE_RATE*60:
print("Updating database")
last_update = now
return sheet.get_table()
else:
return database


@client.event
async def on_ready():
print("We have logged in as {0.user}".format(client))

@client.event
async def on_message(message):

messageStr = message.content
messageStr = messageStr.lower()

if message.author == client.user:
#Let this command be run by people with the Testers role only.
@client.command()
@commands.has_role('Testers')
async def strat(ctx, ,*args):
#Not sure why this is global but I kept it because who knows.
global stratDatabase
stratDatabase = update_if_needed(stratDatabase)
#I got tired of scrolling. Add your options here
team_options_a = ['a','attack','attk','atk','attackers']
team_options_d = ['d','defender','def','crim','t']
tile_options_c = ['c','cs','cstore','store']
tile_options_f = ['factory','f','fac']
tile_options_k = ['k','kill','killhouse']
teams_merged = team_options_a + team_options_d
tiles_merged = tile_options_c + tile_options_f + tile_options_k
#No arguments provided. Default to random.
if len(args) == 0:
validNum = randomGen("Both","All")
await ctx.message.send(embed=post(validNum))
return


if message.content.startswith("!strat"): #Checking if strat
validNum = False
if attacker(messageStr): #Checking if Attacker
if cstore(messageStr):
while validNum == False:
validNum = randomGen("Attackers","C-Store")
await message.channel.send(embed=post(validNum)) #Attacker CS
print("att cs")

#One argument provided, check to see if it's a tile
elif len(args) == 1 and args[0].lower() in tiles_merged:
tile = args[0].lower()
#A bunch of if's to determine what tile should be posted.
if tile in tile_options_c:
validNum = randomGen('Both',"C-Store")
await ctx.send(embed=post(validNum))
return
if tile in tile_options_f:
validNum = randomGen('Both',"Factory")
await ctx.send(embed=post(validNum))
return
if tile in tile_options_k:
validNum = randomGen('Both',"Killhouse")
await ctx.send(embed=post(validNum))
return

#Like above, but for teams if this is the only argument passed
elif len(args) == 1 and args[0].lower() in teams_merged:
team = args[0].lower()
if team in team_options_a:
validNum = randomGen("Attackers","All")
await ctx.send(embed=post(validNum))
return
else:
validNum = randomGen("Defenders","All")
await ctx.send(embed=post(validNum))
return

#tile was first argument, team was second
elif len(args) == 2 and args[0].lower() in tiles_merged and args[1].lower() in teams_merged:
tile = args[0].lower()
team = args[1].lower()
if tile in tile_options_c:
if team in team_options_a:
validNum = randomGen("Attackers","C-Store")
await ctx.send(embed=post(validNum))
return

if factory(messageStr):
while validNum == False:
validNum = randomGen("Attackers","Factory")
await message.channel.send(embed=post(validNum)) #Attacker Factory
print("att fac")
else:
validNum = randomGen("Defenders","C-Store")
await ctx.send(embed=post(validNum))
return

if killhouse(messageStr):
while validNum == False:
validNum = randomGen("Attackers","Killhouse")

await message.channel.send(embed=post(validNum)) #Attacker Killhouse
print("att kh")
elif tile in tile_options_f:
if team in team_options_a:
validNum = randomGen("Attackers","Factory")
await ctx.send(embed=post(validNum))
return



if defender(messageStr): #Checking if Defender
if cstore(messageStr):
while validNum == False:
validNum = randomGen("Defenders","C-store")

await message.channel.send(embed=post(validNum)) #Defender CS
print("def cs")
else:
validNum = randomGen("Defenders","Factory")
await ctx.send(embed=post(validNum))
return

if factory(messageStr):
while validNum == False:
validNum = randomGen("Defenders","Factory")

await message.channel.send(embed=post(validNum)) #Defender Factory
print("def fac")
elif tile in tile_options_k:
if team in team_options_a:
validNum = randomGen("Attackers","Killhouse")
await ctx.send(embed=post(validNum))
return

if killhouse(messageStr):

while validNum == False:
validNum = randomGen("Defenders","Killhouse")

await message.channel.send(embed=post(validNum)) #Defender Killhouse
print("def kh")
else:
validNum = randomGen("Defenders","Killhouse")
await ctx.send(embed=post(validNum))
return

validNum = randomGen("Both","All")
await message.channel.send(embed=post(validNum))
print("general")



if message.content.startswith("!help"):
await message.channel.send("`!strat [team] [tile set]`. \n You can do just `!strat` for a general strat, or specify both a team and a tileset which can give you a strat for the map or the team.")


#Same as above, but team was the first argument and tile was second
elif len(args) == 2 and args[1] in tiles_merged and args[0] in teams_merged:
tile = args[1].lower()
team = args[0].lower()
if tile in tile_options_c:
if team in team_options_a:
validNum = randomGen("Attackers","C-Store")
await ctx.send(embed=post(validNum))
return
else:
validNum = randomGen("Defenders","C-Store")
await ctx.send(embed=post(validNum))
return
elif tile in tile_options_f:
if team in team_options_a:
validNum = randomGen("Attackers","Factory")
await ctx.send(embed=post(validNum))
return
else:
validNum = randomGen("Defenders","Factory")
await ctx.send(embed=post(validNum))
return
elif tile in tile_options_k:
if team in team_options_a:
validNum = randomGen("Attackers","Killhouse")
await ctx.send(embed=post(validNum))
return
else:
validNum = randomGen("Defenders","Killhouse")
await ctx.send(embed=post(validNum))
return
#No need to check to see if the amount of args provided is above 2 since we just wont use them. Also not caring how the list looks when posted.
else:
await ctx.send("You did not enter valid arguments. Valid arguments for team names are:\n`"+str(teams_merged)+"`\n\nValid arguments for tilesets are:\n`"+str(tiles_merged)+"`")
return


def randomGen(team,tileset):
num = random.randint(1,len(stratDatabase))
num = random.randint(0,len(stratDatabase))
if team == "Both":
return num

Expand All @@ -112,7 +172,7 @@ def randomGen(team,tileset):
#return number

def post(number):
embed = discord.Embed(title="Title", description=stratDatabase[number][0], color=0x04ddfe)
embed = discord.Embed(title="Title (GDOCS)", description=stratDatabase[number][0], color=0x04ddfe)
embed.add_field(name="Description", value=stratDatabase[number][1], inline=False)
embed.add_field(name="Team", value=stratDatabase[number][2], inline=False)
embed.add_field(name="TileSet", value=stratDatabase[number][3], inline=False)
Expand Down Expand Up @@ -153,5 +213,4 @@ def killhouse(message):
return False



client.run(token.strip())
client.run(token.strip())