wayfinderak/Geeksbot
1
0
Fork 0
Code Issues Pull Requests Actions 118 Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development

Browse Source
This commit is contained in:
Dusty.P 2018-04-20 21:04:57 -08:00
commit dd5dab317d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ bot_secrets.json
google_client_secret.json
__pycache__/
logs/*
*.sh.swp

11
geeksbot.py
View File

@ -57,7 +57,7 @@ class Geeksbot(commands.Bot):
self.infected = {}
self.TOKEN = self.bot_secrets['token']
del self.bot_secrets['token']
self.db_con = self.connect_db()
self.db_con = None
del self.bot_secrets['db_con']
self.default_prefix = 'g~'
self.voice_chans = {}
@ -65,10 +65,10 @@ class Geeksbot(commands.Bot):
self.gcs_service = build('customsearch', 'v1', developerKey=self.bot_secrets['google_search_key'])
async def connect_db(self):
return await asyncpg.connect(host={self.bot_secrets['db_con']['host']},
database={self.bot_secrets['db_con']['db_name']},
user={self.bot_secrets['db_con']['user']},
password={self.bot_secrets['db_con']['password']})
self.db_con = await asyncpg.connect(host={self.bot_secrets['db_con']['host']},
database={self.bot_secrets['db_con']['db_name']},
user={self.bot_secrets['db_con']['user']},
password={self.bot_secrets['db_con']['password']})
@staticmethod
async def get_custom_prefix(bot_inst, message):
@ -144,6 +144,7 @@ async def on_message(ctx):
@bot.event
async def on_ready():
bot.connect_db()
bot.recent_msgs = {}
for guild in bot.guilds:
bot.recent_msgs[guild.id] = deque(maxlen=50)