NaAlOH4/VTools
1
0
Fork 0
forked from mc/VTools
Code Pull requests Activity

Compare commits

base: NaAlOH4:425210963fdf83b28144e5617d10d6f95f436a2d
Branches Tags
NaAlOH4:master
NaAlOH4:multigroup
NaAlOH4:test1
mc:master
mc:alpt-1
mc:new
mc:multigroup
mc:test1
NaAlOH4:artifacts
mc:artifacts
..
compare: NaAlOH4:c2ee4fca4f6449382b6760008a360af76be1dfbf
Branches Tags
NaAlOH4:master
NaAlOH4:multigroup
NaAlOH4:test1
mc:master
mc:alpt-1
mc:new
mc:multigroup
mc:test1
NaAlOH4:artifacts
mc:artifacts

No commits in common. "425210963fdf83b28144e5617d10d6f95f436a2d" and "c2ee4fca4f6449382b6760008a360af76be1dfbf" have entirely different histories.
425210963f ... c2ee4fca4f

2 changed files with 113 additions and 382 deletions
Show stats Expand all files Collapse all files

241
src/main/java/de/strifel/VTools/listeners/MarkdownString.java
View file

@ -1,241 +0,0 @@
package de.strifel.VTools.listeners;
import com.pengrad.telegrambot.model.Message;
import com.pengrad.telegrambot.model.MessageEntity;
import java.util.*;
import java.util.function.BiFunction;
public class MarkdownString {
private MarkdownString() {
throw new IllegalStateException();
}
/**
* 这里的 format 假设 BiFunction 的输入都是转义过的。
*/
private static final Map<MessageEntity.Type, BiFunction<StringBuilder, MessageEntity, StringBuilder>> formats;
static {
Map<MessageEntity.Type, BiFunction<StringBuilder, MessageEntity, StringBuilder>> map = new EnumMap<>(MessageEntity.Type.class);
map.put(MessageEntity.Type.bold, (s, e) -> {
assert e.type() == MessageEntity.Type.bold;
return s.insert(0, "*").append("*");
});
map.put(MessageEntity.Type.strikethrough, (s, e) -> {
assert e.type() == MessageEntity.Type.strikethrough;
return s.insert(0, "~").append("~");
});
map.put(MessageEntity.Type.spoiler, (s, e) -> {
assert e.type() == MessageEntity.Type.spoiler;
return s.insert(0, "||").append("||");
});
map.put(MessageEntity.Type.italic, (s, e) -> {
assert e.type() == MessageEntity.Type.italic;
return s.insert(0, "\r_\r").append("\r_\r"); // todo: 精简一下 到底哪里需要加\r
});
map.put(MessageEntity.Type.underline, (s, e) -> {
assert e.type() == MessageEntity.Type.underline;
return s.insert(0, "\r__\r").append("\r__\r");
});
// https://core.telegram.org/bots/api#formatting-options
// 上面这几个套娃友好，自身随意套娃，但不能和等宽组合
map.put(MessageEntity.Type.code, (s, e) -> {
assert e.type() == MessageEntity.Type.code;
return s.insert(0, "`").append("`");
});
map.put(MessageEntity.Type.pre, (rawStr, messageEntity) -> {
assert messageEntity.type() == MessageEntity.Type.pre;
rawStr.insert(0, "\n");
String language = messageEntity.language();
if (language != null && language.length() > 0) {
rawStr.insert(0, language);
}
return rawStr.insert(0, "```").append("\n```");
});
// 等宽（pre 和 code）完全禁止套娃
map.put(MessageEntity.Type.text_link, (s, e) -> {
assert e.type() == MessageEntity.Type.text_link;
return s.insert(0, "[").append("](").append(escapeStr(e.url())).append(")");
});
map.put(MessageEntity.Type.text_mention, (s, e) -> {
assert e.type() == MessageEntity.Type.text_mention;
if (e.user() == null || e.user().id() == null) {
return s; // 没有id时爆炸（
}
return s.insert(0, "[").append("](").append("tg://user?id=").append(e.user().id()).append(")");
});
// 链接类不能和链接类套娃，但是可以和加粗等套娃友好的组合
formats = Collections.unmodifiableMap(map);
}
private static class StringBlock {
@Override
public String toString() {
return "StringBlock{" +
"text='" + text + '\'' +
", entities=" + entities +
", offset=" + offset +
'}';
}
private final String text;
private Map<MessageEntity.Type, MessageEntity> entities;
private final int offset;
StringBlock(String text, int offset) {
this.text = text;
this.offset = offset;
this.entities = new EnumMap<>(MessageEntity.Type.class);
}
private String getMarkdownTextWithoutLink() { // todo: 压缩 *text1**_text2_* 为 *text1_text2_*
// 链接类不能和链接类套娃
assert (!entities.containsKey(MessageEntity.Type.text_link)) || (!entities.containsKey(MessageEntity.Type.text_mention));
// 等宽（pre 和 code）完全禁止套娃
assert (!entities.containsKey(MessageEntity.Type.pre) && !entities.containsKey(MessageEntity.Type.code)) || (entities.size() <= 1);
StringBuilder s = new StringBuilder(escapeStr(text));
for (var entry : entities.entrySet()) {
BiFunction<StringBuilder, MessageEntity, StringBuilder> repeater = (sb, e) -> sb;
s = formats.getOrDefault(entry.getKey(), repeater).apply(s, entry.getValue()); // 无用赋值...理论上。
}
return s.toString();
}
}
public static String markdownString(Message message) {
if (message.entities() == null || message.entities().length == 0) return message.text();
List<StringBlock> stringBlocks = createStringBlocks(message);
StringBuilder s = new StringBuilder();
for (int i = 0; i < stringBlocks.size(); i++) {
var stringBlock = stringBlocks.get(i);
var entities = stringBlock.entities;
String withoutLink = stringBlock.getMarkdownTextWithoutLink();
if (entities.containsKey(MessageEntity.Type.text_mention) ||
entities.containsKey(MessageEntity.Type.text_link)) {
assert (!entities.containsKey(MessageEntity.Type.text_mention) ||
!entities.containsKey(MessageEntity.Type.text_link));
StringBuilder linkText = new StringBuilder();
MessageEntity entity = entities.containsKey(MessageEntity.Type.text_mention) ?
stringBlock.entities.get(MessageEntity.Type.text_mention) :
stringBlock.entities.get(MessageEntity.Type.text_link);
assert entity.offset() == stringBlock.offset;
int end = entity.length() + entity.offset();
while (true) {
linkText.append(stringBlock.getMarkdownTextWithoutLink());
if (stringBlock.text.length() + stringBlock.offset == end) {
break;
}
if (stringBlock.text.length() + stringBlock.offset > end) {
throw new IllegalStateException("奶冰可爱捏");
}
i++;
stringBlock = stringBlocks.get(i);
}
s.append(formats.get(entity.type()).apply(linkText, entity));
} else {
s.append(withoutLink);
}
}
return s.toString();
}
/**
* @return 一组 StringBlock，被完全切开的文本，每部分都和相邻部分格式不一样，顺序的。
*/
private static List<StringBlock> createStringBlocks(Message message) {
List<StringBlock> stringBlocks = new ArrayList<>();
Set<Integer> splitPoints = new HashSet<>();
// 定位切割点
for (MessageEntity entity : message.entities()) {
if (formats.containsKey(entity.type())) {
Integer offset = entity.offset();
Integer length = entity.length();
splitPoints.add(offset);
splitPoints.add(offset + length);
}
}
// 切割文本
String text = message.text();
List<Integer> sortedSplitPoints = new ArrayList<>(splitPoints);
Collections.sort(sortedSplitPoints);
int start = 0;
for (int splitPoint : sortedSplitPoints) {
if (splitPoint == 0) continue;// 跳过第一个空的
stringBlocks.add(new StringBlock(text.substring(start, splitPoint), start));
start = splitPoint;
}
if (start < text.length()) {
stringBlocks.add(new StringBlock(text.substring(start), start));
}
// 给文本重新赋格式（MessageEntity）
for (MessageEntity entity : message.entities()) {
if (!formats.containsKey(entity.type())) {
continue;
}
for (StringBlock stringBlock : stringBlocks) {
int blockStart = stringBlock.offset;
int blockEnd = blockStart + stringBlock.text.length();
int entityStart = entity.offset();
int entityEnd = entityStart + entity.length();
assert (blockStart < blockEnd) && (entityStart < entityEnd);
if (blockStart >= entityEnd || blockEnd <= entityStart) {
continue;
}
assert (blockStart >= entityStart) && (blockEnd <= entityEnd) : String.format("%s,%s,%s,%s", blockStart, blockEnd, entityStart, entityEnd);
MessageEntity old = stringBlock.entities.put(entity.type(), entity);
assert (old == null);
}
}
return stringBlocks;
}
private static final boolean[] SHOULD_ESCAPE = new boolean[128];
static {
// In all other places characters '_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!' must be escaped with the preceding character '\'.
char[] chars = {'_', '*', '[', ']', '(', ')', '~', '`', '>', '#', '+', '-', '=', '|', '{', '}', '.', '!'};
for (char c : chars) {
SHOULD_ESCAPE[c] = true;
}
}
public static String escapeStr(String s) {
StringBuilder r = new StringBuilder();
for (String character : s.split("")) {
int codePoint = character.codePointAt(0);
if (codePoint < 128 && SHOULD_ESCAPE[codePoint]) {
r.append('\\');
}
r.append(character);
}
return r.toString();
}
}

176
src/main/java/de/strifel/VTools/listeners/TGBridge.java
View file

@ -6,7 +6,6 @@ import com.pengrad.telegrambot.UpdatesListener;
import com.pengrad.telegrambot.model.Message;
import com.pengrad.telegrambot.model.Update;
import com.pengrad.telegrambot.model.User;
import com.pengrad.telegrambot.model.request.ParseMode;
import com.pengrad.telegrambot.request.EditMessageText;
import com.pengrad.telegrambot.request.GetChat;
import com.pengrad.telegrambot.request.SendMessage;
@ -51,10 +50,7 @@ public class TGBridge {
private long backoffSec = 1L;
private static final String DIVIDER = "————————\n";
/**
* markdown escaped
*/
private static final String DIVIDER = "----------\n";
private String pinNote;
public TGBridge(@NotNull VTools plugin) {
@ -100,56 +96,50 @@ public class TGBridge {
bot.setUpdatesListener(updates -> {
backoffSec = 1L;
for (Update update : updates) {
try {
if (update == null || update.message() == null) break;
Message message = update.message();
if (message.chat() == null || message.chat().id() != CHAT_ID || message.from() == null) {
break;
}
if (message.text() != null && !message.text().isEmpty()) {
String msgText = message.text();
if (msgText.startsWith("/")) {
String[] s = msgText.split("(@[A-Za-z0-9_]bot)?[\t \n]+", 2);
if (update != null &&
update.message() != null &&
update.message().chat() != null &&
update.message().chat().id() == CHAT_ID &&
update.message().from() != null
) {
if (update.message().text() != null && !update.message().text().isEmpty()) {
String msg = update.message().text();
if (msg.startsWith("/")) {
String[] s = msg.split("(@[A-Za-z0-9_]bot)?[\t \n]+", 2);
String command = s[0];
@Nullable String arg = s.length == 2 ? s[1] : null;
switch (command) {
case "/list" -> outbound(genOnlineStatus(), ParseMode.MarkdownV2);
case "/list" -> outbound(genOnlineStatus());
case "/setpin" -> {
Message replyTo = message.replyToMessage();
if (arg == null || arg.length() == 0) {
boolean shouldApplyEdit = true;
boolean needUpdate = false;
Message replyTo = update.message().replyToMessage();
if (replyTo == null) {
if (arg == null || arg.length() == 0)
outbound("""
usage:
use "/setpin" reply a message that from the bot to set that message to pin-message,
or use "/setpin <note>" to update current pinned message.""");
break;
}
ONLINE_STATUS_MESSAGE_ID = replyTo.messageId();
updateOnlineStatus();
break;
}
if (replyTo != null && (replyTo.from() == null || replyTo.from().id() != BOT_ID || replyTo.messageId() <= 0)) {
} else if (replyTo.from() == null || replyTo.from().id() != BOT_ID || replyTo.messageId() <= 0) {
outbound("must reply a message that from the bot (or reply nothing).");
break;
}
String markdownString = MarkdownString.markdownString(message);
String shouldBeCommand = markdownString.substring(0, "/setpin ".length());
if (!shouldBeCommand.matches("/setpin[\t \n]")) {
outbound("\"/setpin\" must be plain text.");
break;
}
outbound("old pinned note: \n" + pinNote, ParseMode.MarkdownV2);
pinNote = markdownString.substring("/setpin ".length());
if (replyTo != null) {
shouldApplyEdit = false;
} else {
readOldPinnedMessage(replyTo);
if (arg == null || arg.length() == 0) {
outbound("done");
}else {
ONLINE_STATUS_MESSAGE_ID = replyTo.messageId();
}
updateOnlineStatus();
needUpdate = true;
}
if (shouldApplyEdit && arg != null && arg.length() > 0) {
outbound("done. old pinned note: \n" + pinNote);
pinNote = arg;
needUpdate = true;
}
if (needUpdate) updateOnlineStatus();
}
case "/genpin" -> outbound(genPinMessage(),
(sendMessage, sendResponse) -> {
@ -159,21 +149,22 @@ public class TGBridge {
int messageId = sendResponse.message().messageId();
ONLINE_STATUS_MESSAGE_ID = messageId > 0 ? messageId : ONLINE_STATUS_MESSAGE_ID;
}
}, ParseMode.MarkdownV2
}
);
}
}
tgInbound(message.from(), msgText);
} else if (message.sticker() != null) {
tgInbound(message.from(), "[sticker]");
} else if (message.photo() != null) {
tgInbound(message.from(), "[photo]");
} else if (message.audio() != null) {
tgInbound(message.from(), "[audio]");
} else if (message.voice() != null) {
tgInbound(message.from(), "[voice]");
} else if (message.document() != null) {
tgInbound(message.from(), "[document]");
tgInbound(update.message().from(), msg);
} else if (update.message().sticker() != null) {
tgInbound(update.message().from(), "[sticker]");
} else if (update.message().photo() != null) {
tgInbound(update.message().from(), "[photo]");
} else if (update.message().audio() != null) {
tgInbound(update.message().from(), "[audio]");
} else if (update.message().voice() != null) {
tgInbound(update.message().from(), "[voice]");
} else if (update.message().document() != null) {
tgInbound(update.message().from(), "[document]");
}
}
} catch (Exception e) {
plugin.logger.error("handling update", e);
@ -192,6 +183,7 @@ public class TGBridge {
}
private boolean getPinnedMessage(){
try {
GetChatResponse response = bot.execute(new GetChat(CHAT_ID));
Message pinnedMessage = response.chat().pinnedMessage();
@ -208,29 +200,22 @@ public class TGBridge {
private void readOldPinnedMessage(Message message){
ONLINE_STATUS_MESSAGE_ID = message.messageId();
String markdownText = MarkdownString.markdownString(message);
String[] s = markdownText.split(DIVIDER, 2);
pinNote = (s.length == 2) ?
s[1] :
"\r_\r" + MarkdownString.escapeStr("(use \"/setpin\" <note> to set note here)") + "\r_\r";
String text = message.text();
String[] s = text.split(DIVIDER, 2);
pinNote = s.length == 2 ? s[1] : "(use \"/setpin\" <note> to set note here)";
}
/**
* @return markdown escaped str
*/
private String genPinMessage() {
return (pinNote != null && pinNote.length() != 0) ?
genOnlineStatus() + "\n" + DIVIDER + pinNote :
genOnlineStatus();
String onlineStatus = genOnlineStatus();
if (pinNote != null && pinNote.length() > 1) {
return onlineStatus + "\n" + DIVIDER + pinNote;
} else {
return onlineStatus;
}
}
/**
* @return markdown escaped str
*/
private String genOnlineStatus() {
ArrayList<String> out = new ArrayList<>();
String fmt = server.getAllPlayers().size() > 1 ? "%d players are currently connected to the proxy\\." : "%d player is currently connected to the proxy\\.";
String fmt = server.getAllPlayers().size() > 1 ? "%d players are currently connected to the proxy." : "%d player is currently connected to the proxy.";
out.add(String.format(fmt, server.getAllPlayers().size()));
List<RegisteredServer> registeredServers = new ArrayList<>(server.getAllServers());
for (RegisteredServer registeredServer : registeredServers) {
@ -241,11 +226,10 @@ public class TGBridge {
}
}
if (!onServer.isEmpty()) {
out.add(
String.format("\\[%s\\] \\(%d\\): %s",
"`" + MarkdownString.escapeStr(registeredServer.getServerInfo().getName()) + "`",
out.add(String.format("[%s] (%d): %s",
registeredServer.getServerInfo().getName(),
onServer.size(),
onServer.stream().map(player -> "`" + MarkdownString.escapeStr(player.getUsername()) + "`").collect(Collectors.joining(", ")))
onServer.stream().map(Player::getUsername).collect(Collectors.joining(", ")))
);
}
}
@ -264,36 +248,26 @@ public class TGBridge {
}
}
protected void outbound(String content, ParseMode parseMode) {
outbound(content, (sendMessage, sendResponse) -> {
if (!sendResponse.isOk()) {
plugin.logger.error(String.format("sendMessage error %d: %s", sendResponse.errorCode(), sendResponse.description()));
}
}, parseMode);
protected void outbound(String content) {
outbound(content, null);
}
protected void outbound(String content) {outbound(content, (ParseMode) null);}
protected void outbound(String content, @NotNull BiConsumer<SendMessage, SendResponse> onResponse) {outbound(content, onResponse, null);}
protected void outbound(String content, @NotNull BiConsumer<SendMessage, SendResponse> onResponse, ParseMode parseMode) {
protected void outbound(String content, @Nullable BiConsumer<SendMessage, SendResponse> onResponse) {
if (bot == null) return;
if (content.length() > 4000) {
content = content.substring(0, 4000);
}
SendMessage sendMessage = new SendMessage(CHAT_ID, content);
if (parseMode != null) {
boolean a = sendMessage == sendMessage.parseMode(parseMode);
assert a;
}
bot.execute(sendMessage, new Callback<SendMessage, SendResponse>() {
bot.execute(new SendMessage(CHAT_ID, content), new Callback<SendMessage, SendResponse>() {
@Override
public void onResponse(SendMessage sendMessage, SendResponse sendResponse) {
if (onResponse == null) {
if (!sendResponse.isOk()) {
plugin.logger.error(String.format("sendMessage error %d: %s", sendResponse.errorCode(), sendResponse.description()));
}
} else {
onResponse.accept(sendMessage, sendResponse);
}
}
@Override
public void onFailure(SendMessage sendMessage, IOException e) {
@ -325,7 +299,6 @@ public class TGBridge {
}
private String lastDisconnect = "";
@Subscribe
public void onDisconnect(DisconnectEvent event) {
if (!event.getPlayer().hasPermission("vtools.globalchat.bypassbridge.join")) {
@ -345,10 +318,10 @@ public class TGBridge {
}
private boolean PROXY_SHUT_DOWN = false;
private static class UpdateRequest {
}
private static class UpdateRequest {}
private LinkedBlockingQueue<UpdateRequest> updateRequests = new LinkedBlockingQueue<>();
@ -408,16 +381,16 @@ public class TGBridge {
}
protected boolean setOnlineStatusNotAvailable() {
return editOnlineStatusMessage("（proxy already shutdown）");
return editOnlineStatusMessage("(proxy already shutdown)");
}
protected boolean editOnlineStatusMessage(String markdownText) {
protected boolean editOnlineStatusMessage(String text) {
if (ONLINE_STATUS_MESSAGE_ID < 1) {
return true;
}
BaseResponse response;
try {
response = bot.execute(new EditMessageText(CHAT_ID, ONLINE_STATUS_MESSAGE_ID, markdownText).parseMode(ParseMode.MarkdownV2));
response = bot.execute(new EditMessageText(CHAT_ID, ONLINE_STATUS_MESSAGE_ID, text));
} catch (RuntimeException e) {return false;}
return response != null && response.isOk();
}
@ -467,7 +440,6 @@ public class TGBridge {
time = 0;
text = new StringBuilder();
} //dummy
private void addLines(List<String> messages) {
for (String message : messages) {
text.append('\n').append(message);