Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Added option to connect via MTProxy. #344

Merged
merged 4 commits into from Aug 10, 2019
Merged

Added option to connect via MTProxy. #344

merged 4 commits into from Aug 10, 2019

Conversation

sot-tech
Copy link
Contributor

Telethon can connect to telegram via MTPRoxy, but there was not such code and option in bridge.
Added some king of crutch to support MTProxy.

tulir
tulir requested changes Jul 19, 2019
View reviewed changes
Copy link
Member

@tulir tulir left a comment

Choose a reason for hiding this comment

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

The config is a bit hacky, but I guess it's fine for now. I'll probably refactor it later. That import needs to be fixed now though

mautrix_telegram/abstract_user.py Outdated Show resolved Hide resolved
sot-tech
sot-tech commented Jul 19, 2019
View reviewed changes
Copy link
Contributor Author

@sot-tech sot-tech left a comment

Choose a reason for hiding this comment

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

Moved import of connection types to the top.
For the better look, i think it's better to change _proxy_settings to return something like

Tuple[telethon.network.Connection, Tuple[int, str, str, str, str, str]]

I'm not good at python =/

@sot-tech
Minor change
01a58ad 
changed _proxy_settings return value(s)
@tulir tulir merged commit 01a58ad into mautrix:master Aug 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tulir tulir tulir requested changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sot-tech @tulir