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
P
python-nbxmpp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
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
python-nbxmpp
Commits
ceea0a8d
Commit
ceea0a8d
authored
Nov 22, 2020
by
Philipp Hörist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AdHoc: Parse default action
parent
231904ad
Pipeline
#6769
passed with stages
in 1 minute and 14 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
nbxmpp/modules/adhoc.py
nbxmpp/modules/adhoc.py
+8
-0
nbxmpp/structs.py
nbxmpp/structs.py
+3
-3
No files found.
nbxmpp/modules/adhoc.py
View file @
ceea0a8d
...
...
@@ -96,11 +96,18 @@ class AdHoc(BaseModule):
notes
.
append
(
AdHocCommandNote
(
text
=
note
.
getData
(),
type
=
type_
))
default
=
None
actions_
=
command
.
getTag
(
'actions'
)
if
actions_
is
not
None
:
for
action_
in
actions_
.
getChildren
():
actions
.
append
(
AdHocAction
(
action_
.
getName
()))
default
=
actions_
.
getAttr
(
'execute'
)
if
default
is
not
None
:
default
=
AdHocAction
(
default
)
if
default
not
in
actions
:
default
=
None
yield
AdHocCommand
(
jid
=
str
(
response
.
getFrom
()),
name
=
None
,
...
...
@@ -109,6 +116,7 @@ class AdHoc(BaseModule):
status
=
AdHocStatus
(
attrs
[
'status'
]),
data
=
command
.
getTag
(
'x'
,
namespace
=
Namespace
.
DATA
),
actions
=
actions
,
default
=
default
,
notes
=
notes
)
except
Exception
as
error
:
raise
MalformedStanzaError
(
str
(
error
),
response
)
...
...
nbxmpp/structs.py
View file @
ceea0a8d
...
...
@@ -396,14 +396,14 @@ class DiscoIdentity(namedtuple('DiscoIdentity', 'category type name lang')):
return
hash
(
str
(
self
))
class
AdHocCommand
(
namedtuple
(
'AdHocCommand'
,
'jid node name sessionid status data actions notes'
)):
class
AdHocCommand
(
namedtuple
(
'AdHocCommand'
,
'jid node name sessionid status data actions
default
notes'
)):
__slots__
=
[]
def
__new__
(
cls
,
jid
,
node
,
name
,
sessionid
=
None
,
status
=
None
,
data
=
None
,
actions
=
None
,
notes
=
None
):
data
=
None
,
actions
=
None
,
default
=
None
,
notes
=
None
):
return
super
(
AdHocCommand
,
cls
).
__new__
(
cls
,
jid
,
node
,
name
,
sessionid
,
status
,
data
,
actions
,
notes
)
status
,
data
,
actions
,
default
,
notes
)
@
property
def
is_completed
(
self
):
...
...
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