Altitude/proxydiscordlink
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add boolean for nicknames remove unneeded columns

Browse Source
This commit is contained in:
Teriuihi 2021-09-16 16:04:45 +02:00
parent d28aa77cc7
commit 899ddb8703
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/alttd/proxydiscordlink/database/Database.java
View File

@ -1,8 +1,6 @@
package com.alttd.proxydiscordlink.database; package com.alttd.proxydiscordlink.database;
import com.alttd.proxydiscordlink.bot.objects.DiscordRole;
import com.alttd.proxydiscordlink.objects.DiscordLinkPlayer; import com.alttd.proxydiscordlink.objects.DiscordLinkPlayer;
import com.alttd.proxydiscordlink.util.Utilities;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -18,12 +16,9 @@ public class Database {
String linked_accounts = "CREATE TABLE IF NOT EXISTS linked_accounts (" + String linked_accounts = "CREATE TABLE IF NOT EXISTS linked_accounts (" +
"player_uuid VARCHAR(36) NOT NULL, " + "player_uuid VARCHAR(36) NOT NULL, " +
"player_name VARCHAR(16) NOT NULL, " + "player_name VARCHAR(16) NOT NULL, " +
"player_nickname VARCHAR(16), " +
"player_rank VARCHAR(256), " +
"player_isdonor BIT NOT NULL, " +
"player_isnitro BIT NOT NULL, " +
"discord_username VARCHAR(256) NOT NULL, " + "discord_username VARCHAR(256) NOT NULL, " +
"discord_id VARCHAR(256) NOT NULL, " + "discord_id VARCHAR(256) NOT NULL, " +
"nickname BIT DEFAULT b0" +
"PRIMARY KEY(player_uuid)" + "PRIMARY KEY(player_uuid)" +
");"; ");";
String sync_roles = "CREATE TABLE IF NOT EXISTS account_roles (" + String sync_roles = "CREATE TABLE IF NOT EXISTS account_roles (" +
@ -53,11 +48,9 @@ public class Database {
public void syncPlayer(DiscordLinkPlayer player) { //TODO make discord_id unique public void syncPlayer(DiscordLinkPlayer player) { //TODO make discord_id unique
try { try {
String playerNickname = getNick(player.getUuid()); String playerNickname = getNick(player.getUuid());
String sql = "INSERT INTO updates " + String sql = "INSERT INTO linked_accounts " +
"VALUES (?, ?, ?, ?, ?, ?) " + "VALUES (?, ?, ?, ?) " +
"ON DUPLICATE KEY UPDATE player_name = ?" + "ON DUPLICATE KEY UPDATE player_name = ?" +
"ON DUPLICATE KEY UPDATE player_nickname = ?" +
"ON DUPLICATE KEY UPDATE player_rank = ?" +
"ON DUPLICATE KEY UPDATE discord_username = ?"; "ON DUPLICATE KEY UPDATE discord_username = ?";
PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql); PreparedStatement statement = DatabaseConnection.getConnection().prepareStatement(sql);
@ -65,13 +58,11 @@ public class Database {
statement.setString(1, player.getUuid().toString()); statement.setString(1, player.getUuid().toString());
statement.setString(2, player.getUsername()); statement.setString(2, player.getUsername());
statement.setString(3, playerNickname); statement.setString(3, playerNickname);
statement.setString(4, Utilities.getRankName(player.getUuid())); statement.setString(4, player.getDiscordUsername());
statement.setString(5, player.getDiscordUsername()); statement.setLong(5, player.getUserId());
statement.setLong(6, player.getUserId()); statement.setString(6, player.getUsername());
statement.setString(7, player.getUsername()); statement.setString(7, playerNickname);
statement.setString(8, playerNickname); statement.setString(8, player.getDiscordUsername());
statement.setString(9, Utilities.getRankName(player.getUuid()));
statement.setString(10, player.getDiscordUsername());
statement.execute(); statement.execute();
} catch (SQLException exception) { } catch (SQLException exception) {
@ -197,6 +188,7 @@ public class Database {
UUID.fromString(resultSet.getString("player_uuid")), UUID.fromString(resultSet.getString("player_uuid")),
resultSet.getString("player_name"), resultSet.getString("player_name"),
resultSet.getString("discord_username"), resultSet.getString("discord_username"),
resultSet.getInt("nickname") == 1,
new ArrayList<>() new ArrayList<>()
); );
addRoles(discordLinkPlayer); addRoles(discordLinkPlayer);