white space fixes, reformat; update url_blacklist

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

View File

@@ -34,8 +34,11 @@ config = {
'persistent_locked': False,
'url_blacklist': [
r'^.*heise\.de/[^/]+/meldung/.*$',
r'^.*wikipedia\.org/wiki/.*$'
r'^.*heise\.de/.*-[0-9]+\.html$',
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

View File

@@ -445,7 +445,7 @@ def command_cake(argv, **args):
"that you will be baked, and then there will be cake."),
"The cake is a lie!",
("This is your fault. I'm going to kill you. "
"And all the cake is gone. You don't even care, do you? "),
"And all the cake is gone. You don't even care, do you?"),
"Quit now and cake will be served immediately.",
("Enrichment Center regulations require both hands to be "
"empty before any cake..."),
@@ -628,11 +628,13 @@ def data_parse_commands(msg_obj):
if not p.is_enabled:
continue
ret = p(data = data,
ret = p(
data = data,
cmd_list = [pl.plugin_name for pl in plugins[ptypes.COMMAND]],
reply_user = reply_user,
msg_obj = msg_obj,
argv = words[1:])
argv = words[1:]
)
if None != ret: