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

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

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) {