catdog2/urlbot-native-trex
1
0
Fork 0
mirror of http://aero2k.de/t/repos/urlbot-native.git synced 2017-09-06 15:25:38 +02:00
Code Issues Releases Activity

fix plugin import

Browse Source
This commit is contained in:
Thorsten S
2015-11-20 21:56:37 +01:00
parent 3bc92d1b7b
commit 17d1cd1b54
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
urlbot.py
View File

@@ -9,7 +9,15 @@ import time
from common import conf_load, conf_save, \ from common import conf_load, conf_save, \
extract_title, RATE_GLOBAL, RATE_CHAT extract_title, RATE_GLOBAL, RATE_CHAT
from idlebot import IdleBot, start from idlebot import IdleBot, start
from plugins import ptypes as plugin_ptypes, ptypes_COMMAND, plugin_enabled_get, ptypes_PARSE, register_event, else_command from plugins import (
ptypes as plugin_ptypes,
plugins as plugin_storage,
ptypes_COMMAND,
plugin_enabled_get,
ptypes_PARSE,
register_event,
else_command
)
try: try:
from local_config import conf, set_conf from local_config import conf, set_conf
@@ -292,7 +300,7 @@ class UrlBot(IdleBot):
reply_user = msg_obj['mucnick'] reply_user = msg_obj['mucnick']
# TODO: check how several commands/plugins in a single message behave (also with rate limiting) # TODO: check how several commands/plugins in a single message behave (also with rate limiting)
for p in plugins[ptypes_COMMAND]: for p in plugin_storage[ptypes_COMMAND]:
if self.check_ratelimit(p.ratelimit_class): if self.check_ratelimit(p.ratelimit_class):
continue continue
@@ -301,8 +309,8 @@ class UrlBot(IdleBot):
ret = p( ret = p(
data=data, data=data,
cmd_list=[pl.plugin_name for pl in plugins[ptypes_COMMAND]], cmd_list=[pl.plugin_name for pl in plugin_storage[ptypes_COMMAND]],
parser_list=[pl.plugin_name for pl in plugins[ptypes_PARSE]], parser_list=[pl.plugin_name for pl in plugin_storage[ptypes_PARSE]],
reply_user=reply_user, reply_user=reply_user,
msg_obj=msg_obj, msg_obj=msg_obj,
argv=words[1:] argv=words[1:]
@@ -343,7 +351,7 @@ class UrlBot(IdleBot):
data = msg_obj['body'] data = msg_obj['body']
reply_user = msg_obj['mucnick'] reply_user = msg_obj['mucnick']
for p in plugins[ptypes_PARSE]: for p in plugin_storage[ptypes_PARSE]:
if self.check_ratelimit(p.ratelimit_class): if self.check_ratelimit(p.ratelimit_class):
continue continue