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.

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

Implant web proxy support #1556

Merged
merged 6 commits into from
Mar 14, 2024
Merged

Implant web proxy support #1556

merged 6 commits into from
Mar 14, 2024

Conversation

ItzMiracleOwO
Copy link

Migrate from #1554
(Sorry for multiple PRs, I had to resolve the conflicts)

Modified OkHttpClient to implent a web proxy method that is already wanted since #409

I only modified configs for zh and en, because I do not recognize other languages.

Copy link
Member

@Vankka Vankka left a comment

Choose a reason for hiding this comment

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

Thank you for your PR and sorry about the late response, there are some problems listed below that need to be addressed before this can be merged

src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/resources/config/en.yml Outdated Show resolved Hide resolved
src/main/resources/config/en.yml Outdated Show resolved Hide resolved
src/main/resources/config/en.yml Outdated Show resolved Hide resolved
@ItzMiracleOwO
Copy link
Author

Thanks for the reply, it has been a while before the PR has been created, please wait for me to resolve the conflicts and fix the issues.

@ItzMiracleOwO
Copy link
Author

@Vankka Hi. Please check the new codes

Copy link
Member

@granny granny left a comment

Choose a reason for hiding this comment

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

I probably missed something since the comments are squished together.

You still need to include the config options in all the other config files. Don't worry about translating them, you can just copy the english translation across them all.

src/main/resources/config/zh.yml Outdated Show resolved Hide resolved
src/main/resources/config/en.yml Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
@ItzMiracleOwO
Copy link
Author

@granny Issue resolved, please check

@granny granny changed the title Implenting web proxy Add web proxy configuration Dec 25, 2023
Copy link
Member

@granny granny left a comment

Choose a reason for hiding this comment

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

Just a few more things. The english translation of the comment can be changed if you think of a better way to word it.

It would probably be a good idea to add debug lines stating something along the lines of "using proxy for Discord".

src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/java/github/scarsz/discordsrv/DiscordSRV.java Outdated Show resolved Hide resolved
src/main/resources/config/en.yml Show resolved Hide resolved
@ItzMiracleOwO
Copy link
Author

@granny work done, also I attempted to fix the failed build due to error

image

@ItzMiracleOwO
Copy link
Author

Synced develope branch changes to patch-1

@ItzMiracleOwO ItzMiracleOwO changed the title Add web proxy configuration Implant web proxy support Dec 26, 2023
@ItzMiracleOwO
Copy link
Author

Anyone still aware of the PR?

@granny
Copy link
Member

granny commented Mar 14, 2024

Thank you for your PR!

@granny granny merged commit 338f384 into DiscordSRV:develop Mar 14, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants