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.

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-870 Add /msgtoggle command #896

Merged
merged 30 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b5e54ad
Innit commit
CitralFlo Jan 12, 2025
ffd29c5
In progress: add messages, setup methods and commands
CitralFlo Jan 14, 2025
88a71f7
Merge branch 'refs/heads/master' into msgtoggle
CitralFlo Jan 17, 2025
43ea1b0
Add msgToggle repo, service, API and commands
CitralFlo Jan 17, 2025
f054dbd
Fix logic
CitralFlo Jan 17, 2025
2437624
Fix logic, rename messages
CitralFlo Jan 22, 2025
aa1ff47
Remove comments
CitralFlo Jan 22, 2025
6da3ddf
Delete duplicated message.
CitralFlo Jan 22, 2025
4a77643
Update eternalcore-api/src/main/java/com/eternalcode/core/feature/msg…
CitralFlo Jan 22, 2025
00e97d0
Delete duplicated message.
CitralFlo Jan 22, 2025
5291625
Merge remote-tracking branch 'origin/msgtoggle' into msgtoggle
CitralFlo Jan 22, 2025
a091a18
Fix coderabbit issue
CitralFlo Jan 22, 2025
b3dae93
Fix naming and logic.
CitralFlo Jan 28, 2025
97d5914
Merge branch 'master' into msgtoggle
CitralFlo Jan 28, 2025
76d85d9
Resolve @imDMK review
CitralFlo Jan 28, 2025
df9b84f
Add comments to api
CitralFlo Jan 28, 2025
4709133
Resolve Rollcz's review
CitralFlo Jan 28, 2025
450813c
Resolve coderabbit review
CitralFlo Jan 28, 2025
f22fe08
Update README.md
CitralFlo Jan 30, 2025
98cb286
Fix logic: enable -> enable priv messages.
CitralFlo Feb 5, 2025
f9cd9b7
Resolve @coderabbitai nitpick comment, simplify command and api
CitralFlo Feb 5, 2025
39b6dfc
Refactor names of variables following vLuckyyy comment
CitralFlo Feb 5, 2025
1ed9c34
Change name from toggleState to State
CitralFlo Feb 5, 2025
d72ae5c
Simplify logic (i hope @Rollczi will like it) refactor to PrivateChat…
CitralFlo Feb 6, 2025
6a12777
Merge branch 'master' into msgtoggle
CitralFlo Feb 12, 2025
dabdf7d
Resolve master changes
CitralFlo Feb 12, 2025
297cff4
Resolve @coderabbitai 's review
CitralFlo Feb 12, 2025
1b57a89
Cleanup method and parameters names. Remove unused classes.
Rollczi Feb 13, 2025
6227fa3
Simplify commands
Rollczi Feb 13, 2025
5a41247
Fix command messages
Rollczi Feb 13, 2025
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
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ Get the latest development builds from our [GitHub Actions](https://github.com/E
- Chat On/Off Switch
- Chat Slow Mode
- /ignore and /unignore (with -all option)
- /msgtoggle
- /msg, /socialspy, and /reply commands
- /msg, /msgtoggle, /socialspy, and /reply commands
- /helpop command
- Advanced Notification System allowing you to customize every message to your liking (Title, Subtitle, Actionbar, Chat, etc.)
- :hammer: Open Utility Blocks with simple commands like `/workbench`
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.eternalcode.core.feature.privatechat.toggle;

import java.util.UUID;

/**
* Represents a player's private chat toggle state.
*/
public class PrivateChatToggle {

UUID uuid;
PrivateChatToggleState state;

public PrivateChatToggle(UUID uuid, PrivateChatToggleState toggle) {
this.uuid = uuid;
this.state = toggle;
}

public UUID getUuid() {
return uuid;
}

public PrivateChatToggleState getState() {
return state;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.eternalcode.core.feature.privatechat.toggle;

import java.util.UUID;
import java.util.concurrent.CompletableFuture;

/**
* This Service manages the state of player's private chat messages blocking
*/
public interface PrivateChatToggleService {

/**
* Checks status of player's private chat messages blocking.
*
* @param uuid player's UUID.
* @return state of player's private chat messages blocking.
*/
CompletableFuture<PrivateChatToggleState> getPrivateChatToggleState(UUID uuid);

/**
* Sets blocking of incoming private messages.
*
* @param uuid player's UUID.
* @param toggle desired state of player's private chat messages blocking.
*/
void togglePrivateChat(UUID uuid, PrivateChatToggleState toggle);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.eternalcode.core.feature.privatechat.toggle;

/**
* Enum representing state of blocking incoming private messages by the player.
*/
public enum PrivateChatToggleState {

/**
* State that represents that the player has blocked incoming private messages.
*/
ON,

/**
* State that represents that the player has not blocked incoming private messages.
*/
OFF
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import com.eternalcode.core.event.EventCaller;
import com.eternalcode.core.feature.ignore.IgnoreService;
import com.eternalcode.core.feature.msgtoggle.MsgToggleService;
import com.eternalcode.core.feature.privatechat.toggle.PrivateChatToggleService;
import com.eternalcode.core.feature.privatechat.toggle.PrivateChatToggleState;
import com.eternalcode.core.injector.annotations.Inject;
import com.eternalcode.core.injector.annotations.component.Service;
import com.eternalcode.core.notice.NoticeService;
Expand All @@ -25,7 +26,7 @@ class PrivateChatServiceImpl implements PrivateChatService {
private final UserManager userManager;
private final PrivateChatPresenter presenter;
private final EventCaller eventCaller;
private final MsgToggleService msgToggleService;
private final PrivateChatToggleService privateChatToggleService;

private final Cache<UUID, UUID> replies = CacheBuilder.newBuilder()
.expireAfterWrite(Duration.ofHours(1))
Expand All @@ -39,13 +40,13 @@ class PrivateChatServiceImpl implements PrivateChatService {
IgnoreService ignoreService,
UserManager userManager,
EventCaller eventCaller,
MsgToggleService msgToggleService
PrivateChatToggleService privateChatToggleService
) {
this.noticeService = noticeService;
this.ignoreService = ignoreService;
this.userManager = userManager;
this.eventCaller = eventCaller;
this.msgToggleService = msgToggleService;
this.privateChatToggleService = privateChatToggleService;

this.presenter = new PrivateChatPresenter(noticeService);
}
Expand All @@ -59,9 +60,9 @@ void privateMessage(User sender, User target, String message) {

UUID uniqueId = target.getUniqueId();

this.msgToggleService.hasMsgToggled(uniqueId).thenAccept(hasMsgToggled -> {
if (hasMsgToggled) {
this.noticeService.player(sender.getUniqueId(), translation -> translation.privateChat().msgToggledOff());
this.privateChatToggleService.getPrivateChatToggleState(uniqueId).thenAccept(privateChatToggleState -> {
if (privateChatToggleState.equals(PrivateChatToggleState.ON)) {
this.noticeService.player(sender.getUniqueId(), translation -> translation.privateChat().receiverDisabledMessages());

return;
}
Expand Down
Loading