copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Parse uri with message action correctly

Browse source 
Fixes #8894
This commit is contained in:
Philipp Hörist 2018-02-14 21:11:25 +01:00
parent a2caafa72c
commit a4f08b3bfe
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gajim/gajim.py
View file

@ -41,6 +41,8 @@ import sys
import os import os
import signal import signal
import locale import locale
from urllib.parse import unquote
import gi import gi
gi.require_version('GLib', '2.0') gi.require_version('GLib', '2.0')
gi.require_version('Gio', '2.0') gi.require_version('Gio', '2.0')
@ -49,6 +51,7 @@ gi.require_version('Gdk', '3.0')
gi.require_version('GObject', '2.0') gi.require_version('GObject', '2.0')
gi.require_version('Pango', '1.0') gi.require_version('Pango', '1.0')
from gi.repository import GLib, Gio, Gtk from gi.repository import GLib, Gio, Gtk
from gajim.common import i18n from gajim.common import i18n
from gajim.common import logging_helpers from gajim.common import logging_helpers
from gajim.common import crypto from gajim.common import crypto
@ -269,12 +272,20 @@ class GajimApplication(Gtk.Application):
self.interface.join_gc_minimal(None, jid) self.interface.join_gc_minimal(None, jid)
elif cmd == 'roster': elif cmd == 'roster':
self.activate_action('add-contact', GLib.Variant('s', jid)) self.activate_action('add-contact', GLib.Variant('s', jid))
elif cmd == 'message': elif cmd.startswith('message'):
attributes = cmd.split(';')
message = None
for key in attributes:
if key.startswith('body'):
try:
message = unquote(key.split('=')[1])
except Exception:
app.log('uri_handler').error('Invalid URI: %s', cmd)
accounts = list(app.connections.keys()) accounts = list(app.connections.keys())
if not accounts: if not accounts:
continue continue
if len(accounts) == 1: if len(accounts) == 1:
app.interface.new_chat_from_jid(accounts[0], jid) app.interface.new_chat_from_jid(accounts[0], jid, message)
else: else:
self.activate_action('start-chat') self.activate_action('start-chat')
start_chat_window = app.interface.instances['start_chat'] start_chat_window = app.interface.instances['start_chat']