remoll/tbot-with-extras
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: remoll:3f06a88a83d374f9822bfa9f2d45c503886ace7b
Branches Tags
remoll:main
..
compare: remoll:8ba9743334b335f7333842a4e04fb1a8847282fc
Branches Tags
remoll:main

5 Commits
3f06a88a83 ... 8ba9743334

Author SHA1 Message Date
Rémy Moll
8ba9743334 Update database.py 2022-01-28 12:01:30 +01:00
Rémy Moll
b25c714e6f Update main.py 2022-01-28 11:46:53 +01:00
Rémy Moll
546b912bbc Update __init__.py 2022-01-28 11:45:34 +01:00
Rémy Moll
5728fed3ca Update database.py 2022-01-28 11:44:53 +01:00
Rémy Moll
ed03773145 Update database.py 2022-01-28 11:26:39 +01:00
3 changed files with 10 additions and 10 deletions
Expand all files Collapse all files

4
app/bot/api/__init__.py
View File

@@ -7,6 +7,6 @@ import os
if os.getenv("dockerized", "") == "true": if os.getenv("dockerized", "") == "true":
import sys import sys
sys.path.append("/keys") sys.path.append("/keys")
import api_keys as keys import api_keys as apikeys
else: else:
from . import keys from . import apikeys

6
app/bot/main.py
View File

@@ -22,13 +22,13 @@ class ChatBot():
self.version = version self.version = version
# Import apis # Import apis
self.api_weather = api.weather.WeatherFetch(api.keys.weather_api) self.api_weather = api.weather.WeatherFetch(api.apikeys.weather_api)
self.api_reddit = api.reddit.RedditFetch(api.keys.reddit_api) self.api_reddit = api.reddit.RedditFetch(api.apikeys.reddit_api)
self.api_search = api.search.WebSearch() self.api_search = api.search.WebSearch()
self.api_art = api.metmuseum.ArtFetch() self.api_art = api.metmuseum.ArtFetch()
# and so on # and so on
self.telegram = Updater(api.keys.telegram_api, use_context=True) self.telegram = Updater(api.apikeys.telegram_api, use_context=True)
self.dispatcher = self.telegram.dispatcher self.dispatcher = self.telegram.dispatcher

8
app/persistence/database.py
View File

@@ -11,10 +11,10 @@ import os
if os.getenv("dockerized", "") == "true": if os.getenv("dockerized", "") == "true":
import sys import sys
sys.path.append("/keys") sys.path.append("/keys")
import db_keys as keys import db_keys as dbkeys
else: else:
from . import keys from . import keys as dbkeys
dbk = keys.db_access dbk = dbkeys.db_keys
@@ -63,7 +63,7 @@ class DatabaseUtils:
@auto_connect_db @auto_connect_db
def chat_log(self, **kwargs): def chat_log(self, **kwargs):
models.ChatMetric(**kwargs) models.ChatMetric(**kwargs).save()
@auto_connect_db @auto_connect_db
def list_get(self, list_name=""): def list_get(self, list_name=""):