Re: test debug

[Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>]

Subject: [PATCH pit v1] bin/public-inbox-tg: Fix regex pattern for headers
From: Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>

When testing email with Faris, we found that Faris' emails don't get
processed. They appear on the lore, but don't appear on Telegram. Sir
Ammar debugged this bug and the log said: "Cannot get the \"message-id\"
line".

It turned out that the regex pattern for headers was wrong, if the
header to be matched happens to be at the end of the headers, it will
not have a double LF because previously we have already split the
double LF with explode(). Fix this by changing the pattern to match the
header if it happens to be at the end of the headers.

Cc: Faris Suryanto <onlyfaris@gnuweeb.org>
Debugged-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Signed-off-by: Alviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>
---
 bin/public-inbox-tg.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/public-inbox-tg.php b/bin/public-inbox-tg.php
index 9d5771f..2e611ec 100644
--- a/bin/public-inbox-tg.php
+++ b/bin/public-inbox-tg.php
@@ -145,27 +145,27 @@ function fx(string $input): int
 	}
 
 	$body = trim($hdr[1]);
-	$hdr = $hdr[0];
+	$hdr = trim($hdr[0]);
 
-	if (!preg_match("/(?:^|\\n)subject:\s+?(.+?)(?:\\n\S+\:|\\n\\n)/si", $hdr, $m)) {
+	if (!preg_match("/(?:^|\\n)subject:\s+?(.+?)(?:\\n\S+\:|$)/si", $hdr, $m)) {
 		$err = "Cannot get the \"subject\" line";
 		goto out;
 	}
 	$subject = clean_header_val($m[1]);
 
-	if (!preg_match("/(?:^|\\n)from:\s+?(.+?)(?:\\n\S+\:|\\n\\n)/si", $hdr, $m)) {
+	if (!preg_match("/(?:^|\\n)from:\s+?(.+?)(?:\\n\S+\:|$)/si", $hdr, $m)) {
 		$err = "Cannot get the \"from\" line";
 		goto out;
 	}
 	$from = clean_header_val($m[1]);
 
-	if (!preg_match("/(?:^|\\n)date:\s+?(.+?)(?:\\n\S+\:|\\n\\n)/si", $hdr, $m)) {
+	if (!preg_match("/(?:^|\\n)date:\s+?(.+?)(?:\\n\S+\:|$)/si", $hdr, $m)) {
 		$err = "Cannot get the \"date\" line";
 		goto out;
 	}
 	$date = clean_header_val($m[1]);
 
-	if (!preg_match("/(?:^|\\n)message-id:\s+?(.+?)(?:\\n\S+\:|\\n\\n)/si", $hdr, $m)) {
+	if (!preg_match("/(?:^|\\n)message-id:\s+?(.+?)(?:\\n\S+\:|$)/si", $hdr, $m)) {
 		$err = "Cannot get the \"message-id\" line";
 		goto out;
 	}
@@ -173,7 +173,7 @@ function fx(string $input): int
 	if ($msgId[0] === '<' && $msgId[strlen($msgId) - 1] === '>')
 		$msgId = substr(clean_header_val($msgId), 1, -1);
 
-	if (preg_match("/(?:^|\\n)in-reply-to:\s+?(.+?)(?:\\n\S+\:|\\n\\n)/si", $hdr, $m)) {
+	if (preg_match("/(?:^|\\n)in-reply-to:\s+?(.+?)(?:\\n\S+\:|$)/si", $hdr, $m)) {
 		$inReplyTo = $m[1];
 		if ($inReplyTo[0] === '<' && $inReplyTo[strlen($inReplyTo) - 1] === '>')
 			$inReplyTo = substr(clean_header_val($inReplyTo), 1, -1);
@@ -182,7 +182,7 @@ function fx(string $input): int
 	}
 
 	$err = "";
-	if (preg_match("/(?:^|\\n)to:\s+?(.+?)(?:\\n\S+\:|\\n\\n)/si", $hdr, $m)) {
+	if (preg_match("/(?:^|\\n)to:\s+?(.+?)(?:\\n\S+\:|$)/si", $hdr, $m)) {
 		$toList = extractList(clean_header_val($m[1]));
 		$toListStr = buildList($toList, "To");
 	} else {

base-commit: 667913decf1869fde55d8fd17d66b4a294670617
-- 
2.32.0