fix transfer ownership send & accept

Author: zefir-git

src/main/java/pro/cloudnode/smp/bankaccounts/Account.java

@@ -29,6 +29,7 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 /**
  * Bank account
@@ -534,12 +535,12 @@ public final static class ChangeOwnerRequest {
         /**
          * Account id
          */
-        public final @NotNull String account;
+        private final @NotNull String account;
 
         /**
          * New owner UUID
          */
-        public final @NotNull UUID newOwner;
+        public final @NotNull OfflinePlayer newOwner;
 
         /**
          * Request creation timestamp
@@ -552,15 +553,15 @@ public final static class ChangeOwnerRequest {
          * @param account Account to transfer ownership of
          * @param newOwner The new account owner
          */
-        public ChangeOwnerRequest(final @NotNull Account account, final @NotNull UUID newOwner) {
+        public ChangeOwnerRequest(final @NotNull Account account, final @NotNull OfflinePlayer newOwner) {
             this.account = account.id;
             this.newOwner = newOwner;
             this.created = new Date();
         }
 
         private ChangeOwnerRequest(final @NotNull ResultSet rs) throws SQLException {
             this.account = rs.getString("id");
-            this.newOwner = UUID.fromString(rs.getString("new_owner"));
+            this.newOwner = BankAccounts.getInstance().getServer().getOfflinePlayer(UUID.fromString(rs.getString("new_owner")));
             this.created = new Date(rs.getDate("created").getTime());
         }
 
@@ -571,13 +572,6 @@ private ChangeOwnerRequest(final @NotNull ResultSet rs) throws SQLException {
             return Account.get(account);
         }
 
-        /**
-         * Get new owner
-         */
-        public @NotNull OfflinePlayer newOwner() {
-            return BankAccounts.getInstance().getServer().getOfflinePlayer(newOwner);
-        }
-
         /**
          * Check if request has expired
          */
@@ -595,7 +589,7 @@ public boolean confirm() {
             final @NotNull Optional<@NotNull Account> account = this.account();
             if (account.isEmpty()) return false;
             if (account.get().frozen) return false;
-            account.get().owner = newOwner();
+            account.get().owner = newOwner;
             account.get().update();
             this.delete();
             return true;
@@ -689,22 +683,46 @@ private static void deleteExpired() {
         }
 
         /**
-         * Get account ownership change requests
+         * List a player's incoming (received) account ownership change requests.
          *
-         * @param newOwner New owner
+         * @param player The player whose requests to list
          */
-        public static @NotNull Account @NotNull [] get(final @NotNull OfflinePlayer newOwner) {
+        public static @NotNull Account @NotNull [] incoming(final @NotNull OfflinePlayer player) {
             try (final @NotNull Connection conn = BankAccounts.getInstance().getDb().getConnection();
                  final @NotNull PreparedStatement stmt = conn.prepareStatement("SELECT * FROM `change_owner_requests` WHERE `new_owner` = ?")) {
-                stmt.setString(1, newOwner.getUniqueId().toString());
+                stmt.setString(1, player.getUniqueId().toString());
+                final @NotNull ResultSet rs = stmt.executeQuery();
+
+                final @NotNull List<@NotNull Account> accounts = new ArrayList<>();
+                while (rs.next()) accounts.add(new Account(rs));
+                return accounts.toArray(new Account[0]);
+            }
+            catch (final @NotNull Exception e) {
+                BankAccounts.getInstance().getLogger().log(Level.SEVERE, "Could not get incoming account ownership change requests. player: " + player.getUniqueId(), e);
+                return new Account[0];
+            }
+        }
+
+        /**
+         * List a player’s outgoing (sent) account ownership change requests.
+         *
+         * @param player The player whose requests to list
+         */
+        public static @NotNull Account @NotNull [] outgoing(final @NotNull OfflinePlayer player) {
+            final @NotNull String @NotNull [] ids = Arrays.stream(Account.get(player)).map(a -> a.id).toArray(String[]::new);
+            final @NotNull String placeholders = Arrays.stream(ids).map(id -> "?").collect(Collectors.joining(", "));
+            try (final @NotNull Connection conn = BankAccounts.getInstance().getDb().getConnection();
+                 final @NotNull PreparedStatement stmt = conn.prepareStatement("SELECT * FROM `change_owner_requests` WHERE `account` in (" + placeholders + ")")) {
+                for (int i = ids.length; i > 0;)
+                    stmt.setString(i, ids[--i]);
                 final @NotNull ResultSet rs = stmt.executeQuery();
 
                 final @NotNull List<@NotNull Account> accounts = new ArrayList<>();
                 while (rs.next()) accounts.add(new Account(rs));
                 return accounts.toArray(new Account[0]);
             }
             catch (final @NotNull Exception e) {
-                BankAccounts.getInstance().getLogger().log(Level.SEVERE, "Could not get account ownership change requests. newOwner: " + newOwner.getUniqueId(), e);
+                BankAccounts.getInstance().getLogger().log(Level.SEVERE, "Could not get outgoing account ownership change requests. player: " + player.getUniqueId(), e);
                 return new Account[0];
             }
         }

src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java

@@ -7,7 +7,6 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.Registry;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.enchantments.Enchantment;
@@ -239,16 +238,6 @@ public boolean instrumentsGlintEnabled() {
         return Objects.requireNonNull(Registry.ENCHANTMENT.get(NamespacedKey.minecraft(Objects.requireNonNull(config.getString("instruments.glint.enchantment")))));
     }
 
-    // change-owner.min-balance
-    public double changeOwnerMinBalance() {
-        return config.getDouble("change-owner.min-balance");
-    }
-
-    // change-owner.require-history
-    public boolean changeOwnerRequireHistory() {
-        return config.getBoolean("change-owner.require-history");
-    }
-
     // change-owner.confirm
     public boolean changeOwnerConfirm() {
         return config.getBoolean("change-owner.confirm");
@@ -259,6 +248,11 @@ public int changeOwnerTimeout() {
         return config.getInt("change-owner.timeout");
     }
 
+    // change-owner.limit-send
+    public int changeOwnerLimitSend() {
+        return config.getInt("change-owner.limit-send");
+    }
+
     // pos.allow-personal
     public boolean posAllowPersonal() {
         return config.getBoolean("pos.allow-personal");
@@ -786,42 +780,31 @@ public int invoiceNotifyInterval() {
     public @NotNull Component messagesErrorsPlayerNeverJoined() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.player-never-joined")));
     }
-    
-    // messages.errors.change-owner-balance
-    public @NotNull Component messagesErrorsChangeOwnerBalance(final @NotNull Account account, final @NotNull BigDecimal requiredBalance) {
+
+    // messages.errors.change-owner-same
+    public @NotNull Component messagesErrorsAlreadyOwnsAccount(final @NotNull Account account) {
         return MiniMessage.miniMessage().deserialize(
-                Objects.requireNonNull(config.getString("messages.errors.change-owner-balance"))
-                        .replace("<account>", account.name())
-                        .replace("<account-id>", account.id)
-                        .replace("<account-type>", account.type.getName())
-                        .replace("<account-owner>", account.ownerNameUnparsed())
-                        .replace("<balance>", account.balance == null ? "∞" : account.balance.toPlainString())
-                        .replace("<balance-formatted>", BankAccounts.formatCurrency(account.balance))
-                        .replace("<balance-short>", BankAccounts.formatCurrencyShort(account.balance))
-                        .replace("<required-balance>", requiredBalance.toPlainString())
-                        .replace("<required-balance-formatted>", BankAccounts.formatCurrency(requiredBalance))
-                        .replace("<required-balance-short>", BankAccounts.formatCurrencyShort(requiredBalance))
+                Objects.requireNonNull(config.getString("messages.errors.change-owner-same")),
+                Placeholder.parsed("player", account.ownerNameUnparsed())
         );
     }
 
-    // messages.errors.change-owner-no-history
-    public @NotNull Component messagesErrorsChangeOwnerNoHistory() {
-        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.change-owner-no-history")));
-    }
-
-    // messages.errors.already-owns-account
-    public @NotNull String messagesErrorsAlreadyOwnsAccount() {
-        return Objects.requireNonNull(config.getString("messages.errors.already-owns-account"));
+    // messages.errors.change-owner-limit-send
+    public @NotNull Component messagesErrorsChangeOwnerLimitSend() {
+        return MiniMessage.miniMessage().deserialize(
+                Objects.requireNonNull(config.getString("messages.errors.change-owner-limit-send")),
+                Placeholder.unparsed("limit", String.valueOf(this.changeOwnerLimitSend()))
+        );
     }
 
     // messages.errors.change-owner-not-found
-    public @NotNull String messagesErrorsChangeOwnerNotFound() {
-        return Objects.requireNonNull(config.getString("messages.errors.change-owner-not-found"));
+    public @NotNull Component messagesErrorsChangeOwnerNotFound() {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.change-owner-not-found")));
     }
 
     // messages.errors.change-owner-accept-failed
-    public @NotNull String messagesErrorsChangeOwnerAcceptFailed() {
-        return Objects.requireNonNull(config.getString("messages.errors.change-owner-accept-failed"));
+    public @NotNull Component messagesErrorsChangeOwnerAcceptFailed() {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.change-owner-accept-failed")));
     }
 
     // messages.errors.async-failed
@@ -1511,11 +1494,10 @@ public int invoiceNotifyInterval() {
     // messages.change-owner.request
     public @NotNull Component messagesChangeOwnerRequest(final @NotNull Account.ChangeOwnerRequest request, final @NotNull String acceptCommand) {
         final @NotNull Account account = request.account().orElse(new Account.ClosedAccount());
-        final @NotNull OfflinePlayer newOwner = request.newOwner();
         return MiniMessage.miniMessage().deserialize(
                 Objects.requireNonNull(config.getString("messages.change-owner.request"))
-                        .replace("<new-owner-uuid>", newOwner.getUniqueId().toString())
-                        .replace("<new-owner>", newOwner.getName() == null ? "<i>unknown player</i>" : newOwner.getName())
+                        .replace("<new-owner-uuid>", request.newOwner.getUniqueId().toString())
+                        .replace("<new-owner>", request.newOwner.getName() == null ? "<i>unknown player</i>" : request.newOwner.getName())
                         .replace("<accept-command>", acceptCommand)
                         .replace("<account>", account.name())
                         .replace("<account-id>", account.id)
@@ -1531,11 +1513,10 @@ public int invoiceNotifyInterval() {
     // messages.change-owner.sent
     public @NotNull Component messagesChangeOwnerSent(final @NotNull Account.ChangeOwnerRequest request) {
         final @NotNull Account account = request.account().orElse(new Account.ClosedAccount());
-        final @NotNull OfflinePlayer newOwner = request.newOwner();
         return MiniMessage.miniMessage().deserialize(
                 Objects.requireNonNull(config.getString("messages.change-owner.sent"))
-                        .replace("<new-owner-uuid>", newOwner.getUniqueId().toString())
-                        .replace("<new-owner>", newOwner.getName() == null ? "<i>unknown player</i>" : newOwner.getName())
+                        .replace("<new-owner-uuid>", request.newOwner.getUniqueId().toString())
+                        .replace("<new-owner>", request.newOwner.getName() == null ? "<i>unknown player</i>" : request.newOwner.getName())
                         .replace("<account>", account.name())
                         .replace("<account-id>", account.id)
                         .replace("<account-type>", account.type.getName())
@@ -1550,11 +1531,10 @@ public int invoiceNotifyInterval() {
     // messages.change-owner.accepted
     public @NotNull Component messagesChangeOwnerAccepted(final @NotNull Account.ChangeOwnerRequest request) {
         final @NotNull Account account = request.account().orElse(new Account.ClosedAccount());
-        final @NotNull OfflinePlayer newOwner = request.newOwner();
         return MiniMessage.miniMessage().deserialize(
                 Objects.requireNonNull(config.getString("messages.change-owner.accepted"))
-                        .replace("<new-owner-uuid>", newOwner.getUniqueId().toString())
-                        .replace("<new-owner>", newOwner.getName() == null ? "<i>unknown player</i>" : newOwner.getName())
+                        .replace("<new-owner-uuid>", request.newOwner.getUniqueId().toString())
+                        .replace("<new-owner>", request.newOwner.getName() == null ? "<i>unknown player</i>" : request.newOwner.getName())
                         .replace("<account>", account.name())
                         .replace("<account-id>", account.id)
                         .replace("<account-type>", account.type.getName())
@@ -1587,6 +1567,7 @@ public enum HelpCommandsBank {
         FREEZE("freeze"),
         UNFREEZE("unfreeze"),
         DELETE("delete"),
+        CHANGE_OWNER("change-owner"),
         INSTRUMENT("instrument"),
         WHOIS("whois"),
         BALTOP("baltop"),

src/main/java/pro/cloudnode/smp/bankaccounts/Permissions.java

@@ -16,7 +16,8 @@ public final class Permissions {
     public static final @NotNull String DELETE = "bank.delete";
     public static final @NotNull String CHANGE_OWNER = "bank.change.owner";
     public static final @NotNull String CHANGE_OWNER_OTHER = "bank.change.owner.other";
-    public static final @NotNull String CHANGE_OWNER_SKIP_CONFIRMATION = "bank.change.owner.skip-confirmation";
+    public static final @NotNull String CHANGE_OWNER_BYPASS_CONFIRM = "bank.change.owner.bypass.confirm";
+    public static final @NotNull String CHANGE_OWNER_BYPASS_LIMIT = "bank.change.owner.bypass.limit";
     public static final @NotNull String CHANGE_OWNER_ACCEPT = "bank.change.owner.accept";
     public static final @NotNull String BALTOP = "bank.baltop";
     public static final @NotNull String POS_CREATE = "bank.pos.create";