webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change stickerId to hex everywhere

Browse source 
Remove packKey from output
This commit is contained in:
AsamK 2022-01-03 17:51:04 +01:00
parent e70463d7b8
commit beb3adcc72
12 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/asamk/signal/ReceiveMessageHandler.java
View file

@ -8,10 +8,10 @@ import org.asamk.signal.manager.groups.GroupId;
import org.asamk.signal.manager.storage.recipients.RecipientAddress;
import org.asamk.signal.output.PlainTextWriter;
import org.asamk.signal.util.DateUtils;
import org.asamk.signal.util.Hex;
import org.slf4j.helpers.MessageFormatter;
import java.util.ArrayList;
import java.util.Base64;
import java.util.stream.Collectors;
public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
@ -349,8 +349,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
private void printSticker(
final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker
) {
writer.println("Pack id: {}", Base64.getEncoder().encodeToString(sticker.packId()));
writer.println("Pack key: {}", Base64.getEncoder().encodeToString(sticker.packKey()));
writer.println("Pack id: {}", Hex.toStringCondensed(sticker.packId().serialize()));
writer.println("Sticker id: {}", sticker.stickerId());
}

5
src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
View file

@ -162,7 +162,10 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
}
private Map<String, Variant<? extends Serializable>> getStickerMap(final MessageEnvelope.Data.Sticker sticker) {
return Map.of("packId", new Variant<>(sticker.packId()), "stickerId", new Variant<>(sticker.stickerId()));
return Map.of("packId",
new Variant<>(sticker.packId().serialize()),
"stickerId",
new Variant<>(sticker.stickerId()));
}
private Map<String, Variant<?>> getReactionMap(final MessageEnvelope.Data.Reaction reaction) {

11
src/main/java/org/asamk/signal/json/JsonSticker.java
View file

@ -1,16 +1,13 @@
package org.asamk.signal.json;
import org.asamk.signal.manager.api.MessageEnvelope;
import org.asamk.signal.util.Hex;
import java.util.Base64;
public record JsonSticker(String packId, String packKey, int stickerId) {
public record JsonSticker(String packId, int stickerId) {
static JsonSticker from(MessageEnvelope.Data.Sticker sticker) {
final var encoder = Base64.getEncoder();
final var packId = encoder.encodeToString(sticker.packId());
final var packKey = encoder.encodeToString(sticker.packKey());
final var packId = Hex.toStringCondensed(sticker.packId().serialize());
final var stickerId = sticker.stickerId();
return new JsonSticker(packId, packKey, stickerId);
return new JsonSticker(packId, stickerId);
}
}