Eyre_S/Coeur-Morny-Cono
1
0
Fork 0
mirror of https://github.com/Eyre-S/Coeur-Morny-Cono.git synced 2024-11-22 19:24:53 +08:00
Code Issues Actions Packages Releases Wiki Activity

/encrypt 现在支持了图片 // 设置版本 CODENAME 为 putian

Browse Source
This commit is contained in:
A.C.Sukazyo Eyre 2022-10-15 17:51:56 +08:00
parent f195d5c1bb
commit e31dd6a0fb
Signed by: Eyre_S
GPG Key ID: C17CE40291207874
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -1,8 +1,8 @@
## Core ## Core
VERSION = 0.8.0.6 VERSION = 0.8.0.7
CODENAME = fuzhou CODENAME = putian
# dependencies # dependencies

6
src/main/java/cc/sukazyo/cono/morny/GradleProjectConfigures.java
View File

@ -4,7 +4,7 @@ package cc.sukazyo.cono.morny;
* the final field that will be updated by gradle automatically. * the final field that will be updated by gradle automatically.
*/ */
public class GradleProjectConfigures { public class GradleProjectConfigures {
public static final String VERSION = "0.8.0.6"; public static final String VERSION = "0.8.0.7";
public static final String CODENAME = "fuzhou"; public static final String CODENAME = "putian";
public static final long COMPILE_TIMESTAMP = 1665825000740L; public static final long COMPILE_TIMESTAMP = 1665827278036L;
} }

23
src/main/java/cc/sukazyo/cono/morny/bot/command/Encryptor.java
View File

@ -6,6 +6,7 @@ import cc.sukazyo.cono.morny.util.CommonConvert;
import cc.sukazyo.cono.morny.util.CommonEncrypt; import cc.sukazyo.cono.morny.util.CommonEncrypt;
import cc.sukazyo.cono.morny.util.tgapi.InputCommand; import cc.sukazyo.cono.morny.util.tgapi.InputCommand;
import cc.sukazyo.cono.morny.util.tgapi.formatting.MsgEscape; import cc.sukazyo.cono.morny.util.tgapi.formatting.MsgEscape;
import com.pengrad.telegrambot.model.PhotoSize;
import com.pengrad.telegrambot.model.Update; import com.pengrad.telegrambot.model.Update;
import com.pengrad.telegrambot.model.request.ParseMode; import com.pengrad.telegrambot.model.request.ParseMode;
import com.pengrad.telegrambot.request.GetFile; import com.pengrad.telegrambot.request.GetFile;
@ -92,6 +93,28 @@ public class Encryptor implements ITelegramCommand {
return; return;
} }
dataName = event.message().replyToMessage().document().fileName(); dataName = event.message().replyToMessage().document().fileName();
} else if (event.message().replyToMessage() != null && event.message().replyToMessage().photo() != null) {
inputText = false;
try {
PhotoSize originPhoto = null;
long photoSize = 0;
for (PhotoSize size : event.message().replyToMessage().photo()) if (photoSize < (long)size.width() *size.height()) {
originPhoto = size;
photoSize = (long)size.width() *size.height();
} // found max size (original) image in available sizes
if (originPhoto==null) throw new IOException("no photo object from api.");
data = MornyCoeur.getAccount().getFileContent(MornyCoeur.extra().exec(new GetFile(
originPhoto.fileId()
)).file());
} catch (IOException e) {
logger.warn("NetworkRequest error: TelegramFileAPI:\n\t" + e.getMessage());
MornyCoeur.extra().exec(new SendSticker(
event.message().chat().id(),
TelegramStickers.ID_NETWORK_ERR
).replyToMessageId(event.message().messageId()));
return;
}
dataName = "photo"+CommonConvert.byteArrayToHex(CommonEncrypt.hashMd5(String.valueOf(System.currentTimeMillis()))).substring(32-12).toUpperCase()+".png";
} else if (event.message().replyToMessage() != null && event.message().replyToMessage().text() != null) { } else if (event.message().replyToMessage() != null && event.message().replyToMessage().text() != null) {
inputText = true; inputText = true;
data = event.message().replyToMessage().text().getBytes(CommonEncrypt.ENCRYPT_STANDARD_CHARSET); data = event.message().replyToMessage().text().getBytes(CommonEncrypt.ENCRYPT_STANDARD_CHARSET);