From b296a2df05530382a87ff793e9dbd57659db7dab Mon Sep 17 00:00:00 2001 From: jesopo Date: Thu, 30 Jan 2020 14:56:57 +0000 Subject: add IRCBuffer.BufferLine.format() - /me vs message formatting --- modules/quotes.py | 5 +---- src/IRCBuffer.py | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/quotes.py b/modules/quotes.py index f6dd223f..a843bdfb 100644 --- a/modules/quotes.py +++ b/modules/quotes.py @@ -134,10 +134,7 @@ class Module(ModuleManager.BaseModule): lines_str = [] for line in lines: - if line.action: - lines_str.append("* %s %s" % (line.sender, line.message)) - else: - lines_str.append("<%s> %s" % (line.sender, line.message)) + lines_str.append(line.format()) text = " ".join(lines_str) quotes.append([event["user"].name, int(time.time()), text]) diff --git a/src/IRCBuffer.py b/src/IRCBuffer.py index d1e0a2d2..013cfb98 100644 --- a/src/IRCBuffer.py +++ b/src/IRCBuffer.py @@ -22,6 +22,13 @@ class BufferLine(object): timestamp: datetime.datetime = dataclasses.field( default_factory=utils.datetime.utcnow) + def format(self): + if self.action: + format = "* %s %s" + else: + format = "<%s> %s" + return format % (self.sender, self.message) + class BufferLineMatch(object): def __init__(self, line: BufferLine, match: str): self.line = line -- cgit v1.3.1-10-gc9f91