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
203
Issues
203
List
Boards
Labels
Service Desk
Milestones
Merge Requests
21
Merge Requests
21
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
1ec850cd
Commit
1ec850cd
authored
Oct 13, 2019
by
Philipp Hörist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor parsing oob data
Adapt to nbxmpp changes
parent
cdf111c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
15 deletions
+14
-15
gajim/common/modules/mam.py
gajim/common/modules/mam.py
+2
-1
gajim/common/modules/message.py
gajim/common/modules/message.py
+2
-1
gajim/common/modules/misc.py
gajim/common/modules/misc.py
+6
-10
gajim/common/zeroconf/connection_handlers_zeroconf.py
gajim/common/zeroconf/connection_handlers_zeroconf.py
+4
-3
No files found.
gajim/common/modules/mam.py
View file @
1ec850cd
...
@@ -195,6 +195,8 @@ def _mam_message_received(self, _con, stanza, properties):
...
@@ -195,6 +195,8 @@ def _mam_message_received(self, _con, stanza, properties):
additional_data
.
set_value
(
additional_data
.
set_value
(
'gajim'
,
'user_timestamp'
,
properties
.
user_timestamp
)
'gajim'
,
'user_timestamp'
,
properties
.
user_timestamp
)
parse_oob
(
properties
,
additional_data
)
event_attrs
.
update
(
event_attrs
.
update
(
{
'conn'
:
self
.
_con
,
{
'conn'
:
self
.
_con
,
'account'
:
self
.
_account
,
'account'
:
self
.
_account
,
...
@@ -260,7 +262,6 @@ def _decryption_finished(self, event):
...
@@ -260,7 +262,6 @@ def _decryption_finished(self, event):
return
return
event
.
correct_id
=
parse_correction
(
event
.
message
)
event
.
correct_id
=
parse_correction
(
event
.
message
)
parse_oob
(
event
)
with_
=
event
.
with_
.
getStripped
()
with_
=
event
.
with_
.
getStripped
()
if
event
.
muc_pm
:
if
event
.
muc_pm
:
...
...
gajim/common/modules/message.py
View file @
1ec850cd
...
@@ -148,6 +148,8 @@ def _message_received(self, _con, stanza, properties):
...
@@ -148,6 +148,8 @@ def _message_received(self, _con, stanza, properties):
additional_data
.
set_value
(
additional_data
.
set_value
(
'gajim'
,
'user_timestamp'
,
properties
.
user_timestamp
)
'gajim'
,
'user_timestamp'
,
properties
.
user_timestamp
)
parse_oob
(
properties
,
additional_data
)
event_attr
=
{
event_attr
=
{
'conn'
:
self
.
_con
,
'conn'
:
self
.
_con
,
'stanza'
:
stanza
,
'stanza'
:
stanza
,
...
@@ -213,7 +215,6 @@ def _on_message_decrypted(self, event):
...
@@ -213,7 +215,6 @@ def _on_message_decrypted(self, event):
'form_node'
:
parse_form
(
event
.
stanza
),
'form_node'
:
parse_form
(
event
.
stanza
),
'xhtml'
:
parse_xhtml
(
event
.
stanza
),
'xhtml'
:
parse_xhtml
(
event
.
stanza
),
}
}
parse_oob
(
event
)
for
name
,
value
in
event_attr
.
items
():
for
name
,
value
in
event_attr
.
items
():
setattr
(
event
,
name
,
value
)
setattr
(
event
,
name
,
value
)
...
...
gajim/common/modules/misc.py
View file @
1ec850cd
...
@@ -25,18 +25,14 @@
...
@@ -25,18 +25,14 @@
# XEP-0066: Out of Band Data
# XEP-0066: Out of Band Data
def
parse_oob
(
event
):
def
parse_oob
(
properties
,
additional_data
):
oob_node
=
event
.
stanza
.
getTag
(
'x'
,
namespace
=
nbxmpp
.
NS_X_OOB
)
if
not
properties
.
is_oob
:
if
oob_node
is
None
:
return
return
url
=
oob_node
.
getTagData
(
'url'
)
additional_data
.
set_value
(
'gajim'
,
'oob_url'
,
properties
.
oob
.
url
)
if
url
is
not
None
:
if
properties
.
oob
.
desc
is
not
None
:
event
.
additional_data
.
set_value
(
'gajim'
,
'oob_url'
,
url
)
additional_data
.
set_value
(
'gajim'
,
'oob_desc'
,
properties
.
oob
.
desc
)
desc
=
oob_node
.
getTagData
(
'desc'
)
if
desc
is
not
None
:
event
.
additional_data
.
set_value
(
'gajim'
,
'oob_desc'
,
desc
)
# XEP-0308: Last Message Correction
# XEP-0308: Last Message Correction
...
...
gajim/common/zeroconf/connection_handlers_zeroconf.py
View file @
1ec850cd
...
@@ -94,13 +94,16 @@ def _messageCB(self, con, stanza, properties):
...
@@ -94,13 +94,16 @@ def _messageCB(self, con, stanza, properties):
session
.
last_receive
=
time
.
time
()
session
.
last_receive
=
time
.
time
()
additional_data
=
AdditionalDataDict
()
parse_oob
(
properties
,
additional_data
)
event_attr
=
{
event_attr
=
{
'conn'
:
self
,
'conn'
:
self
,
'stanza'
:
stanza
,
'stanza'
:
stanza
,
'account'
:
self
.
name
,
'account'
:
self
.
name
,
'id_'
:
id_
,
'id_'
:
id_
,
'encrypted'
:
False
,
'encrypted'
:
False
,
'additional_data'
:
AdditionalDataDict
()
,
'additional_data'
:
additional_data
,
'forwarded'
:
False
,
'forwarded'
:
False
,
'sent'
:
False
,
'sent'
:
False
,
'timestamp'
:
time
.
time
(),
'timestamp'
:
time
.
time
(),
...
@@ -146,8 +149,6 @@ def _on_message_decrypted(self, event):
...
@@ -146,8 +149,6 @@ def _on_message_decrypted(self, event):
'stanza_id'
:
event
.
unique_id
'stanza_id'
:
event
.
unique_id
}
}
parse_oob
(
event
)
for
name
,
value
in
event_attr
.
items
():
for
name
,
value
in
event_attr
.
items
():
setattr
(
event
,
name
,
value
)
setattr
(
event
,
name
,
value
)
...
...
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