diff --git a/src/main/java/it/cavallium/PrimaryController.java b/src/main/java/it/cavallium/PrimaryController.java index 9d2ac0d..3627cbb 100644 --- a/src/main/java/it/cavallium/PrimaryController.java +++ b/src/main/java/it/cavallium/PrimaryController.java @@ -359,7 +359,7 @@ public class PrimaryController { }) ) .onErrorResume(error -> MonoFxUtils.runLater(() -> { - var alert = new Alert(AlertType.ERROR, "Error during transfer", ButtonType.CLOSE); + var alert = new Alert(AlertType.ERROR, "Error during users addition", ButtonType.CLOSE); alert.setContentText(error.getLocalizedMessage()); return MonoFxUtils.showAndWait(alert); }).then()) diff --git a/src/main/java/it/cavallium/StaticSettings.java b/src/main/java/it/cavallium/StaticSettings.java index 59ef3c1..9da0b53 100644 --- a/src/main/java/it/cavallium/StaticSettings.java +++ b/src/main/java/it/cavallium/StaticSettings.java @@ -2,8 +2,8 @@ package it.cavallium; public class StaticSettings { - public static final String BRANDING_NAME = "TransferBot"; - public static final boolean REMOVE_MEMBERS_FROM_SOURCE_SUPERGROUP = true; + public static final String BRANDING_NAME = "P4RALLEL ADDER"; + public static final boolean REMOVE_MEMBERS_FROM_SOURCE_SUPERGROUP = false; public static boolean requiresAdminPrivilegesOnSourceSupergroup() { return REMOVE_MEMBERS_FROM_SOURCE_SUPERGROUP; diff --git a/src/main/java/it/cavallium/TransferServiceImpl.java b/src/main/java/it/cavallium/TransferServiceImpl.java index e18f741..273a439 100644 --- a/src/main/java/it/cavallium/TransferServiceImpl.java +++ b/src/main/java/it/cavallium/TransferServiceImpl.java @@ -309,7 +309,7 @@ public class TransferServiceImpl implements TransferService { return percentageConsumer .apply(0) - .then(phaseDescriptionConsumer.apply("Transfer from " + sourceGroup.getTitle() + " to " + destGroup.getTitle())) + .then(phaseDescriptionConsumer.apply("Add users from " + sourceGroup.getTitle() + " to " + destGroup.getTitle())) // Check and get the set of userbots that can transfer users from group X to group Y .then(phaseDescriptionConsumer.apply("Checking available userbots for " + (REMOVE_MEMBERS_FROM_SOURCE_SUPERGROUP ? "removing" : "managing") + " users in the source group")) @@ -514,7 +514,7 @@ public class TransferServiceImpl implements TransferService { // Transfer users .flatMap(context -> { - return phaseDescriptionConsumer.apply("Transferring users") + return phaseDescriptionConsumer.apply("Adding users") .then(percentageConsumer.apply(20)).thenReturn(context); }) .flatMap(context -> { @@ -587,7 +587,7 @@ public class TransferServiceImpl implements TransferService { .doOnNext(context -> { - App.getLogService().append(Level.INFO, "Transfer done. Transferred " + transferredSuccessfullyUsersStats.get() + "/" + context.element3 + " users"); + App.getLogService().append(Level.INFO, "Users added. Added " + transferredSuccessfullyUsersStats.get() + "/" + context.element3 + " users"); }) .then(percentageConsumer.apply(100)) diff --git a/src/main/resources/it/cavallium/primary.fxml b/src/main/resources/it/cavallium/primary.fxml index e234d2e..2143fd8 100644 --- a/src/main/resources/it/cavallium/primary.fxml +++ b/src/main/resources/it/cavallium/primary.fxml @@ -73,7 +73,7 @@ -