Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-909 Resolve auto-message issues with database query, and message ordering. #909

Merged
merged 1 commit into from
Feb 13, 2025
Merged

GH-909 Resolve auto-message issues with database query, and message ordering. #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...lcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.eternalcode.annotations.scan.command.DescriptionDocs;
import com.eternalcode.core.injector.annotations.Inject;
import com.eternalcode.core.notice.NoticeService;
import dev.rollczi.litecommands.annotations.command.Command;
import dev.rollczi.litecommands.annotations.context.Context;
import dev.rollczi.litecommands.annotations.execute.Execute;
import dev.rollczi.litecommands.annotations.permission.Permission;
import dev.rollczi.litecommands.annotations.command.Command;
import org.bukkit.entity.Player;

@Command(name = "automessage", aliases = { "automsg" })
Expand Down
56 changes: 14 additions & 42 deletions .../src/main/java/com/eternalcode/core/feature/automessage/AutoMessageRepositoryOrmLite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@
import com.eternalcode.core.database.wrapper.AbstractRepositoryOrmLite;
import com.eternalcode.core.injector.annotations.Inject;
import com.eternalcode.core.injector.annotations.component.Repository;
import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.stmt.Where;
import com.j256.ormlite.table.DatabaseTable;
import com.j256.ormlite.table.TableUtils;
import java.sql.SQLException;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
Expand All @@ -24,7 +21,7 @@ class AutoMessageRepositoryOrmLite extends AbstractRepositoryOrmLite implements
@Inject
private AutoMessageRepositoryOrmLite(DatabaseManager databaseManager, Scheduler scheduler) throws SQLException {
super(databaseManager, scheduler);
TableUtils.createTableIfNotExists(databaseManager.connectionSource(), AutoMessageIgnoreWrapper.class);
TableUtils.createTableIfNotExists(databaseManager.connectionSource(), AutoMessageTable.class);
}

@Override
Expand All @@ -33,16 +30,11 @@ public CompletableFuture<Set<UUID>> findReceivers(Set<UUID> onlineUniqueIds) {
return CompletableFuture.completedFuture(onlineUniqueIds);
}

CompletableFuture<List<AutoMessageIgnoreWrapper>> wrapperList =
this.action(AutoMessageIgnoreWrapper.class, dao -> {
Where<AutoMessageIgnoreWrapper, Object> where = dao.queryBuilder().where();

for (UUID onlineUniqueId : onlineUniqueIds) {
where.eq("unique_id", onlineUniqueId);
}

where.or(onlineUniqueIds.size());

CompletableFuture<List<AutoMessageTable>> wrapperList =
this.action(
AutoMessageTable.class, dao -> {
Where<AutoMessageTable, Object> where = dao.queryBuilder().where();
where.in("unique_id", onlineUniqueIds);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jak to działą to mergujemy ^

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, all is tested

return where.query();
});

Expand All @@ -51,47 +43,27 @@ public CompletableFuture<Set<UUID>> findReceivers(Set<UUID> onlineUniqueIds) {
.map(wrapper -> wrapper.uniqueId)
.collect(Collectors.toSet());

Set<UUID> onlineUniqueIdsWithoutIgnores = new HashSet<>();

for (UUID onlineUniqueId : onlineUniqueIds) {
if (!ignoredIds.contains(onlineUniqueId)) {
onlineUniqueIdsWithoutIgnores.add(onlineUniqueId);
}
}

return onlineUniqueIdsWithoutIgnores;
return onlineUniqueIds.stream()
.filter(onlineUniqueId -> !ignoredIds.contains(onlineUniqueId))
.collect(Collectors.toSet());
});
}

@Override
public CompletableFuture<Boolean> isReceiving(UUID uniqueId) {
return this.selectSafe(AutoMessageIgnoreWrapper.class, uniqueId).thenApply(Optional::isEmpty);
return this.selectSafe(AutoMessageTable.class, uniqueId).thenApply(Optional::isEmpty);
}

@Override
public CompletableFuture<Boolean> switchReceiving(UUID uniqueId) {
return this.selectSafe(AutoMessageIgnoreWrapper.class, uniqueId).thenCompose(optional -> {
return this.selectSafe(AutoMessageTable.class, uniqueId).thenCompose(optional -> {
if (optional.isEmpty()) {
return this.save(AutoMessageIgnoreWrapper.class, new AutoMessageIgnoreWrapper(uniqueId))
return this.save(AutoMessageTable.class, new AutoMessageTable(uniqueId))
.thenApply(result -> false);
}

AutoMessageIgnoreWrapper wrapper = optional.get();

return this.delete(AutoMessageIgnoreWrapper.class, wrapper).thenApply(state -> true);
AutoMessageTable wrapper = optional.get();
return this.delete(AutoMessageTable.class, wrapper).thenApply(state -> true);
});
}

@DatabaseTable(tableName = "eternal_core_auto_message_ignore")
private static class AutoMessageIgnoreWrapper {

@DatabaseField(columnName = "unique_id", id = true)
UUID uniqueId;

AutoMessageIgnoreWrapper() {}

AutoMessageIgnoreWrapper(UUID uniqueId) {
this.uniqueId = uniqueId;
}
}
}
23 changes: 10 additions & 13 deletions ...lcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.eternalcode.core.feature.automessage;

import com.eternalcode.annotations.scan.feature.FeatureDocs;
import com.eternalcode.commons.RandomElementUtil;
import com.eternalcode.commons.scheduler.Scheduler;
import com.eternalcode.core.configuration.implementation.PluginConfiguration;
import com.eternalcode.core.feature.automessage.messages.AutoMessageMessages;
import com.eternalcode.core.injector.annotations.Inject;
import com.eternalcode.core.injector.annotations.component.Service;
import com.eternalcode.core.notice.NoticeService;
import com.eternalcode.core.feature.automessage.messages.AutoMessageMessages;
import com.eternalcode.multification.notice.Notice;
import java.util.Collection;
import java.util.Optional;
Expand All @@ -19,7 +18,6 @@
import org.bukkit.Server;
import org.bukkit.entity.Entity;

@FeatureDocs(name = "AutoMessage", description = "Automatically sends messages to players at a given time interval.")
@Service
class AutoMessageService {

Expand Down Expand Up @@ -55,6 +53,15 @@ CompletableFuture<Boolean> switchReceiving(UUID uniqueId) {
return this.repository.switchReceiving(uniqueId);
}

private void tick() {
this.scheduler.timerAsync(
() -> {
if (this.settings.enabled()) {
this.broadcastNextMessage();
}
}, this.settings.interval(), this.settings.interval());
}

public void broadcastNextMessage() {
Set<UUID> onlineUniqueIds = this.server.getOnlinePlayers().stream()
.map(Entity::getUniqueId)
Expand All @@ -76,15 +83,6 @@ public void broadcastNextMessage() {
.send();
});
}

private void tick() {
this.scheduler.runLaterAsync(this::tick, this.settings.interval());

if (this.settings.enabled()) {
this.broadcastNextMessage();
}
}

private Optional<Notice> nextAutoMessage(AutoMessageMessages messageSection) {
Collection<Notice> messages = messageSection.messages();

Expand All @@ -97,7 +95,6 @@ private Optional<Notice> nextAutoMessage(AutoMessageMessages messageSection) {
}

int index = this.broadcastCount.getAndIncrement() % messages.size();

return messages.stream().skip(index).findFirst();
}
}
18 changes: 18 additions & 0 deletions ...nalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.eternalcode.core.feature.automessage;

import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
import java.util.UUID;

@DatabaseTable(tableName = "eternal_core_auto_message_ignore")
class AutoMessageTable {

@DatabaseField(columnName = "unique_id", id = true)
UUID uniqueId;

AutoMessageTable() {}

AutoMessageTable(UUID uniqueId) {
this.uniqueId = uniqueId;
}
}
2 changes: 1 addition & 1 deletion ...rc/main/java/com/eternalcode/core/feature/automessage/messages/ENAutoMessageMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class ENAutoMessageMessages implements AutoMessageMessages {

@Description({
"",
"# If you want to useplaceholder %server_online% you need to install",
"# If you want to use placeholder %server_online% you need to install",
"# PlaceholderAPI plugin and download placeholders for Server",
"# like /papi ecloud download Server",
})
Expand Down