Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* UI: ignore list improved:

Browse source 
* Added support of usernames with spaces (#6305);
 * Increased max limit from 50 to 100;
 * Added list size info on connection or command usage;
This commit is contained in:
Oleg Agafonov 2020-02-27 02:05:16 +04:00
parent 299be53e7a
commit f50bc8f36f
7 changed files with 62 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Client/src/main/java/mage/client/chat/LocalCommands.java
View file

@ -7,18 +7,25 @@ import mage.interfaces.callback.ClientCallback;
import mage.interfaces.callback.ClientCallbackMethod;
import mage.view.ChatMessage;
import java.util.Date;
import java.util.Optional;
import java.util.StringTokenizer;
import java.util.UUID;
import java.util.*;
public final class LocalCommands {
private LocalCommands(){}
private LocalCommands() {
}
private static String getRemainingTokens(StringTokenizer st) {
List<String> list = new ArrayList<>();
while (st.hasMoreTokens()) {
list.add(st.nextToken());
}
return String.join(" ", list);
}
/**
* Handler for commands that do not require server interaction, i.e settings etc
*
* @param chatId
* @param text
* @return true if the command was handled locally, else false
@ -33,15 +40,16 @@ public final class LocalCommands {
final String serverAddress = SessionHandler.getSession().getServerHostname().orElseGet(() -> "");
Optional<String> response = Optional.empty();
switch (st.nextToken()) {
String command = st.nextToken();
switch (command) {
case "/ignore":
case "\\ignore":
final String ignoreTarget = tokens > 1 ? st.nextToken() : "";
final String ignoreTarget = getRemainingTokens(st);
response = Optional.of(IgnoreList.ignore(serverAddress, ignoreTarget));
break;
case "/unignore":
case "\\unignore":
final String unignoreTarget = tokens > 1 ? st.nextToken() : "";
final String unignoreTarget = getRemainingTokens(st);
response = Optional.of(IgnoreList.unignore(serverAddress, unignoreTarget));
break;
// TODO: move profanity settings to here