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

Handle send failures as non fatal and return detailed results in json output

Browse source 
Fixes #348
This commit is contained in:
AsamK 2021-12-11 12:44:11 +01:00
parent ceafe96e81
commit 06e93b84da
13 changed files with 191 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
View file

@ -13,13 +13,12 @@ import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
import org.asamk.signal.output.JsonWriter;
import org.asamk.signal.output.OutputWriter;
import org.asamk.signal.output.PlainTextWriter;
import org.asamk.signal.util.SendMessageResultUtils;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
import java.io.IOException;
import java.util.Map;
import static org.asamk.signal.util.ErrorUtils.handleSendMessageResults;
public class JoinGroupCommand implements JsonRpcLocalCommand {
@Override
@ -55,10 +54,23 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
final var results = m.joinGroup(linkUrl);
var newGroupId = results.first();
if (outputWriter instanceof JsonWriter writer) {
var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results());
if (!m.getGroup(newGroupId).isMember()) {
writer.write(Map.of("groupId", newGroupId.toBase64(), "onlyRequested", true));
writer.write(Map.of("timestamp",
results.second().timestamp(),
"results",
jsonResults,
"groupId",
newGroupId.toBase64(),
"onlyRequested",
true));
} else {
writer.write(Map.of("groupId", newGroupId.toBase64()));
writer.write(Map.of("timestamp",
results.second().timestamp(),
"results",
jsonResults,
"groupId",
newGroupId.toBase64()));
}
} else {
final var writer = (PlainTextWriter) outputWriter;
@ -67,8 +79,10 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
} else {
writer.println("Joined group \"{}\"", newGroupId.toBase64());
}
var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second().results());
SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
writer.println("{}", results.second().timestamp());
}
handleSendMessageResults(results.second().results());
} catch (IOException e) {
throw new IOErrorException("Failed to send message: "
+ e.getMessage()