mirror of
https://github.com/profanity-im/profanity.git
synced 2024-09-01 19:24:15 -04:00
Merge pull request #1707 from profanity-im/change-redact-defaults
Log encrypted messages by default to chatlog
This commit is contained in:
commit
6807f0775c
@ -1742,7 +1742,7 @@ static struct cmd_t command_defs[] = {
|
||||
{ "start [<contact>]", "Start PGP encrypted chat, current contact will be used if not specified." },
|
||||
{ "end", "End PGP encrypted chat with the current recipient." },
|
||||
{ "log on|off", "Enable or disable plaintext logging of PGP encrypted messages." },
|
||||
{ "log redact", "Log PGP encrypted messages, but replace the contents with [redacted]. This is the default." },
|
||||
{ "log redact", "Log PGP encrypted messages, but replace the contents with [redacted]." },
|
||||
{ "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 OpenPGP Key IDs will be displayed" },
|
||||
@ -1811,7 +1811,7 @@ static struct cmd_t command_defs[] = {
|
||||
{ "policy always", "Set the global OTR policy to always, an error will be displayed if an OTR session cannot be initiated upon starting a conversation." },
|
||||
{ "policy always <contact>", "Set the OTR policy to always for a specific contact." },
|
||||
{ "log on|off", "Enable or disable plaintext logging of OTR encrypted messages." },
|
||||
{ "log redact", "Log OTR encrypted messages, but replace the contents with [redacted]. This is the default." },
|
||||
{ "log redact", "Log OTR encrypted messages, but replace the contents with [redacted]." },
|
||||
{ "char <char>", "Set the character to be displayed next to OTR encrypted messages." },
|
||||
{ "sendfile on|off", "Allow /sendfile to send unencrypted files while in an OTR session." })
|
||||
CMD_EXAMPLES(
|
||||
@ -2335,7 +2335,7 @@ static struct cmd_t command_defs[] = {
|
||||
{ "start [<contact>]", "Start an OMEMO session with contact, or current recipient if omitted." },
|
||||
{ "end", "End the current OMEMO session." },
|
||||
{ "log on|off", "Enable or disable plaintext logging of OMEMO encrypted messages." },
|
||||
{ "log redact", "Log OMEMO encrypted messages, but replace the contents with [redacted]. This is the default." },
|
||||
{ "log redact", "Log OMEMO encrypted messages, but replace the contents with [redacted]." },
|
||||
{ "fingerprint [<contact>]", "Show contact fingerprints, or current recipient if omitted." },
|
||||
{ "char <char>", "Set the character to be displayed next to OMEMO encrypted messages." },
|
||||
{ "trustmode manual", "Set the global OMEMO trust mode to manual, OMEMO keys has to be trusted manually." },
|
||||
|
@ -2223,7 +2223,7 @@ _get_default_string(preference_t pref)
|
||||
case PREF_AUTOAWAY_MODE:
|
||||
return "off";
|
||||
case PREF_OTR_LOG:
|
||||
return "redact";
|
||||
return "on";
|
||||
case PREF_OTR_POLICY:
|
||||
return "manual";
|
||||
case PREF_STATUSES_CONSOLE:
|
||||
@ -2267,7 +2267,7 @@ _get_default_string(preference_t pref)
|
||||
case PREF_TIME_LASTACTIVITY:
|
||||
return "%d/%m/%y %H:%M:%S";
|
||||
case PREF_PGP_LOG:
|
||||
return "redact";
|
||||
return "on";
|
||||
case PREF_CONSOLE_MUC:
|
||||
case PREF_CONSOLE_PRIVATE:
|
||||
case PREF_CONSOLE_CHAT:
|
||||
@ -2279,7 +2279,7 @@ _get_default_string(preference_t pref)
|
||||
case PREF_STATUSBAR_ROOM:
|
||||
return "room";
|
||||
case PREF_OMEMO_LOG:
|
||||
return "redact";
|
||||
return "on";
|
||||
case PREF_OMEMO_POLICY:
|
||||
return "automatic";
|
||||
case PREF_OMEMO_TRUST_MODE:
|
||||
@ -2302,7 +2302,7 @@ _get_default_string(preference_t pref)
|
||||
case PREF_URL_SAVE_CMD:
|
||||
return NULL; // Default to built-in method.
|
||||
case PREF_OX_LOG:
|
||||
return "redact";
|
||||
return "on";
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user