From 1d0358c7cdd9d039d9d46bc4c4485d821b95c554 Mon Sep 17 00:00:00 2001 From: benne238 Date: Wed, 30 Jun 2021 16:50:46 -0400 Subject: [PATCH] added pp.LineStart() to explicity look for reply_from_user delimiter at the start of a given line in the status, edit, and reply-to-user rules --- src/webqueue2api/parser/parser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/webqueue2api/parser/parser.py b/src/webqueue2api/parser/parser.py index baa4c2f..0252e29 100644 --- a/src/webqueue2api/parser/parser.py +++ b/src/webqueue2api/parser/parser.py @@ -243,7 +243,7 @@ def error_handler(original_string, match_start_index, tokens): (pp.Literal(action_end_delimiter) + pp.LineEnd()).suppress() + pp.Group( pp.SkipTo( - pp.Literal(reply_from_user_start_delimiter) + (pp.LineStart() + pp.Literal(reply_from_user_start_delimiter)) | (pp.LineStart() + pp.Literal(action_start_delimiter)) ) | pp.SkipTo(pp.StringEnd(), include=True) ).setResultsName("content") @@ -258,7 +258,7 @@ def error_handler(original_string, match_start_index, tokens): (pp.Literal(action_end_delimiter) + pp.LineEnd()).suppress() + pp.Group( pp.SkipTo( - pp.Literal(reply_from_user_start_delimiter) + (pp.LineStart() + pp.Literal(reply_from_user_start_delimiter)) | (pp.LineStart() + pp.Literal(action_start_delimiter)) ) | pp.SkipTo(pp.StringEnd(), include=True) ).setResultsName("content") @@ -273,7 +273,7 @@ def error_handler(original_string, match_start_index, tokens): (pp.Literal(action_end_delimiter) + pp.LineEnd()).suppress() + pp.Group( pp.SkipTo( - pp.Literal(reply_from_user_start_delimiter) + (pp.LineStart() + pp.Literal(reply_from_user_start_delimiter)) | (pp.LineStart() + pp.Literal(action_start_delimiter)) ) | pp.SkipTo(pp.StringEnd(), include=True) ).setResultsName("content")