move announcements toggle under message settings

common/src/main/java/fi/fabianadrian/proxychat/common/ProxyChat.java

@@ -2,8 +2,8 @@
 
 import fi.fabianadrian.proxychat.common.channel.ChannelRegistry;
 import fi.fabianadrian.proxychat.common.command.Commander;
-import fi.fabianadrian.proxychat.common.command.ProxyChatCommand;
 import fi.fabianadrian.proxychat.common.command.ProxyChatCaptionFormatter;
+import fi.fabianadrian.proxychat.common.command.ProxyChatCommand;
 import fi.fabianadrian.proxychat.common.command.commands.*;
 import fi.fabianadrian.proxychat.common.command.processor.ProxyChatCommandPreprocessor;
 import fi.fabianadrian.proxychat.common.config.ConfigManager;
@@ -73,7 +73,6 @@ private void setupCommandManager() {
 
 	private void registerCommands() {
 		Stream.of(
-				new AnnouncementsCommand(this),
 				new BlockCommand(this),
 				new BlockListCommand(this),
 				new BroadcastCommand(this),

common/src/main/java/fi/fabianadrian/proxychat/common/command/commands/MessageSettingsCommand.java

@@ -29,6 +29,11 @@ public void register() {
 				.required("enabled", BooleanParser.booleanParser())
 				.handler(this::executeSpy)
 		);
+		this.manager.command(subCommand("announcements")
+				.senderType(User.class)
+				.optional("visible", BooleanParser.booleanParser())
+				.handler(this::executeAnnouncement)
+		);
 	}
 
 	private void executeSpy(CommandContext<User> ctx) {
@@ -58,4 +63,14 @@ private void executeAllow(CommandContext<User> ctx) {
 				break;
 		}
 	}
+
+	private void executeAnnouncement(CommandContext<User> ctx) {
+		Optional<Boolean> visibleOptional = ctx.optional("visible");
+		User user = ctx.sender();
+
+		boolean visible = visibleOptional.orElseGet(() -> !user.messageSettings().announcements());
+
+		user.messageSettings().announcements(visible);
+		user.sendMessage(visible ? Messages.COMMAND_ANNOUNCEMENTS_ON : Messages.COMMAND_ANNOUNCEMENTS_OFF);
+	}
 }

common/src/main/java/fi/fabianadrian/proxychat/common/service/AnnouncementService.java

@@ -46,7 +46,7 @@ public void sendAnnouncement() {
 
 		Component announcement = this.miniMessage.deserialize(this.config.prefix() + this.config.announcements().get(this.index));
 		for (User user : this.proxyChat.userManager().users()) {
-			if (user.announcements()) {
+			if (user.messageSettings().announcements()) {
 				user.sendMessage(announcement);
 			}
 		}

common/src/main/java/fi/fabianadrian/proxychat/common/user/MessageSettings.java

@@ -3,6 +3,7 @@
 public final class MessageSettings {
 	private PrivacySetting privacySetting = PrivacySetting.EVERYONE;
 	private boolean spy = false;
+	private boolean announcements = true;
 
 	public PrivacySetting privacySetting() {
 		return this.privacySetting;
@@ -20,6 +21,14 @@ public void spy(boolean value) {
 		this.spy = value;
 	}
 
+	public boolean announcements() {
+		return announcements;
+	}
+
+	public void announcements(boolean value) {
+		this.announcements = value;
+	}
+
 	public enum PrivacySetting {
 		NOBODY, FRIENDS, EVERYONE
 	}

common/src/main/java/fi/fabianadrian/proxychat/common/user/User.java

@@ -15,7 +15,6 @@ public final class User implements Commander {
 
 	private final transient PlatformPlayer player;
 
-	private boolean announcements = true;
 	private MessageSettings messageSettings = new MessageSettings();
 	private Set<String> mutedChannels = new HashSet<>();
 	private transient UUID lastMessaged;
@@ -26,7 +25,6 @@ public User(PlatformPlayer player) {
 	}
 
 	public void populate(User deserialized) {
-		this.announcements = deserialized.announcements;
 		if (deserialized.messageSettings != null) {
 			this.messageSettings = deserialized.messageSettings;
 		}
@@ -66,14 +64,6 @@ public boolean unMuteChannel(Channel channel) {
 		return this.mutedChannels.remove(channel.name());
 	}
 
-	public boolean announcements() {
-		return announcements;
-	}
-
-	public void announcements(boolean value) {
-		this.announcements = value;
-	}
-
 	public MessageSettings messageSettings() {
 		return this.messageSettings;
 	}