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

Extend listContacts command with profiles and filtering

Browse source
This commit is contained in:
AsamK 2022-05-20 11:46:03 +02:00
parent 496cd5e621
commit 5f941004f5
11 changed files with 196 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
View file

@ -32,6 +32,7 @@ import org.asamk.signal.manager.groups.LastGroupAdminException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
import org.asamk.signal.manager.storage.recipients.Contact;
import org.asamk.signal.manager.storage.recipients.Profile;
import org.asamk.signal.manager.storage.recipients.Recipient;
import org.asamk.signal.manager.storage.recipients.RecipientAddress;
import org.freedesktop.dbus.DBusMap;
import org.freedesktop.dbus.DBusPath;
@ -547,14 +548,32 @@ public class DbusManagerImpl implements Manager {
}
@Override
public List<Pair<RecipientAddress, Contact>> getContacts() {
return signal.listNumbers().stream().map(n -> {
final var contactName = signal.getContactName(n);
if (contactName.length() == 0) {
public List<Recipient> getRecipients(
final boolean onlyContacts,
final Optional<Boolean> blocked,
final Collection<RecipientIdentifier.Single> addresses,
final Optional<String> name
) {
final var numbers = addresses.stream()
.filter(s -> s instanceof RecipientIdentifier.Number)
.map(s -> ((RecipientIdentifier.Number) s).number())
.collect(Collectors.toSet());
return signal.listNumbers().stream().filter(n -> addresses.isEmpty() || numbers.contains(n)).map(n -> {
final var contactBlocked = signal.isContactBlocked(n);
if (blocked.isPresent() && blocked.get() != contactBlocked) {
return null;
}
return new Pair<>(new RecipientAddress(null, n),
new Contact(contactName, null, 0, signal.isContactBlocked(n), false, false));
final var contactName = signal.getContactName(n);
if (onlyContacts && contactName.length() == 0) {
return null;
}
if (name.isPresent() && !name.get().equals(contactName)) {
return null;
}
return Recipient.newBuilder()
.withAddress(new RecipientAddress(null, n))
.withContact(new Contact(contactName, null, 0, contactBlocked, false, false))
.build();
}).filter(Objects::nonNull).toList();
}