mirror of
https://github.com/profanity-im/profanity.git
synced 2025-01-03 14:57:42 -05:00
Merge remote-tracking branch 'lucian/master'
Conflicts: src/server_events.c
This commit is contained in:
commit
1706980fd7
@ -208,21 +208,21 @@ handle_incoming_message(char *from, char *message, gboolean priv)
|
||||
gboolean was_decrypted = FALSE;
|
||||
char *newmessage;
|
||||
|
||||
if (!priv) {
|
||||
char *policy = prefs_get_string(PREF_OTR_POLICY);
|
||||
char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE);
|
||||
|
||||
if (!priv) {
|
||||
//check for OTR whitespace (opportunistic or always)
|
||||
char *policy = prefs_get_string(PREF_OTR_POLICY);
|
||||
if (strcmp(policy, "opportunistic") == 0 || strcmp(policy, "always") == 0) {
|
||||
char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE);
|
||||
if (whitespace_base) {
|
||||
if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) {
|
||||
// Remove whitespace pattern for proper display in UI
|
||||
// Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8)
|
||||
int tag_length = 24;
|
||||
int tag_length = 24;
|
||||
if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) {
|
||||
tag_length = 32;
|
||||
}
|
||||
memmove(whitespace_base, whitespace_base+tag_length, tag_length);
|
||||
log_debug("<%s>", message);
|
||||
char *otr_query_message = otr_start_query();
|
||||
cons_show("OTR Whitespace pattern detected. Attempting to start OTR session...");
|
||||
message_send(otr_query_message, from);
|
||||
@ -238,6 +238,11 @@ handle_incoming_message(char *from, char *message, gboolean priv)
|
||||
} else {
|
||||
newmessage = message;
|
||||
}
|
||||
if (strcmp(policy, "always") == 0 && !was_decrypted && !whitespace_base) {
|
||||
char *otr_query_message = otr_start_query();
|
||||
cons_show("Attempting to start OTR session...");
|
||||
message_send(otr_query_message, from);
|
||||
}
|
||||
|
||||
ui_incoming_msg(from, newmessage, NULL, priv);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user