marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small improvements

Browse Source
This commit is contained in:
AsamK 2022-11-01 21:57:23 +01:00
parent 2e4d346bc8
commit 43face8ead
12 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graalvm-config-dir/reflect-config.json
View File

@ -713,6 +713,13 @@
"allDeclaredMethods":true,
"allDeclaredConstructors":true
},
{
"name":"org.asamk.signal.json.JsonAttachmentData",
"allDeclaredFields":true,
"queryAllDeclaredMethods":true,
"queryAllDeclaredConstructors":true,
"methods":[{"name":"data","parameterTypes":[] }]
},
{
"name":"org.asamk.signal.json.JsonCallMessage",
"allDeclaredFields":true,
@ -975,6 +982,10 @@
{"name":"startColor","parameterTypes":[] }
]
},
{
"name":"org.asamk.signal.json.JsonStreamSerializer",
"methods":[{"name":"<init>","parameterTypes":[] }]
},
{
"name":"org.asamk.signal.json.JsonSyncDataMessage",
"allDeclaredFields":true,

3
lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
View File

@ -43,9 +43,6 @@ public class AttachmentStore {
public StreamDetails retrieveAttachment(final String id) throws IOException {
final var attachmentFile = new File(attachmentsPath, id);
if (!attachmentFile.exists()) {
return null;
}
return Utils.createStreamDetailsFromFile(attachmentFile);
}

5
lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
View File

@ -62,8 +62,9 @@ class LiveConfig {
new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
2,
new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
TRUST_STORE)},
new SignalContactDiscoveryUrl[]{
new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
},
new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},

5
lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
View File

@ -62,8 +62,9 @@ class StagingConfig {
new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
2,
new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
TRUST_STORE)},
new SignalContactDiscoveryUrl[]{
new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
},
new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},

1
lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
View File

@ -43,7 +43,6 @@ public class AttachmentHelper {
return attachmentStore.retrieveAttachment(id);
}
public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
var attachmentStreams = AttachmentUtils.createAttachmentStreams(attachments);

8
man/signal-cli.1.adoc
View File

@ -637,17 +637,19 @@ The path of the manifest.json or a zip file containing the sticker pack you wish
=== getAttachment
Gets teh raw data for a specified attachment. This is done using the ID of the attachment the recipient or group ID.
Gets the raw data for a specified attachment.
This is done using the ID of the attachment the recipient or group ID.
The attachment data is returned as a Base64 String.
*--id* [ID]::
The ID of the attachment as given in the attachment list of the message.
*--recipient* [RECIPIENT]::
Specify the number which sent the attachment. Referred to generally as recipient.
Specify the number which sent the attachment.
Referred to generally as recipient.
*-g* [GROUP], *--group-id* [GROUP]::
Alternatively, specify the group IDs that for which to get the attachment.
Alternatively, specify the group IDs for which to get the attachment.
=== daemon

2
src/main/java/org/asamk/signal/commands/Commands.java
View File

@ -11,11 +11,11 @@ public class Commands {
static {
addCommand(new AddDeviceCommand());
addCommand(new GetAttachmentCommand());
addCommand(new BlockCommand());
addCommand(new DaemonCommand());
addCommand(new DeleteLocalAccountDataCommand());
addCommand(new FinishLinkCommand());
addCommand(new GetAttachmentCommand());
addCommand(new GetUserStatusCommand());
addCommand(new JoinGroupCommand());
addCommand(new JsonRpcDispatcherCommand());

19
src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
View File

@ -26,27 +26,20 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
@Override
public void attachToSubparser(final Subparser subparser) {
subparser.addArgument("--id")
.required(true)
.help("The ID of the attachment file.");
var mut = subparser.addMutuallyExclusiveGroup()
.required(true);
mut.addArgument("--recipient")
.help("Sender of the attachment");
mut.addArgument("-g", "--group-id")
.help("Group in which the attachment was received");
subparser.addArgument("--id").required(true).help("The ID of the attachment file.");
var mut = subparser.addMutuallyExclusiveGroup().required(true);
mut.addArgument("--recipient").help("Sender of the attachment");
mut.addArgument("-g", "--group-id").help("Group in which the attachment was received");
}
@Override
public void handleCommand(
final Namespace ns,
final Manager m,
final OutputWriter outputWriter
final Namespace ns, final Manager m, final OutputWriter outputWriter
) throws CommandException {
final var id = ns.getString("id");
try(InputStream attachment = m.retrieveAttachment(id)) {
try (InputStream attachment = m.retrieveAttachment(id)) {
if (outputWriter instanceof PlainTextWriter writer) {
final var bytes = attachment.readAllBytes();
final var base64 = Base64.getEncoder().encodeToString(bytes);

2
src/main/java/org/asamk/signal/json/JsonAttachmentData.java
View File

@ -5,5 +5,5 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.io.InputStream;
public record JsonAttachmentData(
@JsonSerialize(using=JsonStreamSerializer.class) InputStream data
@JsonSerialize(using = JsonStreamSerializer.class) InputStream data
) {}

6
src/main/java/org/asamk/signal/json/JsonStoryMessage.java
View File

@ -43,11 +43,7 @@ record JsonStoryMessage(
}
public record Gradient(
String startColor,
String endColor,
List<String> colors,
List<Float> positions,
Integer angle
String startColor, String endColor, List<String> colors, List<Float> positions, Integer angle
) {
static Gradient from(MessageEnvelope.Story.TextAttachment.Gradient gradient) {

4
src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
View File

@ -11,9 +11,7 @@ public class JsonStreamSerializer extends JsonSerializer<InputStream> {
@Override
public void serialize(
final InputStream value,
final JsonGenerator jsonGenerator,
final SerializerProvider serializers
final InputStream value, final JsonGenerator jsonGenerator, final SerializerProvider serializers
) throws IOException {
jsonGenerator.writeBinary(value, -1);
}

4
src/main/java/org/asamk/signal/util/Hex.java
View File

@ -2,7 +2,9 @@ package org.asamk.signal.util;
public class Hex {
private final static char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
private final static char[] HEX_DIGITS = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
};
private Hex() {
}