From bf74ec49bccd1987fd7012488ef791e09312826a Mon Sep 17 00:00:00 2001 From: Peter van Arkel Date: Tue, 8 Jun 2021 21:06:15 +0200 Subject: [PATCH] prepare code for gspread usage --- Makefile | 2 ++ jeeves.py | 12 ++++++------ jeevesbot/secret.json.dist | 0 requirements.txt | 2 ++ 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 jeevesbot/secret.json.dist diff --git a/Makefile b/Makefile index 595fdeb..2525406 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ init: install: cp jeevesbot/env.py.dist jeevesbot/env.py + cp jeevesbot/secret.json.dist jeevesbot/secret.json clearlog: rm jeeves.log @@ -10,6 +11,7 @@ clearlog: clean: rm jeeves.log rm jeevesbot/env.py + rm jeevesbot/secret.json rm -rf jeevesbot/__pycache/ rm -rf __pycache/ diff --git a/jeeves.py b/jeeves.py index aba8a14..ed0d148 100644 --- a/jeeves.py +++ b/jeeves.py @@ -4,6 +4,8 @@ import discord from discord.ext import commands import logging from jeevesbot import bothelp, functions, env +import gspread +from oauth2client.service_account import ServiceAccountCredentials # setup logging logging.basicConfig(level=logging.INFO) @@ -12,10 +14,13 @@ logger.setLevel(logging.INFO) handler = logging.FileHandler(filename='jeeves.log', encoding='utf-8', mode='a') handler.setFormatter(logging.Formatter('%(asctime)s:%(levelname)s:%(name)s: %(message)s')) logger.addHandler(handler) - # setup discord.py client = discord.Client() e = discord.Embed() +# setup gspread +scope = ['https://www.googleapis.com/auth/spreadsheets', 'https://www.googleapis.com/auth/drive'] +creds = ServiceAccountCredentials.from_json_keyfile_name('secret.json', scope) +gclient = gspread.authorize(creds) @client.event async def on_message(message): @@ -70,8 +75,3 @@ async def on_ready(): if __name__ == '__main__': client.run(env.TOKEN) - -## TODO -# /tenor andere syntax -# tenor android keyboard andere syntax (https://c.tenor.com/) -# giphy verdubbelt url \ No newline at end of file diff --git a/jeevesbot/secret.json.dist b/jeevesbot/secret.json.dist new file mode 100644 index 0000000..e69de29 diff --git a/requirements.txt b/requirements.txt index e3176b6..68c6b69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,8 @@ multidict pyparsing typing-extensions pylint +gspread +oauth2client # needs this version, otherwise TypeErrors will break stuff yarl==1.4.2 \ No newline at end of file