Show member labels in listGroups command

This commit is contained in:
AsamK 2026-03-08 11:55:19 +01:00
parent 30b57bdb3d
commit 7014f629fe
17 changed files with 210 additions and 66 deletions

View File

@ -12,10 +12,9 @@ public record Group(
String title,
String description,
GroupInviteLinkUrl groupInviteLinkUrl,
Set<RecipientAddress> members,
Set<GroupMember> members,
Set<RecipientAddress> pendingMembers,
Set<RecipientAddress> requestingMembers,
Set<RecipientAddress> adminMembers,
Set<RecipientAddress> bannedMembers,
boolean isBlocked,
int messageExpirationTimer,
@ -37,8 +36,7 @@ public record Group(
groupInfo.getGroupInviteLink(),
groupInfo.getMembers()
.stream()
.map(recipientStore::resolveRecipientAddress)
.map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
.map(m -> org.asamk.signal.manager.api.GroupMember.from(m, recipientStore))
.collect(Collectors.toSet()),
groupInfo.getPendingMembers()
.stream()
@ -50,11 +48,6 @@ public record Group(
.map(recipientStore::resolveRecipientAddress)
.map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
.collect(Collectors.toSet()),
groupInfo.getAdminMembers()
.stream()
.map(recipientStore::resolveRecipientAddress)
.map(org.asamk.signal.manager.storage.recipients.RecipientAddress::toApiRecipientAddress)
.collect(Collectors.toSet()),
groupInfo.getBannedMembers()
.stream()
.map(recipientStore::resolveRecipientAddress)

View File

@ -0,0 +1,14 @@
package org.asamk.signal.manager.api;
import org.asamk.signal.manager.helper.RecipientAddressResolver;
import org.asamk.signal.manager.storage.groups.GroupMemberInfo;
public record GroupMember(
RecipientAddress recipientAddress, boolean isAdmin, String labelEmoji, String label
) {
public static GroupMember from(final GroupMemberInfo memberInfo, final RecipientAddressResolver recipientStore) {
return new GroupMember(recipientStore.resolveRecipientAddress(memberInfo.getRecipientId())
.toApiRecipientAddress(), memberInfo.isAdmin(), memberInfo.labelEmoji(), memberInfo.labelString());
}
}

View File

@ -758,7 +758,7 @@ public class GroupHelper {
if (admins != null) {
final var newAdmins = new HashSet<>(admins);
newAdmins.retainAll(group.getMembers());
newAdmins.removeAll(group.getAdminMembers());
newAdmins.removeAll(group.getAdminMemberRecipientIds());
if (!newAdmins.isEmpty()) {
for (var admin : newAdmins) {
var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, true);
@ -771,7 +771,7 @@ public class GroupHelper {
if (removeAdmins != null) {
final var existingRemoveAdmins = new HashSet<>(removeAdmins);
existingRemoveAdmins.retainAll(group.getAdminMembers());
existingRemoveAdmins.retainAll(group.getAdminMemberRecipientIds());
if (!existingRemoveAdmins.isEmpty()) {
for (var admin : existingRemoveAdmins) {
var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, false);
@ -859,7 +859,7 @@ public class GroupHelper {
final GroupInfoV2 groupInfoV2,
final Set<RecipientId> newAdmins
) throws LastGroupAdminException, IOException {
final var currentAdmins = groupInfoV2.getAdminMembers();
final var currentAdmins = groupInfoV2.getAdminMemberRecipientIds();
newAdmins.removeAll(currentAdmins);
newAdmins.retainAll(groupInfoV2.getMembers());
if (currentAdmins.contains(account.getSelfRecipientId())
@ -888,7 +888,7 @@ public class GroupHelper {
var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
.withId(g.getGroupId().serialize())
.withName(g.name)
.withMembers(g.getMembers()
.withMembers(g.getMemberRecipientIds()
.stream()
.map(context.getRecipientHelper()::resolveSignalServiceAddress)
.toList());

View File

@ -320,7 +320,9 @@ public class SendHelper {
messageBuilder.withExpiration(g.getMessageExpirationTimer());
final var message = messageBuilder.build();
final var recipients = includeSelf ? g.getMembers() : g.getMembersWithout(account.getSelfRecipientId());
final var recipients = includeSelf
? g.getMemberRecipientIds()
: g.getMembersWithout(account.getSelfRecipientId());
if (g.isAnnouncementGroup() && !g.isAdmin(account.getSelfRecipientId())) {
if (message.getBody().isPresent()

View File

@ -114,7 +114,7 @@ public class SyncHelper {
if (record instanceof GroupInfoV1 groupInfo) {
out.write(new DeviceGroup(groupInfo.getGroupId().serialize(),
Optional.ofNullable(groupInfo.name),
groupInfo.getMembers()
groupInfo.getMemberRecipientIds()
.stream()
.map(context.getRecipientHelper()::resolveSignalServiceAddress)
.toList(),

View File

@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.GroupPermission;
import org.asamk.signal.manager.storage.recipients.RecipientId;
import org.whispersystems.signalservice.api.push.DistributionId;
import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -24,7 +25,11 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
public abstract GroupInviteLinkUrl getGroupInviteLink();
public abstract Set<RecipientId> getMembers();
public abstract Collection<GroupMemberInfo> getMembers();
public Set<RecipientId> getMemberRecipientIds() {
return getMembers().stream().map(GroupMemberInfo::getRecipientId).collect(Collectors.toSet());
}
public Set<RecipientId> getBannedMembers() {
return Set.of();
@ -38,7 +43,7 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
return Set.of();
}
public Set<RecipientId> getAdminMembers() {
public Set<RecipientId> getAdminMemberRecipientIds() {
return Set.of();
}
@ -61,21 +66,23 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
public abstract GroupPermission getPermissionSendMessage();
public Set<RecipientId> getMembersWithout(RecipientId recipientId) {
return getMembers().stream().filter(member -> !member.equals(recipientId)).collect(Collectors.toSet());
return getMemberRecipientIds().stream()
.filter(member -> !member.equals(recipientId))
.collect(Collectors.toSet());
}
public Set<RecipientId> getMembersIncludingPendingWithout(RecipientId recipientId) {
return Stream.concat(getMembers().stream(), getPendingMembers().stream())
return Stream.concat(getMemberRecipientIds().stream(), getPendingMembers().stream())
.filter(member -> !member.equals(recipientId))
.collect(Collectors.toSet());
}
public boolean isMember(RecipientId recipientId) {
return getMembers().contains(recipientId);
return getMembers().stream().anyMatch(m -> m.getRecipientId().equals(recipientId));
}
public boolean isAdmin(RecipientId recipientId) {
return getAdminMembers().contains(recipientId);
return getMembers().stream().anyMatch(m -> m.isAdmin() && m.getRecipientId().equals(recipientId));
}
public boolean isPendingMember(RecipientId recipientId) {

View File

@ -80,8 +80,8 @@ public final class GroupInfoV1 extends GroupInfo {
return null;
}
public Set<RecipientId> getMembers() {
return new HashSet<>(members);
public Collection<GroupMemberInfo> getMembers() {
return members.stream().map(m -> (GroupMemberInfo) new GroupMemberInfoV1(m)).toList();
}
@Override

View File

@ -3,18 +3,17 @@ package org.asamk.signal.manager.storage.groups;
import org.asamk.signal.manager.api.GroupIdV2;
import org.asamk.signal.manager.api.GroupInviteLinkUrl;
import org.asamk.signal.manager.api.GroupPermission;
import org.asamk.signal.manager.storage.recipients.RecipientAddress;
import org.asamk.signal.manager.storage.recipients.RecipientId;
import org.asamk.signal.manager.storage.recipients.RecipientResolver;
import org.signal.core.models.ServiceId;
import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
import org.signal.storageservice.storage.protos.groups.AccessControl;
import org.signal.storageservice.storage.protos.groups.Member;
import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup;
import org.signal.storageservice.storage.protos.groups.local.EnabledState;
import org.whispersystems.signalservice.api.push.DistributionId;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;
@ -122,14 +121,11 @@ public final class GroupInfoV2 extends GroupInfo {
}
@Override
public Set<RecipientId> getMembers() {
public Collection<GroupMemberInfo> getMembers() {
if (this.group == null) {
return Set.of();
}
return group.members.stream()
.map(m -> ServiceId.parseOrThrow(m.aciBytes))
.map(recipientResolver::resolveRecipient)
.collect(Collectors.toSet());
return group.members.stream().map(m -> (GroupMemberInfo) new GroupMemberInfoV2(m, recipientResolver)).toList();
}
@Override
@ -175,16 +171,11 @@ public final class GroupInfoV2 extends GroupInfo {
}
@Override
public Set<RecipientId> getAdminMembers() {
if (this.group == null) {
return Set.of();
}
return group.members.stream()
.filter(m -> m.role == Member.Role.ADMINISTRATOR)
.map(m -> new RecipientAddress(ServiceId.ACI.parseOrNull(m.aciBytes),
ServiceId.PNI.parseOrNull(m.pniBytes),
null))
.map(recipientResolver::resolveRecipient)
public Set<RecipientId> getAdminMemberRecipientIds() {
return this.getMembers()
.stream()
.filter(GroupMemberInfo::isAdmin)
.map(GroupMemberInfo::getRecipientId)
.collect(Collectors.toSet());
}

View File

@ -0,0 +1,20 @@
package org.asamk.signal.manager.storage.groups;
import org.asamk.signal.manager.storage.recipients.RecipientId;
public interface GroupMemberInfo {
RecipientId getRecipientId();
default boolean isAdmin() {
return false;
}
default String labelEmoji() {
return null;
}
default String labelString() {
return null;
}
}

View File

@ -0,0 +1,17 @@
package org.asamk.signal.manager.storage.groups;
import org.asamk.signal.manager.storage.recipients.RecipientId;
public class GroupMemberInfoV1 implements GroupMemberInfo {
private final RecipientId recipientId;
public GroupMemberInfoV1(final RecipientId recipientId) {
this.recipientId = recipientId;
}
@Override
public RecipientId getRecipientId() {
return this.recipientId;
}
}

View File

@ -0,0 +1,38 @@
package org.asamk.signal.manager.storage.groups;
import org.asamk.signal.manager.storage.recipients.RecipientId;
import org.asamk.signal.manager.storage.recipients.RecipientResolver;
import org.signal.core.models.ServiceId;
import org.signal.storageservice.storage.protos.groups.Member;
import org.signal.storageservice.storage.protos.groups.local.DecryptedMember;
public class GroupMemberInfoV2 implements GroupMemberInfo {
private final RecipientResolver recipientResolver;
private final DecryptedMember member;
public GroupMemberInfoV2(final DecryptedMember member, final RecipientResolver recipientResolver) {
this.recipientResolver = recipientResolver;
this.member = member;
}
@Override
public RecipientId getRecipientId() {
return recipientResolver.resolveRecipient(ServiceId.ACI.parseOrThrow(member.aciBytes));
}
@Override
public boolean isAdmin() {
return member.role == Member.Role.ADMINISTRATOR;
}
@Override
public String labelEmoji() {
return member.labelEmoji.isEmpty() ? null : member.labelEmoji;
}
@Override
public String labelString() {
return member.labelString.isEmpty() ? null : member.labelString;
}
}

View File

@ -648,7 +648,7 @@ public class GroupStore {
ON CONFLICT (group_id, recipient_id) DO NOTHING
""".formatted(TABLE_GROUP_V1_MEMBER);
try (final var statement = connection.prepareStatement(sqlInsertMember)) {
for (final var recipient : groupV1.getMembers()) {
for (final var recipient : groupV1.getMemberRecipientIds()) {
statement.setLong(1, internalId);
statement.setLong(2, recipient.id());
statement.executeUpdate();

View File

@ -133,6 +133,11 @@ public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
return getPreKey(keyId) != null;
}
/**
* When we mark Kyber pre-keys used, we want to keep a record of last resort tuples, which are deleted when the key
* itself is deleted from this table via a cascading delete.
* For non-last-resort keys, this method just deletes them like normal.
*/
@Override
public void markKyberPreKeyUsed(
final int kyberPreKeyId,

View File

@ -1,5 +1,7 @@
package org.asamk.signal.commands;
import com.fasterxml.jackson.annotation.JsonInclude;
import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
@ -7,6 +9,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.api.Group;
import org.asamk.signal.manager.api.GroupMember;
import org.asamk.signal.manager.api.RecipientAddress;
import org.asamk.signal.output.JsonWriter;
import org.asamk.signal.output.OutputWriter;
@ -37,33 +40,55 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
subparser.addArgument("-g", "--group-id").help("Specify one or more group IDs to show.").nargs("*");
}
private static Set<String> resolveMembers(Set<RecipientAddress> addresses) {
private static Set<String> resolveMembers(Set<GroupMember> addresses) {
return addresses.stream()
.map(m -> m.recipientAddress().getLegacyIdentifier() + (m.isAdmin() ? "{ADMIN}" : "") + (
m.labelEmoji() != null || m.label() != null ? "(" + (
m.labelEmoji() != null ? m.labelEmoji() : ""
) + (
m.label() != null ? m.label() : ""
) + ")" : ""
))
.collect(Collectors.toSet());
}
private static Set<String> resolveMemberAddress(Set<RecipientAddress> addresses) {
return addresses.stream().map(RecipientAddress::getLegacyIdentifier).collect(Collectors.toSet());
}
private static Set<JsonGroupMember> resolveJsonMembers(Set<RecipientAddress> addresses) {
private static Set<JsonGroupMemberAddress> resolveJsonMembers(Set<RecipientAddress> addresses) {
return addresses.stream()
.map(address -> new JsonGroupMember(address.number().orElse(null),
.map(address -> new JsonGroupMemberAddress(address.number().orElse(null),
address.uuid().map(UUID::toString).orElse(null)))
.collect(Collectors.toSet());
}
private static Set<JsonGroupMember> resolveFullJsonMembers(Set<GroupMember> addresses) {
return addresses.stream().map(member -> {
final var address = member.recipientAddress();
return new JsonGroupMember(address.number().orElse(null),
address.uuid().map(UUID::toString).orElse(null),
member.isAdmin(),
member.labelEmoji(),
member.label());
}).collect(Collectors.toSet());
}
private static void printGroupPlainText(PlainTextWriter writer, Group group, boolean detailed) {
if (detailed) {
final var groupInviteLink = group.groupInviteLinkUrl();
writer.println(
"Id: {} Name: {} Description: {} Active: {} Blocked: {} Members: {} Pending members: {} Requesting members: {} Admins: {} Banned: {} Message expiration: {} Link: {}",
"Id: {} Name: {} Description: {} Active: {} Blocked: {} Members: {} Pending members: {} Requesting members: {} Banned: {} Message expiration: {} Link: {}",
group.groupId().toBase64(),
group.title(),
group.description(),
group.isMember(),
group.isBlocked(),
resolveMembers(group.members()),
resolveMembers(group.pendingMembers()),
resolveMembers(group.requestingMembers()),
resolveMembers(group.adminMembers()),
resolveMembers(group.bannedMembers()),
resolveMemberAddress(group.pendingMembers()),
resolveMemberAddress(group.requestingMembers()),
resolveMemberAddress(group.bannedMembers()),
group.messageExpirationTimer() == 0 ? "disabled" : group.messageExpirationTimer() + "s",
groupInviteLink == null ? '-' : groupInviteLink.getUrl());
} else {
@ -96,10 +121,14 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
group.isMember(),
group.isBlocked(),
group.messageExpirationTimer(),
resolveJsonMembers(group.members()),
resolveFullJsonMembers(group.members()),
resolveJsonMembers(group.pendingMembers()),
resolveJsonMembers(group.requestingMembers()),
resolveJsonMembers(group.adminMembers()),
resolveJsonMembers(group.members()
.stream()
.filter(GroupMember::isAdmin)
.map(GroupMember::recipientAddress)
.collect(Collectors.toSet())),
resolveJsonMembers(group.bannedMembers()),
group.permissionAddMember().name(),
group.permissionEditDetails().name(),
@ -125,15 +154,23 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
boolean isBlocked,
int messageExpirationTime,
Set<JsonGroupMember> members,
Set<JsonGroupMember> pendingMembers,
Set<JsonGroupMember> requestingMembers,
Set<JsonGroupMember> admins,
Set<JsonGroupMember> banned,
Set<JsonGroupMemberAddress> pendingMembers,
Set<JsonGroupMemberAddress> requestingMembers,
@Deprecated Set<JsonGroupMemberAddress> admins,
Set<JsonGroupMemberAddress> banned,
String permissionAddMember,
String permissionEditDetails,
String permissionSendMessage,
String groupInviteLink
) {}
private record JsonGroupMember(String number, String uuid) {}
private record JsonGroupMemberAddress(String number, String uuid) {}
private record JsonGroupMember(
String number,
String uuid,
boolean isAdmin,
@JsonInclude(JsonInclude.Include.NON_NULL) String labelEmoji,
@JsonInclude(JsonInclude.Include.NON_NULL) String label
) {}
}

View File

@ -12,6 +12,7 @@ import org.asamk.signal.manager.api.DeviceLinkUrl;
import org.asamk.signal.manager.api.Group;
import org.asamk.signal.manager.api.GroupId;
import org.asamk.signal.manager.api.GroupInviteLinkUrl;
import org.asamk.signal.manager.api.GroupMember;
import org.asamk.signal.manager.api.GroupNotFoundException;
import org.asamk.signal.manager.api.GroupPermission;
import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
@ -834,24 +835,22 @@ public class DbusManagerImpl implements Manager {
final var group = getRemoteObject(groupPath, Signal.Group.class).GetAll("org.asamk.Signal.Group");
final var id = (byte[]) group.get("Id").getValue();
try {
final var admins = new HashSet<>(((List<String>) group.get("Admins").getValue()));
return new Group(GroupId.unknownVersion(id),
(String) group.get("Name").getValue(),
(String) group.get("Description").getValue(),
GroupInviteLinkUrl.fromUri((String) group.get("GroupInviteLink").getValue()),
((List<String>) group.get("Members").getValue()).stream()
.map(m -> new RecipientAddress(m))
.map(m -> new GroupMember(new RecipientAddress(m), admins.contains(m), null, null))
.collect(Collectors.toSet()),
((List<String>) group.get("PendingMembers").getValue()).stream()
.map(m -> new RecipientAddress(m))
.map(RecipientAddress::new)
.collect(Collectors.toSet()),
((List<String>) group.get("RequestingMembers").getValue()).stream()
.map(m -> new RecipientAddress(m))
.collect(Collectors.toSet()),
((List<String>) group.get("Admins").getValue()).stream()
.map(m -> new RecipientAddress(m))
.map(RecipientAddress::new)
.collect(Collectors.toSet()),
((List<String>) group.get("Banned").getValue()).stream()
.map(m -> new RecipientAddress(m))
.map(RecipientAddress::new)
.collect(Collectors.toSet()),
(boolean) group.get("IsBlocked").getValue(),
(int) group.get("MessageExpirationTimer").getValue(),

View File

@ -10,6 +10,7 @@ import org.asamk.signal.manager.api.DeviceLinkUrl;
import org.asamk.signal.manager.api.GroupId;
import org.asamk.signal.manager.api.GroupInviteLinkUrl;
import org.asamk.signal.manager.api.GroupLinkState;
import org.asamk.signal.manager.api.GroupMember;
import org.asamk.signal.manager.api.GroupNotFoundException;
import org.asamk.signal.manager.api.GroupPermission;
import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
@ -624,7 +625,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
if (group == null) {
return List.of();
} else {
final var members = group.members();
final var members = group.members().stream().map(GroupMember::recipientAddress).collect(Collectors.toSet());
return getRecipientStrings(members);
}
}
@ -1300,13 +1301,20 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
() -> getGroup().messageExpirationTimer(),
this::setMessageExpirationTime),
new DbusProperty<>("Members",
() -> new Variant<>(getRecipientStrings(getGroup().members()), "as")),
() -> new Variant<>(getRecipientStrings(getGroup().members()
.stream()
.map(GroupMember::recipientAddress)
.collect(Collectors.toSet())), "as")),
new DbusProperty<>("PendingMembers",
() -> new Variant<>(getRecipientStrings(getGroup().pendingMembers()), "as")),
new DbusProperty<>("RequestingMembers",
() -> new Variant<>(getRecipientStrings(getGroup().requestingMembers()), "as")),
new DbusProperty<>("Admins",
() -> new Variant<>(getRecipientStrings(getGroup().adminMembers()), "as")),
() -> new Variant<>(getRecipientStrings(getGroup().members()
.stream()
.filter(GroupMember::isAdmin)
.map(GroupMember::recipientAddress)
.collect(Collectors.toSet())), "as")),
new DbusProperty<>("Banned",
() -> new Variant<>(getRecipientStrings(getGroup().bannedMembers()), "as")),
new DbusProperty<>("PermissionAddMember",

View File

@ -2048,6 +2048,19 @@
"allDeclaredMethods": true,
"allDeclaredConstructors": true
},
{
"type": "org.asamk.signal.commands.ListGroupsCommand$JsonGroupMemberAddress",
"methods": [
{
"name": "number",
"parameterTypes": []
},
{
"name": "uuid",
"parameterTypes": []
}
]
},
{
"type": "org.asamk.signal.commands.ListIdentitiesCommand$JsonIdentity",
"allDeclaredFields": true,