mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-27 01:05:38 +00:00
Update Discord.java
stuff to disable or enable discord verification
This commit is contained in:
parent
4a3ce64412
commit
2037775276
@ -17,7 +17,7 @@ import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||
import me.totalfreedom.totalfreedommod.player.PlayerData;
|
||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||
import me.totalfreedom.totalfreedommod.admin.Admin;
|
||||
import me.totalfreedom.totalfreedommod.staff.StaffMember;
|
||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||
import net.dv8tion.jda.api.EmbedBuilder;
|
||||
@ -59,9 +59,17 @@ public class Discord extends FreedomService
|
||||
|
||||
public static JDA bot = null;
|
||||
public Boolean enabled = false;
|
||||
public Boolean enableBot = false;
|
||||
|
||||
public void startBot()
|
||||
|
||||
{
|
||||
enableBot = (ConfigEntry.DISCORD_VERIFICATION.getBoolean());
|
||||
if (enableBot == false)
|
||||
{
|
||||
FLog.info("Discord Verification has been manually disabled.");
|
||||
return;
|
||||
}
|
||||
enabled = !Strings.isNullOrEmpty(ConfigEntry.DISCORD_TOKEN.getString());
|
||||
if (!enabled)
|
||||
{
|
||||
@ -298,7 +306,7 @@ public class Discord extends FreedomService
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onPlayerJoin(PlayerJoinEvent event)
|
||||
{
|
||||
if (!plugin.al.isVanished(event.getPlayer().getName()))
|
||||
if (!plugin.sl.isVanished(event.getPlayer().getName()))
|
||||
{
|
||||
messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**");
|
||||
}
|
||||
@ -307,7 +315,7 @@ public class Discord extends FreedomService
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onPlayerLeave(PlayerQuitEvent event)
|
||||
{
|
||||
if (!plugin.al.isVanished(event.getPlayer().getName()))
|
||||
if (!plugin.sl.isVanished(event.getPlayer().getName()))
|
||||
{
|
||||
messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**");
|
||||
}
|
||||
@ -428,7 +436,7 @@ public class Discord extends FreedomService
|
||||
return true;
|
||||
}
|
||||
|
||||
public static boolean syncRoles(Admin admin, String discordID)
|
||||
public static boolean syncRoles(StaffMember staffMember, String discordID)
|
||||
{
|
||||
if (discordID == null)
|
||||
{
|
||||
@ -462,7 +470,7 @@ public class Discord extends FreedomService
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!admin.isActive())
|
||||
if (!staffMember.isActive())
|
||||
{
|
||||
if (member.getRoles().contains(adminRole))
|
||||
{
|
||||
@ -475,7 +483,7 @@ public class Discord extends FreedomService
|
||||
return true;
|
||||
}
|
||||
|
||||
if (admin.getRank().equals(Rank.ADMIN))
|
||||
if (staffMember.getRank().equals(Rank.ADMIN))
|
||||
{
|
||||
if (!member.getRoles().contains(adminRole))
|
||||
{
|
||||
@ -487,7 +495,7 @@ public class Discord extends FreedomService
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else if (admin.getRank().equals(Rank.SENIOR_ADMIN))
|
||||
else if (staffMember.getRank().equals(Rank.SENIOR_ADMIN))
|
||||
{
|
||||
if (!member.getRoles().contains(senioradminRole))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user