Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
6bfcce5f
Commit
6bfcce5f
authored
May 30, 2016
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't ignore incoming messages from current JID
they might be MAM archived messages. Fixes #650
parent
2b88db81
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
docs/CHANGES.md
docs/CHANGES.md
+3
-2
src/converse-core.js
src/converse-core.js
+0
-6
No files found.
docs/CHANGES.md
View file @
6bfcce5f
...
@@ -3,14 +3,15 @@
...
@@ -3,14 +3,15 @@
## 1.0.3 (Unreleased)
## 1.0.3 (Unreleased)
-
Bugfix. Login form doesn't render after logging out, when
`auto_reconnect = false`
-
Bugfix. Login form doesn't render after logging out, when
`auto_reconnect = false`
[jcbrand]
[jcbrand]
-
Also indicate new day for the first day's messages. [jcbrand]
-
Also indicate new day for the first day's messages. [jcbrand]
-
Chat bot messages don't appear when they have the same ids as their commands.
-
Chat bot messages don't appear when they have the same ids as their commands.
[jcbrand]
[jcbrand]
-
Updated onDisconnected method to fire disconnected event even if
`auto_reconnect = false`
. [kamranzafar]
-
Updated onDisconnected method to fire disconnected event even if
`auto_reconnect = false`
. [kamranzafar]
-
Bugfix: MAM messages weren't being fetched oldest first. [jcbrand]
-
Bugfix: MAM messages weren't being fetched oldest first. [jcbrand]
-
#553 Add processing hints to OTR messages [jcbrand]
-
Add processing hints to chat state notifications [jcbrand]
-
Add processing hints to chat state notifications [jcbrand]
-
#553 Add processing hints to OTR messages [jcbrand]
-
#650 Don't ignore incoming messages with same JID as current user (might be MAM archived) [jcbrand]
## 1.0.2 (2016-05-24)
## 1.0.2 (2016-05-24)
...
...
src/converse-core.js
View file @
6bfcce5f
...
@@ -1273,12 +1273,6 @@
...
@@ -1273,12 +1273,6 @@
'
info
'
'
info
'
);
);
return
true
;
return
true
;
}
else
if
(
from_jid
===
converse
.
connection
.
jid
)
{
converse
.
log
(
"
onMessage: Ignoring incoming message sent from this client's JID:
"
+
from_jid
,
'
info
'
);
return
true
;
}
else
if
(
utils
.
isHeadlineMessage
(
message
))
{
}
else
if
(
utils
.
isHeadlineMessage
(
message
))
{
// XXX: Ideally we wouldn't have to check for headline
// XXX: Ideally we wouldn't have to check for headline
// messages, but Prosody sends headline messages with the
// messages, but Prosody sends headline messages with the
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment