catdog2/urlbot-native
1
0
Fork 0
Code Issues Pull Requests Releases Activity

white space fixes, reformat; update url_blacklist

Browse Source
This commit is contained in:
urlbot
2015-02-08 22:04:26 +01:00
parent f697a970ef
commit 4942bdb52c
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
local_config.py.skel
View File

@@ -34,8 +34,11 @@ config = {
'persistent_locked': False, 'persistent_locked': False,
'url_blacklist': [ 'url_blacklist': [
r'^.*heise\.de/[^/]+/meldung/.*$', r'^.*heise\.de/.*-[0-9]+\.html$',
r'^.*wikipedia\.org/wiki/.*$' r'^.*wikipedia\.org/wiki/.*$',
r'^.*blog\.fefe\.de/\?ts=[0-9a-f]+$',
r'^.*ibash\.de/zitat.*$',
r'^.*golem\.de/news/.*$'
], ],
# the "dice" feature will use more efficient random data (0) for given users # the "dice" feature will use more efficient random data (0) for given users

6
plugins.py
View File

@@ -628,11 +628,13 @@ def data_parse_commands(msg_obj):
if not p.is_enabled: if not p.is_enabled:
continue continue
ret = p(data = data, ret = p(
data = data,
cmd_list = [pl.plugin_name for pl in plugins[ptypes.COMMAND]], cmd_list = [pl.plugin_name for pl in plugins[ptypes.COMMAND]],
reply_user = reply_user, reply_user = reply_user,
msg_obj = msg_obj, msg_obj = msg_obj,
argv = words[1:]) argv = words[1:]
)
if None != ret: if None != ret: