From cd3621321c9a539d74963771b11fad7a0ac2990b Mon Sep 17 00:00:00 2001
From: Xavi Ferrer <xavi@delape.net>
Date: Mon, 2 Nov 2020 10:29:47 +0100
Subject: [PATCH 1/3] apply Matt's diff
---
src/plugins/converse-rai.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/converse-rai.js b/src/plugins/converse-rai.js
index 4f185fe..e4c837c 100644
--- a/src/plugins/converse-rai.js
+++ b/src/plugins/converse-rai.js
@@ -88,7 +88,8 @@
_converse.on('message', function (data)
{
- var chatbox = data.chatbox;
+ var bareFrom = Strophe.getBareJidFromJid(message.getAttributes("from"));
+ var chatbox = _converse.chatboxes.get(bareFrom);
var message = data.stanza;
var history = message.querySelector('forwarded');
var body = message.querySelector('body');
--
GitLab
From 82e2e3f33ce6511e3b7dc85ddf9d0ba46bc33b5a Mon Sep 17 00:00:00 2001
From: Xavi Ferrer <xavi@delape.net>
Date: Tue, 3 Nov 2020 09:10:33 +0100
Subject: [PATCH 2/3] do not notify if one sends a message. update event hook
to match current version of Converse
---
src/plugins/converse-rai.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/converse-rai.js b/src/plugins/converse-rai.js
index e4c837c..df63ed3 100644
--- a/src/plugins/converse-rai.js
+++ b/src/plugins/converse-rai.js
@@ -86,15 +86,15 @@
});
- _converse.on('message', function (data)
+ _converse.api.listen.on('message', function (data)
{
+ var message = data.stanza;
var bareFrom = Strophe.getBareJidFromJid(message.getAttributes("from"));
var chatbox = _converse.chatboxes.get(bareFrom);
- var message = data.stanza;
var history = message.querySelector('forwarded');
var body = message.querySelector('body');
- if (!history && body && chatbox)
+ if (!history && body && chatbox && message.get('sender') !== 'me')
{
const alert = chatbox.get("num_unread") > 0;
const notify = chatbox.get("num_unread_general") > 0;
--
GitLab
From 403eb32a252910f6de85ed6352b6daa05cf20ca8 Mon Sep 17 00:00:00 2001
From: Xavi Ferrer <xavi@delape.net>
Date: Tue, 3 Nov 2020 10:06:46 +0100
Subject: [PATCH 3/3] fix data accessing
---
src/plugins/converse-rai.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/converse-rai.js b/src/plugins/converse-rai.js
index df63ed3..6b28cd2 100644
--- a/src/plugins/converse-rai.js
+++ b/src/plugins/converse-rai.js
@@ -88,13 +88,12 @@
_converse.api.listen.on('message', function (data)
{
- var message = data.stanza;
- var bareFrom = Strophe.getBareJidFromJid(message.getAttributes("from"));
- var chatbox = _converse.chatboxes.get(bareFrom);
- var history = message.querySelector('forwarded');
- var body = message.querySelector('body');
+ var chatbox = data.chatbox;
+ var history = data.attrs.is_archived;
+ var sender = data.attrs.sender;
+ var body = data.attrs.body;
- if (!history && body && chatbox && message.get('sender') !== 'me')
+ if (!history && body && chatbox && sender !== 'me')
{
const alert = chatbox.get("num_unread") > 0;
const notify = chatbox.get("num_unread_general") > 0;
--
GitLab