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

Split given/family name in updateContact command

Browse source
This commit is contained in:
AsamK 2022-05-29 22:21:24 +02:00
parent 27dbc671e0
commit badbb55ef2
7 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -149,7 +149,7 @@ public interface Manager extends Closeable {
void deleteContact(RecipientIdentifier.Single recipient);
void setContactName(
RecipientIdentifier.Single recipient, String name
RecipientIdentifier.Single recipient, String givenName, final String familyName
) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException;
void setContactsBlocked(

5
lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
View file

@ -705,12 +705,13 @@ class ManagerImpl implements Manager {
@Override
public void setContactName(
RecipientIdentifier.Single recipient, String name
RecipientIdentifier.Single recipient, String givenName, final String familyName
) throws NotPrimaryDeviceException, UnregisteredRecipientException {
if (!account.isPrimaryDevice()) {
throw new NotPrimaryDeviceException();
}
context.getContactHelper().setContactName(context.getRecipientHelper().resolveRecipient(recipient), name);
context.getContactHelper()
.setContactName(context.getRecipientHelper().resolveRecipient(recipient), givenName, familyName);
}
@Override

10
lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
View file

@ -17,10 +17,16 @@ public class ContactHelper {
return sourceContact != null && sourceContact.isBlocked();
}
public void setContactName(final RecipientId recipientId, final String name) {
public void setContactName(final RecipientId recipientId, final String givenName, final String familyName) {
var contact = account.getContactStore().getContact(recipientId);
final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
account.getContactStore().storeContact(recipientId, builder.withGivenName(name).build());
if (givenName != null) {
builder.withGivenName(givenName);
}
if (familyName != null) {
builder.withFamilyName(familyName);
}
account.getContactStore().storeContact(recipientId, builder.build());
}
public void setExpirationTimer(RecipientId recipientId, int messageExpirationTimer) {

7
man/signal-cli.1.adoc
View file

@ -522,8 +522,11 @@ If the contact doesn't exist yet, it will be added.
NUMBER::
Specify the contact phone number.
*-n*, *--name*::
Specify the new name for this contact.
*--given-name* NAME, *--name* NAME::
New (given) name.
*--family-name* FAMILY_NAME::
New family name.
*-e*, *--expiration* EXPIRATION_SECONDS::
Set expiration time of messages (seconds).

15
src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
View file

@ -26,6 +26,8 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
subparser.help("Update the details of a given contact");
subparser.addArgument("recipient").help("Contact number");
subparser.addArgument("-n", "--name").help("New contact name");
subparser.addArgument("--given-name").help("New contact given name");
subparser.addArgument("--family-name").help("New contact family name");
subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
}
@ -42,9 +44,16 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
m.setExpirationTimer(recipient, expiration);
}
var name = ns.getString("name");
if (name != null) {
m.setContactName(recipient, name);
var givenName = ns.getString("given-name");
var familyName = ns.getString("family-name");
if (givenName == null) {
givenName = ns.getString("name");
if (givenName != null && familyName == null) {
familyName = "";
}
}
if (givenName != null || familyName != null) {
m.setContactName(recipient, givenName, familyName);
}
} catch (IOException e) {
throw new IOErrorException("Update contact error: " + e.getMessage(), e);

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

@ -409,9 +409,9 @@ public class DbusManagerImpl implements Manager {
@Override
public void setContactName(
final RecipientIdentifier.Single recipient, final String name
final RecipientIdentifier.Single recipient, final String givenName, final String familyName
) throws NotPrimaryDeviceException {
signal.setContactName(recipient.getIdentifier(), name);
signal.setContactName(recipient.getIdentifier(), givenName);
}
@Override

2
src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
View file

@ -492,7 +492,7 @@ public class DbusSignalImpl implements Signal {
@Override
public void setContactName(final String number, final String name) {
try {
m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name);
m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
} catch (NotPrimaryDeviceException e) {
throw new Error.Failure("This command doesn't work on linked devices.");
} catch (IOException e) {