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

Discord Integration (Resolves #1833) #2170

Open
wants to merge 2 commits into
base: TFM1.13-Alpha
Choose a base branch
from
Open

Discord Integration (Resolves #1833) #2170

wants to merge 2 commits into from

Conversation

script-head
Copy link
Contributor

@script-head script-head commented Oct 9, 2018

Adds the ability to verify via discord account. This code is has been fully tested by me to the fullest extent possible.

Note: The Travis build failed due to the missing JDA dependancy that can be found at https://github.com/DV8FromTheWorld/JDA/releases

Also note: You will need my JDA jar to provide JDA to the server, found at https://github.com/ZeroEpoch1969/Minecraft-JDA/releases

Edit @Wild1145 - Resolves #1833

@CLAassistant
Copy link

CLAassistant commented Oct 9, 2018

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@Wild1145 Wild1145 left a comment

Choose a reason for hiding this comment

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

Will do a more in-depth review when the 1.12 branch is sorted and I've got to the 1.13 branch.

Admin admin = plugin.al.getAdmin(playerSender);
if (admin.getDiscordID() != null)
{
msg("Your Minecraft account is already linked to a Discord account.", ChatColor.RED);
Copy link
Member

Choose a reason for hiding this comment

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

What happens in the event you want to over-write your discord ID? I'd be inclined to allow it? OR at the very least we tell people on the command to un-link first?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unlink and re-link

Copy link
Member

Choose a reason for hiding this comment

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

@ZeroEpoch1969 Have players been confused around this before or just tend to get that they need to un-link and re-link?

else
{
Discord.VERIFY_CODES.remove(code);
FUtil.bcastMsg(playerSender.getName() + " has verified themself!", ChatColor.GOLD);
Copy link
Member

Choose a reason for hiding this comment

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

Could we word this something like "Has verified themselves through the Discord verification method" or something like that?

@Wild1145
Copy link
Member

CI Pipeline and testing is blocked by #2171 - Looks like an issue with TF-WorldEdit trying to use a super old Craftbukkit version which is no longer resolvable. The issue is fixed more or less with the 7.0.0-Snapshot of WorldEdit but haven't had much joy trying to merge the TF-WorldEdit into that version. As soon as the ticket for the build issues is closed I will put this through the pipeline and do some testing.

@Wild1145
Copy link
Member

I've re-ran the build after getting it working, it appears the dependency required for this PR is missing? It could be an old version or it could be that we don't have a repo with the dependency in.

@@ -117,6 +117,13 @@
<version>6.1.0-TF</version>
</dependency>

<dependency>
Copy link
Member

Choose a reason for hiding this comment

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

[ERROR] Failed to execute goal on project totalfreedom: Could not resolve dependencies for project me.totalfreedom:totalfreedom:jar:5.0.2: Failure to find net.dv8tion:JDA:jar:3.8.0_423 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced -> [Help 1]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants