Merge pull request #24 from Arthessia/master

Silent Update
mastercake10 · Dec 12, 2022 · bf29315 · bf29315
2 parents 0f395cd + ab920e7
commit bf29315
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,7 @@
 *.class
 /target
 *.iml
+.project
+.classpath
+.settings/
+*.prefs
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>xyz.spaceio</groupId>
 	<artifactId>telegramchat</artifactId>
-	<version>1.0.19-SNAPSHOT</version>
+	<version>1.0.20-SNAPSHOT</version>
 	<name>TelegramChat</name>
 	<url>https://www.spigotmc.org/resources/telegramchat.16576/</url>
 

diff --git a/src/main/java/de/Linus122/Handlers/BanHandler.java b/src/main/java/de/Linus122/Handlers/BanHandler.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
 
 import de.Linus122.Telegram.TelegramActionListener;
 import de.Linus122.TelegramComponents.ChatMessageToMc;

diff --git a/src/main/java/de/Linus122/Handlers/CommandHandler.java b/src/main/java/de/Linus122/Handlers/CommandHandler.java
@@ -1,25 +1,16 @@
 package de.Linus122.Handlers;
 
-import java.security.Permissions;
-import java.util.Arrays;
-import java.util.Locale;
 import java.util.logging.ConsoleHandler;
-import java.util.logging.Formatter;
-import java.util.logging.Handler;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
-import java.util.logging.SimpleFormatter;
 
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginLogger;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
 import de.Linus122.Telegram.Telegram;
 import de.Linus122.Telegram.TelegramActionListener;
-import de.Linus122.TelegramChat.TelegramChat;
 import de.Linus122.TelegramComponents.ChatMessageToMc;
 import de.Linus122.TelegramComponents.ChatMessageToTelegram;
 import net.milkbowl.vault.permission.Permission;

diff --git a/src/main/java/de/Linus122/Telegram/Telegram.java b/src/main/java/de/Linus122/Telegram/Telegram.java
@@ -157,7 +157,10 @@ public void handleUserMessage(String text, Update update) {
 				}
 			}
 		} else {
-			this.sendMsg(chat.getId(), Utils.formatMSG("need-to-link")[0]);
+			boolean skipIfNeedToLinkSilent = TelegramChat.getInstance().getConfig().getBoolean("omit-messages-need-to-link");
+			if (!skipIfNeedToLinkSilent) {
+				this.sendMsg(chat.getId(), Utils.formatMSG("need-to-link")[0]);
+			}
 		}
 	}
 
@@ -172,6 +175,8 @@ public void sendMsg(ChatMessageToTelegram chat) {
 		for (TelegramActionListener actionListener : listeners) {
 			actionListener.onSendToTelegram(chat);
 		}
+		chat.disable_notification = TelegramChat.getInstance().getConfig().getBoolean("turn-to-silent-notification");
+
 		Gson gson = new Gson();
 		if(!chat.isCancelled()){
 			post("sendMessage", gson.toJson(chat, ChatMessageToTelegram.class));	

diff --git a/src/main/java/de/Linus122/TelegramChat/LinkTelegramCmd.java b/src/main/java/de/Linus122/TelegramChat/LinkTelegramCmd.java
@@ -1,7 +1,5 @@
 package de.Linus122.TelegramChat;
 
-import java.io.IOException;
-
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

diff --git a/src/main/java/de/Linus122/TelegramChat/TelegramChat.java b/src/main/java/de/Linus122/TelegramChat/TelegramChat.java
@@ -28,7 +28,6 @@
 import com.google.gson.Gson;
 
 import de.Linus122.Handlers.BanHandler;
-import de.Linus122.Handlers.CommandHandler;
 import de.Linus122.Metrics.Metrics;
 import de.Linus122.Telegram.Telegram;
 import de.Linus122.Telegram.Utils;

diff --git a/src/main/java/de/Linus122/TelegramComponents/ChatMessageToTelegram.java b/src/main/java/de/Linus122/TelegramComponents/ChatMessageToTelegram.java
@@ -2,6 +2,7 @@
 
 public class ChatMessageToTelegram extends Cancellable {
 	public String text;
+	public Boolean disable_notification;
 	public long chat_id;
 	public String parse_mode;
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -20,3 +20,9 @@ enable-chatmessages: true
 
 # this will prevent mass-sending unsent messages from telegram to mc upon server startup
 omit-messages-sent-while-server-was-offline: true
+
+# this will prevent sending message each time a non-registered person is speaking
+omit-messages-need-to-link: false
+
+# this will send a silent message to avoid triggering a sound each time a message is sent
+turn-to-silent-notification: false
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: TelegramChat
 main: de.Linus122.TelegramChat.TelegramChat
 version: ${project.version}
-authors: [Linus122]
+authors: [Linus122, Arthessia]
 softdepend: [Vault, SuperVanish, PremiumVanish]
 description: Brings minecraft chat to Telegram!
 commands: