implemented /news and deleted debugbot (edit BOT_API_KEY instead) #2

Merged
Rripped merged 40 commits from bot-features into main 2022-03-16 09:08:43 +00:00
4 changed files with 15 additions and 9 deletions
Showing only changes of commit 97db1e6139 - Show all commits

View File

@ -1,9 +1,13 @@
MYSQL_HOST=<mysql-host> # MYSQL Database
MYSQL_PORT=<mysql-port> MYSQL_HOST=
MYSQL_DATABASE=<mysql-database> MYSQL_PORT=
MYSQL_USER=<mysql-user> MYSQL_DATABASE=
MYSQL_PASSWORD=<mysql-password> MYSQL_USER=
MYSQL_PASSWORD=
BOT_API_KEY=<bot-api-key> # Telegram bot api key
BOT_API_KEY=
SECRET_KEY=<flask-secret-key>
# Flask secret key
SECRET_KEY=

1
.gitignore vendored
View File

@ -1 +1,2 @@
.idea/* .idea/*
.env

View File

@ -1,6 +1,7 @@
FROM python:3.10-alpine FROM python:3.10-alpine
WORKDIR /srv/flask_app WORKDIR /srv/flask_app
RUN apk add build-base jpeg-dev zlib-dev musl-dev linux-headers g++
COPY telegram_bot/requirements.txt /srv/flask_app/ COPY telegram_bot/requirements.txt /srv/flask_app/

View File

@ -24,7 +24,7 @@ def get_portfolio():
for row in transactions: for row in transactions:
if row.symbol in return_portfolio: if row.symbol in return_portfolio:
return_portfolio[row.symbol]['count'] += row.count return_portfolio[row.symbol]['count'] += row.count
return_portfolio[row.symbol]['last_transaction'] += row.time return_portfolio[row.symbol]['last_transaction'] = row.time
else: else:
return_portfolio[row.symbol] = {"count": row.count, "last_transaction": row.time} return_portfolio[row.symbol] = {"count": row.count, "last_transaction": row.time}