Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gajim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
209
Issues
209
List
Boards
Labels
Service Desk
Milestones
Merge Requests
22
Merge Requests
22
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gajim
gajim
Commits
e3050697
Commit
e3050697
authored
Nov 19, 2018
by
Philipp Hörist
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix receipts for MUC-PMs
parent
b5bd5f15
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
gajim/common/modules/receipts.py
gajim/common/modules/receipts.py
+11
-6
No files found.
gajim/common/modules/receipts.py
View file @
e3050697
...
...
@@ -72,15 +72,15 @@ def _answer_request(self, event):
self
.
_con
.
connection
.
send
(
receipt
)
def
_get_contact
(
self
,
event
):
if
event
.
mtype
==
'chat'
:
contact
=
app
.
contacts
.
get_contact
(
self
.
_account
,
event
.
jid
)
if
contact
and
contact
.
sub
not
in
(
'to'
,
'none'
):
return
contact
else
:
if
event
.
muc_pm
:
return
app
.
contacts
.
get_gc_contact
(
self
.
_account
,
event
.
jid
,
event
.
resource
)
contact
=
app
.
contacts
.
get_contact
(
self
.
_account
,
event
.
jid
)
if
contact
is
None
and
contact
.
sub
not
in
(
'to'
,
'none'
):
return
contact
@
staticmethod
def
_build_answer_receipt
(
to
,
receipt_id
):
receipt
=
nbxmpp
.
Message
(
to
=
to
,
typ
=
'chat'
)
...
...
@@ -95,11 +95,16 @@ def _receipt_received(self, event, received):
log
.
warning
(
'Receipt without ID: %s'
,
event
.
stanza
)
return
log
.
info
(
'Received %s'
,
receipt_id
)
jid
=
event
.
jid
if
event
.
muc_pm
:
jid
=
event
.
fjid
app
.
nec
.
push_incoming_event
(
NetworkIncomingEvent
(
'receipt-received'
,
conn
=
self
.
_con
,
receipt_id
=
receipt_id
,
jid
=
event
.
jid
))
jid
=
jid
))
def
get_instance
(
*
args
,
**
kwargs
):
...
...
Andrey Gursky
@ag
mentioned in merge request
!368 (merged)
·
Nov 27, 2018
mentioned in merge request
!368 (merged)
mentioned in merge request !368
Toggle commit list
Andrey Gursky
@ag
mentioned in commit
1b5272c8
·
Dec 03, 2018
mentioned in commit
1b5272c8
mentioned in commit 1b5272c85427432b9e7272b49240b0c2cc9d1ad2
Toggle commit list
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