Compare commits

..

No commits in common. "0a304f9b6c0eeffac4bfc2a351bac07a2665498e" and "dab1abf4c634cbba8b747aa2b6eacb169fb5d62f" have entirely different histories.

3 changed files with 3 additions and 15 deletions

View file

@ -93,7 +93,7 @@
"miscreactions": { "miscreactions": {
"reactions": [ "reactions": [
"stop", "king", "mmm", "ooo", "detector", "question_marks", "stop", "king", "mmm", "ooo", "detector", "question_marks",
"repeat_letters", "nudge" "repeat_letters"
], ],
"rate": 0, "rate": 0,
"stop_message": "This was your last {subject}...", "stop_message": "This was your last {subject}...",
@ -102,8 +102,7 @@
"detector_message": "/me grabs its {subject} detector", "detector_message": "/me grabs its {subject} detector",
"detector_process": "...", "detector_process": "...",
"detector_pos": "OK go on...", "detector_pos": "OK go on...",
"detector_neg": "Halt!", "detector_neg": "Halt!"
"nudging": "/me nudges {target}"
}, },
"mood": { "mood": {
"commands": ["calm down"], "commands": ["calm down"],

View file

@ -1,7 +1,5 @@
import random import random
from irc.client import NickMask
from edmond.plugin import Plugin from edmond.plugin import Plugin
from edmond.utils import proc from edmond.utils import proc
@ -29,7 +27,6 @@ class MiscReactionsPlugin(Plugin):
"ooo", "ooo",
"detector", "detector",
"repeat_letters", "repeat_letters",
"nudge",
]) ])
def __init__(self, bot): def __init__(self, bot):
@ -165,11 +162,3 @@ class MiscReactionsPlugin(Plugin):
question_mark = self.config["question_mark"] question_mark = self.config["question_mark"]
reply = f"{word}{question_mark}" reply = f"{word}{question_mark}"
self.bot.say(event.target, reply) self.bot.say(event.target, reply)
def react_with_nudge(self, event):
"""Nudge the last person who talked (unsure how or why)."""
nick = NickMask(event.source).nick
reply = self.config.get("nudging")
if reply is None:
return
self.bot.say(event.target, reply.format(target=nick))

View file

@ -12,7 +12,7 @@ from edmond.plugin import Plugin
class YoutubeParserPlugin(Plugin): class YoutubeParserPlugin(Plugin):
VIDEO_URL_RE = re.compile( VIDEO_URL_RE = re.compile(
r"https?:\/\/(?:[^/]+/watch\?(?:.*&)?v=(?P<code1>[^&\s]+)" r"https?:\/\/(?:www\.youtube\.com\/watch\?(?:.*&)?v=(?P<code1>[^&\s]+)"
r"|youtu\.be/(?P<code2>[^&\s]+))" r"|youtu\.be/(?P<code2>[^&\s]+))"
) )