about summary refs log tree commit diff stats
path: root/src/command
diff options
context:
space:
mode:
authorDebXWoody <stefan@debxwoody.de>2021-07-01 18:08:40 +0200
committerDebXWoody <stefan@debxwoody.de>2021-07-01 18:08:40 +0200
commitd01ba7253539e34fc3d1cf953298791219d5c6a6 (patch)
tree228d6abdfb029a91b32aef505932fffd3c1e1f09 /src/command
parent6173e015f5e9b3751c94c03ac47fbdf8099cee24 (diff)
downloadprofani-tty-d01ba7253539e34fc3d1cf953298791219d5c6a6.tar.gz
OX bug fix
 * Help / message description
 * C-Code format
Diffstat (limited to 'src/command')
-rw-r--r--src/command/cmd_defs.c7
-rw-r--r--src/command/cmd_funcs.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index b0076237..3223ff40 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -1720,8 +1720,9 @@ static struct cmd_t command_defs[] = {
               "/ox discover <jid>",
               "/ox request <jid> <keyid>")
       CMD_DESC(
-             "OpenPGP (OX) commands to manage keys, and perform OpenPGP encryption during chat sessions."
-              "Your key need a OpenPGP UI with xmpp:local@domain.tld as name.")
+             "OpenPGP (OX) commands to manage keys, and perform OpenPGP encryption during chat sessions. "
+             "Your OpenPGP key needs a user-id with your JID URI (xmpp:local@domain.tld). "
+             "A key can be generated with \"gpg --quick-gen-key xmpp:local@domain.tld future-default default 3y\".")
       CMD_ARGS(
               { "keys", "List all keys known to the system." },
               { "contacts", "Show contacts with assigned public keys." },
@@ -1731,7 +1732,7 @@ static struct cmd_t command_defs[] = {
               { "log redact", "Log PGP encrypted messages, but replace the contents with [redacted]. This is the default." },
               { "char <char>", "Set the character to be displayed next to PGP encrypted messages." },
               { "announce <file>", "Announce a public key by pushing it on the XMPP Server" },
-              { "discover <jid>", "Discover public keys of a jid. The keyids will be displayed" },
+              { "discover <jid>", "Discover public keys of a jid. The OpenPGP Key IDs will be displayed" },
               { "request <jid>", "Request public keys" },
               { "sendfile on|off", "Allow /sendfile to send unencrypted files while otherwise using PGP." })
       CMD_EXAMPLES(
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 185c55a0..6f3068ee 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -7619,7 +7619,7 @@ cmd_ox(ProfWin* window, const char* const command, gchar** args)
         if (args[1] && args[2]) {
             ox_request_public_key(args[1], args[2]);
         } else {
-            cons_show("JID and KeyID is required");
+            cons_show("JID and OpenPGP Key ID are required");
         }
     } else {
         cons_show("OX not implemented");