From 4d77052edfa6840199845b0290a89678e18c469e Mon Sep 17 00:00:00 2001 From: Aleksei Gryczewski Date: Thu, 10 Jun 2021 05:45:27 -0400 Subject: [PATCH 1/5] Fix database init location --- .../java/dev/salmonllama/fsbot/database/DatabaseProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java b/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java index a210b94..9ef4c5d 100644 --- a/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java +++ b/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java @@ -11,6 +11,7 @@ import dev.salmonllama.fsbot.config.BotConfig; import dev.salmonllama.fsbot.utilities.Constants; import org.sqlite.javax.SQLiteConnectionPoolDataSource; +import java.nio.file.Paths; import java.sql.*; public class DatabaseProvider { @@ -20,7 +21,8 @@ public class DatabaseProvider { public DatabaseProvider(String dbName) { DB_NAME = dbName; - DB_ADDR = "jdbc:sqlite:".concat(Constants.BOT_FOLDER.toString()).concat(BotConfig.DB_ADDR); + String PATH = Paths.get(Constants.BOT_FOLDER.toString(), Constants.DB_NAME).toString(); + DB_ADDR = "jdbc:sqlite:".concat(PATH); } private Connection createConnection() { From ce46eaf3b3f30994ddc410add7ff9227bcb0b42f Mon Sep 17 00:00:00 2001 From: Aleksei Gryczewski Date: Fri, 22 Apr 2022 10:37:58 -0400 Subject: [PATCH 2/5] Added a method to get sorta-UUIDs quickly. --- .../dev/salmonllama/fsbot/services/IdService.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/dev/salmonllama/fsbot/services/IdService.java diff --git a/src/main/java/dev/salmonllama/fsbot/services/IdService.java b/src/main/java/dev/salmonllama/fsbot/services/IdService.java new file mode 100644 index 0000000..7511931 --- /dev/null +++ b/src/main/java/dev/salmonllama/fsbot/services/IdService.java @@ -0,0 +1,14 @@ +package dev.salmonllama.fsbot.services; + +import java.util.UUID; + +public class IdService { + + public String generateShort() { + return UUID.randomUUID().toString().split("-")[0]; + } + + public String generate() { + return UUID.randomUUID().toString(); + } +} From e85f50053ef4ebba49463321d039a561d0ba674c Mon Sep 17 00:00:00 2001 From: Aleksei Gryczewski Date: Fri, 22 Apr 2022 15:29:04 -0400 Subject: [PATCH 3/5] Remodel color roles --- .../fsbot/database/models/ColorRole.java | 65 ------------------- .../fsbot/database/models/Role.java | 36 ++++++++++ .../fsbot/database/models/RoleGroup.java | 15 +++++ 3 files changed, 51 insertions(+), 65 deletions(-) delete mode 100644 src/main/java/dev/salmonllama/fsbot/database/models/ColorRole.java create mode 100644 src/main/java/dev/salmonllama/fsbot/database/models/Role.java create mode 100644 src/main/java/dev/salmonllama/fsbot/database/models/RoleGroup.java diff --git a/src/main/java/dev/salmonllama/fsbot/database/models/ColorRole.java b/src/main/java/dev/salmonllama/fsbot/database/models/ColorRole.java deleted file mode 100644 index cd2810a..0000000 --- a/src/main/java/dev/salmonllama/fsbot/database/models/ColorRole.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2020. Aleksei Gryczewski - * All rights reserved. - */ - -package dev.salmonllama.fsbot.database.models; - -import dev.salmonllama.fsbot.database.DatabaseModel; - -public class ColorRole extends DatabaseModel { - private final long roleId; - private final long serverId; - private final String color; - - public ColorRole(ColorRoleBuilder builder) { - roleId = builder.roleId; - serverId = builder.serverId; - color = builder.color; - } - - public long getRoleId() { - return roleId; - } - - public long getServerId() { - return serverId; - } - - public String getColor() { - return color; - } - - public static String schema() { - return "CREATE TABLE IF NOT EXISTS color_roles (role_id INTEGER, server_id INTEGER, color TEXT)"; - } - - @Override - public String toString() { - return String.format("Color Role: {roleId: %d, serverId: %d, color: %s", roleId, serverId, color); - } - - public static class ColorRoleBuilder { - private final long roleId; - private long serverId; - private String color; - - public ColorRoleBuilder(long roleId) { - this.roleId = roleId; - } - - public ColorRoleBuilder setServerId(long serverId) { - this.serverId = serverId; - return this; - } - - public ColorRoleBuilder setColor(String color) { - this.color = color; - return this; - } - - public ColorRole build() { - return new ColorRole(this); - } - } -} diff --git a/src/main/java/dev/salmonllama/fsbot/database/models/Role.java b/src/main/java/dev/salmonllama/fsbot/database/models/Role.java new file mode 100644 index 0000000..e310fb5 --- /dev/null +++ b/src/main/java/dev/salmonllama/fsbot/database/models/Role.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2020. Aleksei Gryczewski + * All rights reserved. + */ + +package dev.salmonllama.fsbot.database.models; + +import dev.salmonllama.fsbot.database.DatabaseModel; + +public class Role extends DatabaseModel { + public String roleId; + public String serverId; + public String color; + public String groupId; + + public Role( + String roleId, + String serverId, + String color, + String groupId + ) { + this.roleId = roleId; + this.serverId = serverId; + this.color = color; + this.groupId = groupId; + } + + public static String schema() { + return "CREATE TABLE IF NOT EXISTS color_roles (role_id TEXT, server_id TEXT, color TEXT, group_id TEXT)"; + } + + @Override + public String toString() { + return String.format("Color Role: {roleId: %s, serverId: %s, color: %s, groupId: %s}", roleId, serverId, color, groupId); + } +} diff --git a/src/main/java/dev/salmonllama/fsbot/database/models/RoleGroup.java b/src/main/java/dev/salmonllama/fsbot/database/models/RoleGroup.java new file mode 100644 index 0000000..1ac12d5 --- /dev/null +++ b/src/main/java/dev/salmonllama/fsbot/database/models/RoleGroup.java @@ -0,0 +1,15 @@ +package dev.salmonllama.fsbot.database.models; + +import dev.salmonllama.fsbot.database.DatabaseModel; +import dev.salmonllama.fsbot.services.IdService; + +public class RoleGroup extends DatabaseModel { + public final String id; + public String messageId; + public String name; + public String requiredRole; + + public RoleGroup() { + this.id = IdService.generateShort(); + } +} From 32bc34c798d9a69a52d4ac6e28eebcc0304cc062 Mon Sep 17 00:00:00 2001 From: Aleksei Gryczewski Date: Fri, 22 Apr 2022 15:29:20 -0400 Subject: [PATCH 4/5] Make static --- src/main/java/dev/salmonllama/fsbot/services/IdService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/salmonllama/fsbot/services/IdService.java b/src/main/java/dev/salmonllama/fsbot/services/IdService.java index 7511931..6c90768 100644 --- a/src/main/java/dev/salmonllama/fsbot/services/IdService.java +++ b/src/main/java/dev/salmonllama/fsbot/services/IdService.java @@ -4,11 +4,11 @@ import java.util.UUID; public class IdService { - public String generateShort() { + public static String generateShort() { return UUID.randomUUID().toString().split("-")[0]; } - public String generate() { + public static String generate() { return UUID.randomUUID().toString(); } } From 7373d60d3654adcc532b94f627601dc8edb44b62 Mon Sep 17 00:00:00 2001 From: Aleksei Gryczewski Date: Fri, 22 Apr 2022 15:37:25 -0400 Subject: [PATCH 5/5] Update the Github Actions version --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 12cef61..ebdb8ce 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.11 + - name: Set up JDK 1.14 uses: actions/setup-java@v1 with: - java-version: 1.11 + java-version: 1.14 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle