erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: don't use meta_ prefix anymore for action_extra in action_new signal.

Browse source
This commit is contained in:
Goffi 2023-05-15 16:20:50 +02:00
commit 5ba4239fcc
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sat/plugins/plugin_exp_jingle_stream.py
View file

@ -255,8 +255,8 @@ class JingleStream(object):
_(CONFIRM_TITLE),
type_=C.XMLUI_DIALOG_CONFIRM,
action_extra={
"meta_from_jid": session["peer_jid"].full(),
"meta_type": "STREAM",
"from_jid": session["peer_jid"].full(),
"type": "STREAM",
},
security_limit=SECURITY_LIMIT,
profile=client.profile,

12
sat/plugins/plugin_misc_file.py
View file

@ -271,9 +271,9 @@ class FilePlugin:
_(CONFIRM_OVERWRITE).format(file_path),
_(CONFIRM_OVERWRITE_TITLE),
action_extra={
"meta_from_jid": peer_jid.full(),
"meta_type": C.META_TYPE_OVERWRITE,
"meta_progress_id": file_data[PROGRESS_ID_KEY],
"from_jid": peer_jid.full(),
"type": C.META_TYPE_OVERWRITE,
"progress_id": file_data[PROGRESS_ID_KEY],
},
security_limit=SECURITY_LIMIT,
profile=client.profile,
@ -331,9 +331,9 @@ class FilePlugin:
type_=C.XMLUI_DIALOG_FILE,
options={C.XMLUI_DATA_FILETYPE: C.XMLUI_DATA_FILETYPE_DIR},
action_extra={
"meta_from_jid": peer_jid.full(),
"meta_type": C.META_TYPE_FILE,
"meta_progress_id": file_data[PROGRESS_ID_KEY],
"from_jid": peer_jid.full(),
"type": C.META_TYPE_FILE,
"progress_id": file_data[PROGRESS_ID_KEY],
},
security_limit=SECURITY_LIMIT,
profile=client.profile,

6
sat/plugins/plugin_xep_0353.py
View file

@ -179,9 +179,9 @@ class XEP_0353:
accept = await xml_tools.defer_confirm(
self.host, confirm_msg, confirm_title, profile=client.profile,
action_extra={
"meta_type": C.META_TYPE_NOT_IN_ROSTER_LEAK,
"meta_session_id": session_id,
"meta_from_jid": peer_jid.full(),
"type": C.META_TYPE_NOT_IN_ROSTER_LEAK,
"session_id": session_id,
"from_jid": peer_jid.full(),
}
)
if not accept:

2
sat_frontends/jp/base.py
View file

@ -1398,7 +1398,7 @@ class CommandAnswering(CommandBase):
return
action_data = data_format.deserialise(action_data_s)
try:
action_type = action_data['meta_type']
action_type = action_data['type']
except KeyError:
try:
xml_ui = action_data["xmlui"]

8
sat_frontends/jp/cmd_file.py
View file

@ -373,12 +373,12 @@ class Receive(base.CommandAnswering):
if xmlui_id is None:
return self.host.quit_from_signal(1)
try:
from_jid = jid.JID(action_data["meta_from_jid"])
from_jid = jid.JID(action_data["from_jid"])
except KeyError:
self.disp(_("Ignoring action without from_jid data"), 1)
return
try:
progress_id = action_data["meta_progress_id"]
progress_id = action_data["progress_id"]
except KeyError:
self.disp(_("ignoring action without progress id"), 1)
return
@ -402,7 +402,7 @@ class Receive(base.CommandAnswering):
if xmlui_id is None:
return self.host.quit_from_signal(1)
try:
progress_id = action_data["meta_progress_id"]
progress_id = action_data["progress_id"]
except KeyError:
self.disp(_("ignoring action without progress id"), 1)
return
@ -425,7 +425,7 @@ class Receive(base.CommandAnswering):
if xmlui_id is None:
return self.host.quit_from_signal(1)
try:
from_jid = jid.JID(action_data["meta_from_jid"])
from_jid = jid.JID(action_data["from_jid"])
except ValueError:
self.disp(
_('invalid "from_jid" value received, ignoring: {value}').format(

2
sat_frontends/jp/cmd_pipe.py
View file

@ -123,7 +123,7 @@ class PipeIn(base.CommandAnswering):
if xmlui_id is None:
self.host.quit_from_signal(C.EXIT_ERROR)
try:
from_jid = jid.JID(action_data["meta_from_jid"])
from_jid = jid.JID(action_data["from_jid"])
except KeyError:
self.disp(_("Ignoring action without from_jid data"), error=True)
return