webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-03 04:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added mentions data to dbus Message and SyncMessage.

Browse source
This commit is contained in:
Patrick Connolly 2021-05-08 00:12:37 -04:00
parent f43acc5c60
commit 9ed901096c
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
View file

@ -1,6 +1,7 @@
package org.asamk.signal; package org.asamk.signal;
import org.asamk.Signal; import org.asamk.Signal;
import org.asamk.signal.json.JsonMention;
import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.groups.GroupUtils; import org.asamk.signal.manager.groups.GroupUtils;
import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.connections.impl.DBusConnection;
@ -72,7 +73,8 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
sender.getLegacyIdentifier(), sender.getLegacyIdentifier(),
groupId != null ? groupId : new byte[0], groupId != null ? groupId : new byte[0],
message.getBody().isPresent() ? message.getBody().get() : "", message.getBody().isPresent() ? message.getBody().get() : "",
JsonDbusReceiveMessageHandler.getAttachments(message, m))); JsonDbusReceiveMessageHandler.getAttachments(message, m),
JsonDbusReceiveMessageHandler.getMentions(message, m)));
} catch (DBusException e) { } catch (DBusException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -97,7 +99,8 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
.getLegacyIdentifier() : "", .getLegacyIdentifier() : "",
groupId != null ? groupId : new byte[0], groupId != null ? groupId : new byte[0],
message.getBody().isPresent() ? message.getBody().get() : "", message.getBody().isPresent() ? message.getBody().get() : "",
JsonDbusReceiveMessageHandler.getAttachments(message, m))); JsonDbusReceiveMessageHandler.getAttachments(message, m)
JsonDbusReceiveMessageHandler.getMentions(message, m)));
} catch (DBusException e) { } catch (DBusException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -124,6 +127,18 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
return attachments; return attachments;
} }
static private List<String> getMentions(SignalServiceDataMessage message, Manager m) {
var mentions = new ArrayList<String>();
if (message.getMentions().isPresent()) {
for (var mention : message.getMentions().get()) {
if (mention.isPointer()) {
mentions.add(new JsonMention(mention, m));
}
}
}
return mentions;
}
@Override @Override
public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) { public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
super.handleMessage(envelope, content, exception); super.handleMessage(envelope, content, exception);