Commit 4d7a19da authored by Maxime Buquet's avatar Maxime Buquet

Merge branch 'safejid-foo' into 'master'

Safejid foo

See merge request !50
parents d65ad614 f157a46b
......@@ -2,13 +2,10 @@
Global commands which are to be linked to the Core class
import logging
log = logging.getLogger(__name__)
import asyncio
from xml.etree import cElementTree as ET
from typing import List, Optional, Tuple
import logging
from slixmpp import JID, InvalidJID
from slixmpp.exceptions import XMPPError
......@@ -25,15 +22,16 @@ from poezio.common import safeJID
from poezio.config import config, DEFAULT_CONFIG, options as config_opts
from poezio import multiuserchat as muc
from import Contact
from poezio import windows
from poezio.plugin import PluginConfig
from poezio.roster import roster
from poezio.theming import dump_tuple, get_theme
from poezio.decorators import command_args_parser
from poezio.core.structs import Command, POSSIBLE_SHOW
log = logging.getLogger(__name__)
class CommandCore:
def __init__(self, core):
self.core = core
......@@ -940,19 +938,25 @@ class CommandCore:
"disconnected", self.core.exit, disposable=True)
@command_args_parser.quoted(0, 1, [''])
def destroy_room(self, args):
def destroy_room(self, args: List[str]) -> None:
/destroy_room [JID]
room = safeJID(args[0]).bare
if room:
muc.destroy_room(self.core.xmpp, room)
elif isinstance(self.core.tabs.current_tab,
tabs.MucTab) and not args[0]:
if not args[0] and isinstance(self.core.tabs.current_tab, tabs.MucTab):
self.core.information('Invalid JID: "%s"' % args[0], 'Error')
return None
room = JID(args[0]).bare
if room:
muc.destroy_room(self.core.xmpp, room)
return None
except InvalidJID:
self.core.information('Invalid JID: "%s"' % args[0], 'Error')
return None
@command_args_parser.quoted(1, 1, [''])
def bind(self, args):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment