Compare commits

..

3 Commits

Author SHA1 Message Date
dependabot[bot]
1f8c4494fe Bump bcrypt from 3.2.2 to 4.0.0 in /api
Bumps [bcrypt](https://github.com/pyca/bcrypt) from 3.2.2 to 4.0.0.
- [Release notes](https://github.com/pyca/bcrypt/releases)
- [Changelog](https://github.com/pyca/bcrypt/blob/main/release.py)
- [Commits](https://github.com/pyca/bcrypt/compare/3.2.2...4.0.0)

---
updated-dependencies:
- dependency-name: bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 09:32:57 +00:00
Florian Kaiser
594b532fe7 Update dependabot.yml 2022-05-18 13:02:08 +02:00
Florian Kellermann
fb8922f06a Merge pull request #196 from WebEngineering2/bot
NoneType Fix
2022-05-13 12:33:11 +02:00
3 changed files with 9 additions and 18 deletions

View File

@@ -10,8 +10,6 @@ updates:
directory: "/api" directory: "/api"
schedule: schedule:
interval: "daily" interval: "daily"
assignees:
- "H4CK3R-01"
open-pull-requests-limit: 100 open-pull-requests-limit: 100
# Bot # Bot
@@ -19,10 +17,6 @@ updates:
directory: "/telegram_bot" directory: "/telegram_bot"
schedule: schedule:
interval: "daily" interval: "daily"
assignees:
- "NormalParameter"
- "Rripped"
- "FlorianKellermann"
open-pull-requests-limit: 100 open-pull-requests-limit: 100
# Frontend # Frontend
@@ -30,6 +24,4 @@ updates:
directory: "/frontend" directory: "/frontend"
schedule: schedule:
interval: "daily" interval: "daily"
assignees:
- "kevinpauer"
open-pull-requests-limit: 100 open-pull-requests-limit: 100

View File

@@ -7,7 +7,7 @@ pymysql==1.0.2
pyjwt==2.3.0 pyjwt==2.3.0
apiflask==1.0.0 apiflask==1.0.0
flask-cors==3.0.10 flask-cors==3.0.10
bcrypt==3.2.2 bcrypt==4.0.0
pytest~=7.1.2 pytest~=7.1.2
pytest-cov pytest-cov
marshmallow~=3.15.0 marshmallow~=3.15.0

View File

@@ -148,16 +148,15 @@ def update_for_user(p_user_id, p_my_handler):
send_to_user("Hello %s this is your update for today:"%str(my_user["username"]), pUser_id=p_user_id) send_to_user("Hello %s this is your update for today:"%str(my_user["username"]), pUser_id=p_user_id)
shares = p_my_handler.get_user_shares(p_user_id) # all interest shares shares = p_my_handler.get_user_shares(p_user_id) # all interest shares
if len(share_symbols) != 0: # iterate through all shares
if shares!=None for i in range(len(share_symbols)):
if len(share_symbols) != 0: # iterate through all shares my_price = share_fetcher.get_share_price_no_currency(share_symbols[i])
my_update_message = f'{share_fetcher.get_share_information_markdown(share_symbols[i])}\ncount: {hf.make_markdown_proof(share_amounts[i])}\nTotal: {hf.make_markdown_proof(round(float(my_price) * float(share_amounts[i]), 2))} EUR'
for i in range(len(share_symbols)): bot.send_message(chat_id=p_user_id, text=my_update_message, parse_mode="MARKDOWNV2")
my_price = share_fetcher.get_share_price_no_currency(share_symbols[i]) else:
my_update_message = f'{share_fetcher.get_share_information_markdown(share_symbols[i])}\ncount: {hf.make_markdown_proof(share_amounts[i])}\nTotal: {hf.make_markdown_proof(round(float(my_price) * float(share_amounts[i]), 2))} EUR' send_to_user("No shares found for your account. Check " + os.getenv("WEBSITE_URL") + " to change your settings and add shares.", pUser_id=p_user_id)
bot.send_message(chat_id=p_user_id, text=my_update_message, parse_mode="MARKDOWNV2")
else:
send_to_user("No shares found for your account. Check " + os.getenv("WEBSITE_URL") + " to change your settings and add shares.", pUser_id=p_user_id)
if len(shares) != 0: # Send updates on watchlist shares if existing if len(shares) != 0: # Send updates on watchlist shares if existing
send_to_user("Your watchlist shares:", pUser_id=p_user_id) send_to_user("Your watchlist shares:", pUser_id=p_user_id)