Skip to content

Commit

Permalink
Add TELEGRAM_BOT_TOKEN variable to settings
Browse files Browse the repository at this point in the history
  • Loading branch information
EXG1O committed Sep 16, 2024
1 parent 7ae421f commit d1b562c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ jobs:
- name: Create .env file
run: |
echo "FRONTEND_PATH=" > .env
echo "TELEGRAM_BOT_TOKEN=" > .env
echo "FRONTEND_PATH=" >> .env
echo "POSTGRESQL_DATABASE_NAME=github_action" >> .env
echo "POSTGRESQL_DATABASE_USER=github" >> .env
echo "POSTGRESQL_DATABASE_PASSWORD=password" >> .env
Expand Down
2 changes: 2 additions & 0 deletions constructor_telegram_bots/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
case __:
TEST = False

TELEGRAM_BOT_TOKEN: str = os.environ['TELEGRAM_BOT_TOKEN']

FRONTEND_PATH: str = os.environ['FRONTEND_PATH']

POSTGRESQL_DATABASE_NAME: str = os.environ['POSTGRESQL_DATABASE_NAME']
Expand Down
3 changes: 3 additions & 0 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ poetry install

SECRET_KEY=$(python -c "import secrets; print(secrets.token_hex(25))")

read -p "Enter Telegram bot API-token: " TELEGRAM_BOT_TOKEN
read -p "Enter PostgreSQL database name: " POSTGRESQL_DATABASE_NAME
read -p "Enter PostgreSQL database user: " POSTGRESQL_DATABASE_USER
read -p "Enter PostgreSQL database password: " POSTGRESQL_DATABASE_PASSWORD
Expand All @@ -14,6 +15,8 @@ cat << EOF > .env
SECRET_KEY=$SECRET_KEY
DEBUG=True
TELEGRAM_BOT_TOKEN=$TELEGRAM_BOT_TOKEN
FRONTEND_PATH=$PWD/frontend/dist
POSTGRESQL_DATABASE_NAME=$POSTGRESQL_DATABASE_NAME
Expand Down
4 changes: 1 addition & 3 deletions users/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@ def login_url(self) -> str:

def get_telegram_user(self) -> Chat | None:
response: Response = requests.get(
# FIXME: The TELEGRAM_BOT_TOKEN parameter is no longer available in the settings.
# f'https://api.telegram.org/bot{settings.TELEGRAM_BOT_TOKEN}/getChat',
'https://api.telegram.org/bot123456789/getChat',
f'https://api.telegram.org/bot{settings.TELEGRAM_BOT_TOKEN}/getChat',
{'chat_id': self.telegram_id},
)

Expand Down

0 comments on commit d1b562c

Please sign in to comment.