Skip to content

Telegram v2 #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 41 commits into from
Feb 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
12cc75c
Minor changes
leddcode Jan 20, 2021
f5f29c0
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
leddcode Jan 20, 2021
a7793c3
Add telegram client
leddcode Jan 21, 2021
bfe2ceb
Apply merge changes
leddcode Jan 21, 2021
7af4147
Minor fixes
leddcode Jan 21, 2021
8433c4a
Minor fixes
leddcode Jan 21, 2021
091db8e
Create FastAPI Settings object
leddcode Jan 22, 2021
8e93a36
Use status code names in telegram tests
leddcode Jan 22, 2021
b8d0cba
Use status code names in telegram tests
leddcode Jan 22, 2021
198e4d6
Add Asynchronous Testing and Increase Code Coverage.
leddcode Jan 23, 2021
3fc9d49
Added keyboards, handlers and tests. Updated telegram models.
leddcode Jan 23, 2021
798a72f
Update tests.
leddcode Jan 24, 2021
3078682
Minor fixes.
leddcode Jan 24, 2021
94a8c01
Add test bot client with registered user
leddcode Jan 24, 2021
b0bc592
Minor fix
leddcode Jan 24, 2021
de2995c
Make telegram bot working async. Add async fixture and tests.
leddcode Jan 24, 2021
e618089
Resolve conflict on merge
leddcode Jan 25, 2021
2122222
Add telegram tests
leddcode Jan 25, 2021
c1d309a
Make request.post works asynchronous
leddcode Jan 27, 2021
8795a7b
Merge updates
leddcode Jan 27, 2021
a5b4a6f
Minor change
leddcode Jan 27, 2021
08e65de
Merge updates to telegram
leddcode Jan 29, 2021
6229fc0
Add an ability to create events on telegram
leddcode Jan 31, 2021
f86f5a1
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
leddcode Jan 31, 2021
245c0c0
Merge updates from develop
leddcode Jan 31, 2021
316c3ab
Test creating new events
leddcode Jan 31, 2021
5dcc8ac
Minor fix
leddcode Jan 31, 2021
2bc356a
Merge changes
leddcode Feb 1, 2021
68d75d2
Splitting to functions
leddcode Feb 1, 2021
a9d8205
Merge updates
leddcode Feb 2, 2021
28fe8e8
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
leddcode Feb 5, 2021
2ff5de3
Minor changes
leddcode Feb 5, 2021
2a20efc
Merge changes
leddcode Feb 6, 2021
2086e56
Set and drop webhook asynchronously
leddcode Feb 7, 2021
73cb88c
Merge requirements.txt
leddcode Feb 7, 2021
1137770
Merge requirements.txt
leddcode Feb 7, 2021
498ef67
Minor fix
leddcode Feb 7, 2021
68e5c92
Merge
leddcode Feb 20, 2021
87e069b
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
leddcode Feb 20, 2021
ad43971
Change telegram bot url
leddcode Feb 20, 2021
5b6b73b
Minor fix
leddcode Feb 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/config.py.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ from starlette.templating import Jinja2Templates


class Settings(BaseSettings):
app_name: str = "PyLander"
app_name: str = "PyLendar"
bot_api: str = "BOT_API"
webhook_url: str = "WEBHOOK_URL"

Expand Down
Binary file removed app/media/user1.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<ul class="list-group">
{% if not user.telegram_id %}
<li class="list-group-item list-group-item-action no-border">
<a class="text-decoration-none text-success" href="https://t.me/pylander_bot" target="_blank">
<strong>Try PyLander bot</strong>
<a class="text-decoration-none text-success" href="https://t.me/pylendar_bot" target="_blank">
<strong>Try PyLendar bot</strong>
</a>
</li>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,4 @@ win32-setctime==1.0.3
word-forms==2.1.0
wsproto==1.0.0
yapf==0.30.0
zipp==3.4.0
zipp==3.4.0
2 changes: 1 addition & 1 deletion tests/test_a_telegram_asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ async def test_user_not_registered(telegram_client):
assert response.status_code == status.HTTP_200_OK

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prefer response.ok

assert b'Hello, Moshe!' in response.content
assert b'To use PyLendar Bot you have to register' \

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we shouldn't use \ for line breaks.

in response.content
in response.content

@staticmethod
@pytest.mark.asyncio
Expand Down