summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2012-02-15 20:10:00 +0100
committerFlorent Le Coz <louiz@louiz.org>2012-02-15 20:10:00 +0100
commit695a7ebebaf6a277420dcb42cd96d92d77df0379 (patch)
tree8c9da1e5bf988356ad110f42113949aab94a5866 /plugins
parent0606c2b351ac87f110e1240d2f4ba1b94b275930 (diff)
parentb89cd8fd8322bf8aa23130398a0a70defcba708d (diff)
downloadpoezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.gz
poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.bz2
poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.tar.xz
poezio-695a7ebebaf6a277420dcb42cd96d92d77df0379.zip
Merge branch 'master' of https://git.louiz.org/poezio
Diffstat (limited to 'plugins')
-rw-r--r--plugins/alias.py2
-rw-r--r--plugins/amsg.py13
-rw-r--r--plugins/gpg/__init__.py3
-rw-r--r--plugins/ping.py2
-rw-r--r--plugins/simple_notify.py34
5 files changed, 51 insertions, 3 deletions
diff --git a/plugins/alias.py b/plugins/alias.py
index 2517e2b9..d6a46b6f 100644
--- a/plugins/alias.py
+++ b/plugins/alias.py
@@ -21,7 +21,7 @@ class Plugin(BasePlugin):
if alias in self.core.commands or alias in self.commands:
self.core.information('Alias: command already exists', 'Error')
return
- self.commands[alias] = lambda args: self.get_command(command)(parse(common.shell_split(args), tmp_args))
+ self.commands[alias] = lambda arg: self.get_command(command)(parse(arg, tmp_args))
self.add_command(alias, self.commands[alias], 'This command is an alias for /%s %s' %( command, tmp_args))
self.core.information('Alias /%s successfuly created' % alias, 'Info')
diff --git a/plugins/amsg.py b/plugins/amsg.py
new file mode 100644
index 00000000..697f793f
--- /dev/null
+++ b/plugins/amsg.py
@@ -0,0 +1,13 @@
+# A simple broadcast plugin
+
+from plugin import BasePlugin
+from tabs import MucTab
+
+class Plugin(BasePlugin):
+ def init(self):
+ self.add_command('amsg', self.command_amsg, "Usage: /amsg <message>\nAmsg: Broadcast the message to all the joined rooms.")
+
+ def command_amsg(self, args):
+ for room in self.core.tabs:
+ if isinstance(room, MucTab) and room.joined:
+ room.command_say(args)
diff --git a/plugins/gpg/__init__.py b/plugins/gpg/__init__.py
index 01ca6ab2..00d896cd 100644
--- a/plugins/gpg/__init__.py
+++ b/plugins/gpg/__init__.py
@@ -158,7 +158,6 @@ class Plugin(BasePlugin):
if jid.full not in self.contacts.keys():
return ''
status = self.contacts[jid.full]
- self.core.information('%s' % (status,))
if status in ('valid', 'invalid', 'signed'):
return ' GPG Key: %s (%s)' % (status, 'encrypted' if status == 'valid' else 'NOT encrypted',)
else:
@@ -176,6 +175,8 @@ class Plugin(BasePlugin):
else:
if isinstance(self.core.current_tab(), ConversationTab):
jid = JID(self.core.current_tab().get_name())
+ else:
+ return
command = args[0]
if command == 'force' or command == 'enable':
# we can force encryption only with contact having an associated
diff --git a/plugins/ping.py b/plugins/ping.py
index 349b7f52..51198d39 100644
--- a/plugins/ping.py
+++ b/plugins/ping.py
@@ -18,7 +18,7 @@ class Plugin(BasePlugin):
return
jid = JID(arg)
try:
- delay = self.core.xmpp.plugin['xep_0199'].send_ping(jid=jid)
+ delay = self.core.xmpp.plugin['xep_0199'].send_ping(jid=jid, block=False)
except:
delay = None
if delay is not None:
diff --git a/plugins/simple_notify.py b/plugins/simple_notify.py
new file mode 100644
index 00000000..32861d87
--- /dev/null
+++ b/plugins/simple_notify.py
@@ -0,0 +1,34 @@
+# A plugin that adds the /link command, letting you open links that are pasted
+# in the conversation, without having to click them.
+
+import os
+import re
+
+from plugin import BasePlugin, PluginConfig
+from xhtml import clean_text, get_body_from_message_stanza
+import common
+
+url_pattern = re.compile(r'\b(http[s]?://(?:\S+))\b', re.I|re.U)
+
+class Plugin(BasePlugin):
+ def init(self):
+ self.add_event_handler('private_msg', self.on_private_msg)
+ self.add_event_handler('conversation_msg', self.on_conversation_msg)
+
+ def on_private_msg(self, message, tab):
+ fro = message['from']
+ self.do_notify(message, fro)
+
+ def on_conversation_msg(self, message, tab):
+ fro = message['from'].bare
+ self.do_notify(message, fro)
+
+ def do_notify(self, message, fro):
+ body = clean_text(get_body_from_message_stanza(message))
+ if not body:
+ return
+ command = self.config.get('command', '').strip()
+ if not command:
+ self.core.information('No notification command was provided in the configuration file', 'Warning')
+ return
+ self.core.exec_command(command % {'body':body, 'from':fro})