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

Implement reacting to stories

Browse Source
This commit is contained in:
AsamK 2022-10-30 14:41:02 +01:00
parent 207764e0be
commit fea19c9e20
9 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/cli.rs
View File

@ -193,6 +193,9 @@ pub enum CliCommands {
#[arg(short = 'r', long)]
remove: bool,
#[arg(long)]
story: bool,
},
SendReceipt {
recipient: String,

1
client/src/jsonrpc.rs
View File

@ -155,6 +155,7 @@ pub trait Rpc {
#[allow(non_snake_case)] targetAuthor: String,
#[allow(non_snake_case)] targetTimestamp: u64,
remove: bool,
story: bool,
) -> Result<Value>;
#[rpc(name = "sendReceipt", params = "named")]

2
client/src/main.rs
View File

@ -164,6 +164,7 @@ async fn main() -> Result<(), anyhow::Error> {
target_author,
target_timestamp,
remove,
story,
} => {
client
.send_reaction(
@ -175,6 +176,7 @@ async fn main() -> Result<(), anyhow::Error> {
target_author,
target_timestamp,
remove,
story,
)
.await
}

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

@ -136,7 +136,8 @@ public interface Manager extends Closeable {
boolean remove,
RecipientIdentifier.Single targetAuthor,
long targetSentTimestamp,
Set<RecipientIdentifier> recipients
Set<RecipientIdentifier> recipients,
final boolean isStory
) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException;
SendMessageResults sendPaymentNotificationMessage(

15
lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
View File

@ -667,14 +667,19 @@ class ManagerImpl implements Manager {
boolean remove,
RecipientIdentifier.Single targetAuthor,
long targetSentTimestamp,
Set<RecipientIdentifier> recipients
Set<RecipientIdentifier> recipients,
final boolean isStory
) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException {
var targetAuthorRecipientId = context.getRecipientHelper().resolveRecipient(targetAuthor);
var reaction = new SignalServiceDataMessage.Reaction(emoji,
remove,
context.getRecipientHelper().resolveSignalServiceAddress(targetAuthorRecipientId).getServiceId(),
targetSentTimestamp);
final var authorServiceId = context.getRecipientHelper()
.resolveSignalServiceAddress(targetAuthorRecipientId)
.getServiceId();
var reaction = new SignalServiceDataMessage.Reaction(emoji, remove, authorServiceId, targetSentTimestamp);
final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
if (isStory) {
messageBuilder.withStoryContext(new SignalServiceDataMessage.StoryContext(authorServiceId,
targetSentTimestamp));
}
return sendMessage(messageBuilder, recipients);
}

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

@ -313,6 +313,9 @@ Specify the timestamp of the message to which to react.
*-r*, *--remove*::
Remove a reaction.
*--story*::
React to a story instead of a normal message
=== sendReceipt
Send a read or viewed receipt to a previously received message.

7
src/main/java/org/asamk/signal/commands/SendReactionCommand.java
View File

@ -45,6 +45,9 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
.type(long.class)
.help("Specify the timestamp of the message to which to react.");
subparser.addArgument("-r", "--remove").help("Remove a reaction.").action(Arguments.storeTrue());
subparser.addArgument("--story")
.help("React to a story instead of a normal message")
.action(Arguments.storeTrue());
}
@Override
@ -64,13 +67,15 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
final var isRemove = Boolean.TRUE.equals(ns.getBoolean("remove"));
final var targetAuthor = ns.getString("target-author");
final var targetTimestamp = ns.getLong("target-timestamp");
final var isStory = Boolean.TRUE.equals(ns.getBoolean("story"));
try {
final var results = m.sendMessageReaction(emoji,
isRemove,
CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
targetTimestamp,
recipientIdentifiers);
recipientIdentifiers,
isStory);
outputResult(outputWriter, results);
} catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new UserErrorException(e.getMessage());

3
src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
View File

@ -364,7 +364,8 @@ public class DbusManagerImpl implements Manager {
final boolean remove,
final RecipientIdentifier.Single targetAuthor,
final long targetSentTimestamp,
final Set<RecipientIdentifier> recipients
final Set<RecipientIdentifier> recipients,
final boolean isStory
) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
return handleMessage(recipients,
numbers -> signal.sendMessageReaction(emoji,

6
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View File

@ -287,7 +287,8 @@ public class DbusSignalImpl implements Signal {
targetSentTimestamp,
getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
.map(RecipientIdentifier.class::cast)
.collect(Collectors.toSet()));
.collect(Collectors.toSet()),
false);
checkSendMessageResults(results);
return results.timestamp();
} catch (IOException e) {
@ -485,7 +486,8 @@ public class DbusSignalImpl implements Signal {
remove,
getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
targetSentTimestamp,
Set.of(getGroupRecipientIdentifier(groupId)));
Set.of(getGroupRecipientIdentifier(groupId)),
false);
checkSendMessageResults(results);
return results.timestamp();
} catch (IOException e) {