Skip to content

Commit

Permalink
Removed private messaging player's discord
Browse files Browse the repository at this point in the history
  • Loading branch information
@thejames10
thejames10 committed Jan 12, 2022
1 parent ceb63b7 commit 8da8a21
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 30 deletions.
Binary file modified server/plugins/TownyDiscordChat.jar
View file
Binary file not shown.
58 changes: 29 additions & 29 deletions src/main/java/com/TownyDiscordChat/TownyDiscordChat/TDCManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,39 +109,39 @@ public static final void discordUserRoleCheck(String discordId, UUID UUID) {

if (!hasTown & !hasNation & !hasTownDiscordRole & !hasNationDiscordRole) {
// Do nothing
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleDoNothingSuccess() + "[1]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleDoNothingSuccess() + "[1]");
} else if (!hasTown & !hasNation & !hasTownDiscordRole & hasNationDiscordRole) {
// remove nation role
for (Role memberNationRole : memberNationRoles) {
guild.removeRoleFromMember(discordId, memberNationRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [2]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [2]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [2]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [2]");
});
}
} else if (!hasTown & !hasNation & hasTownDiscordRole & !hasNationDiscordRole) {
// remove town role
for (Role memberTownRole : memberTownRoles) {
guild.removeRoleFromMember(discordId, memberTownRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberTownRole.getName() + " [3]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberTownRole.getName() + " [3]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberTownRole.getName() + " [3]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberTownRole.getName() + " [3]");
});
}
} else if (!hasTown & !hasNation & hasTownDiscordRole & hasNationDiscordRole) {
// remove town and nation
for (Role memberTownRole : memberTownRoles) {
guild.removeRoleFromMember(discordId, memberTownRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberTownRole.getName() + " [4]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberTownRole.getName() + " [4]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberTownRole.getName() + " [4]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberTownRole.getName() + " [4]");
});
}
for (Role memberNationRole : memberNationRoles) {
guild.removeRoleFromMember(discordId, memberNationRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [4]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [4]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [4]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [4]");
});
}
} else if (!hasTown & hasNation & !hasTownDiscordRole & !hasNationDiscordRole) {
Expand All @@ -157,91 +157,91 @@ public static final void discordUserRoleCheck(String discordId, UUID UUID) {
// remove town role
for (Role memberTownRole : memberTownRoles) {
guild.removeRoleFromMember(discordId, memberTownRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberTownRole.getName() + " [8]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberTownRole.getName() + " [8]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberTownRole.getName() + " [8]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberTownRole.getName() + " [8]");
});
}
} else if (hasTown & !hasNation & !hasTownDiscordRole & !hasNationDiscordRole) {
// add town role
memberTownRoles.add(guild.getRolesByName("town-" + town.getName(), true).get(0));
for (Role memberTownRole : memberTownRoles) {
guild.addRoleToMember(discordId, memberTownRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [9]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [9]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [9]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [9]");
});
}
} else if (hasTown & !hasNation & !hasTownDiscordRole & hasNationDiscordRole) {
// add town role and remove nation role
memberTownRoles.add(guild.getRolesByName("town-" + town.getName(), true).get(0));
for (Role memberTownRole : memberTownRoles) {
guild.addRoleToMember(discordId, memberTownRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [10]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [10]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [10]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [10]");
});
}
for (Role memberNationRole : memberNationRoles) {
guild.removeRoleFromMember(discordId, memberNationRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [10]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [10]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [10]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [10]");
});
}
} else if (hasTown & !hasNation & hasTownDiscordRole & !hasNationDiscordRole) {
// Do nothing - player already has required discord roles
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleDoNothingSuccess() + " [11]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleDoNothingSuccess() + " [11]");
} else if (hasTown & !hasNation & hasTownDiscordRole & hasNationDiscordRole) {
// remove nation role
for (Role memberNationRole : memberNationRoles) {
guild.removeRoleFromMember(discordId, memberNationRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [12]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveSuccess() + " " + memberNationRole.getName() + " [12]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [12]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleRemoveFailure() + " " + memberNationRole.getName() + " [12]");
});
}
} else if (hasTown & hasNation & !hasTownDiscordRole & !hasNationDiscordRole) {
// add town role and nation role
memberTownRoles.add(guild.getRolesByName("town-" + town.getName(), true).get(0));
for (Role memberTownRole : memberTownRoles) {
guild.addRoleToMember(discordId, memberTownRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [13]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [13]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [13]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [13]");
});
}
memberNationRoles.add(guild.getRolesByName("nation-" + nation.getName(), true).get(0));
for (Role memberNationRole : memberNationRoles) {
guild.addRoleToMember(discordId, memberNationRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberNationRole.getName() + " [13]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberNationRole.getName() + " [13]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberNationRole.getName() + " [13]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberNationRole.getName() + " [13]");
});
}
} else if (hasTown & hasNation & !hasTownDiscordRole & hasNationDiscordRole) {
// add town role
memberTownRoles.add(guild.getRolesByName("town-" + town.getName(), true).get(0));
for (Role memberTownRole : memberTownRoles) {
guild.addRoleToMember(discordId, memberTownRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [14]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberTownRole.getName() + " [14]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [14]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberTownRole.getName() + " [14]");
});
}
} else if (hasTown & hasNation & hasTownDiscordRole & !hasNationDiscordRole) {
// add nation role
memberNationRoles.add(guild.getRolesByName("nation-" + nation.getName(), true).get(0));
for (Role memberNationRole : memberNationRoles) {
guild.addRoleToMember(discordId, memberNationRole).queueAfter(10, TimeUnit.SECONDS, success -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberNationRole.getName() + " [15]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddSuccess() + " " + memberNationRole.getName() + " [15]");
}, failure -> {
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberNationRole.getName() + " [15]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleAddFailure() + " " + memberNationRole.getName() + " [15]");
});
}
} else if (hasTown & hasNation & hasTownDiscordRole & hasNationDiscordRole) {
// Do nothing - player already has required discord roles
TDCMessages.sendMessageToAll(UUID, TDCMessages.getConfigMsgRoleDoNothingSuccess() + " [16]");
TDCMessages.sendMessageToPlayerGameAndLog(UUID, TDCMessages.getConfigMsgRoleDoNothingSuccess() + " [16]");
}
}

Expand Down
16 changes: 15 additions & 1 deletion src/main/java/com/TownyDiscordChat/TownyDiscordChat/TDCMessages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,21 @@
public class TDCMessages {

/**
* Send message to game discord and log channel
* Send message to player's game and designated log channel
*
* @param UUID the associated minecraft player
* @param message the message
*/
public static void sendMessageToPlayerGameAndLog(UUID UUID, String message) {
Preconditions.checkNotNull(UUID);
Preconditions.checkNotNull(message);

sendMessageToPlayerGame(Bukkit.getOfflinePlayer(UUID), message);
sendMessageToDiscordLogChannel(UUID, message);
}

/**
* Send message to player's game, player's discord and designated log channel
*
* @param UUID the associated minecraft player
* @param message the message
Expand Down

0 comments on commit 8da8a21

Please sign in to comment.