From 983f063d33efbf2c6fb43c3aa12562b464b2cb9c Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Tue, 6 Feb 2024 16:23:39 +0100
Subject: Fix image with alt text for html/md to bbcode

---
 include/html2bbcode.php              |  1 +
 tests/unit/includes/BBCodeTest.php   | 46 ++++++++++++++++++++++++++++++++++++
 tests/unit/includes/MarkdownTest.php |  4 ++++
 3 files changed, 51 insertions(+)
 create mode 100644 tests/unit/includes/BBCodeTest.php

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index aca3ff4f8..5cb153a77 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -219,6 +219,7 @@ function html2bbcode($message)
 	node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]');
 
 	node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img=$2x$3]$1', '[/img]');
+	node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'alt'=>'/(.+)/'), '[img=$1]$2', '[/img]');
 	node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]');
 
 
diff --git a/tests/unit/includes/BBCodeTest.php b/tests/unit/includes/BBCodeTest.php
new file mode 100644
index 000000000..9e9b1a33b
--- /dev/null
+++ b/tests/unit/includes/BBCodeTest.php
@@ -0,0 +1,46 @@
+<?php
+/*
+ * Copyright (c) 2024 Hubzilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Zotlabs\Tests\Unit\includes;
+
+use Zotlabs\Tests\Unit\UnitTestCase;
+
+class BBCodeTest extends UnitTestCase {
+	/**
+	 * Test converting html to BBCode.
+	 *
+	 * @dataProvider html2bbcode_provider
+	 */
+	public function test_html2bbcode(string $src, string $expected): void {
+		$this->assertEquals($expected, html2bbcode($src));
+	}
+
+	private function html2bbcode_provider(): array {
+		return [
+			'image with alt text' => [
+				'<img src="https://example.com/image.jpg" alt="Alt text">',
+				'[img=https://example.com/image.jpg]Alt text[/img]'
+			],
+		];
+	}
+}
diff --git a/tests/unit/includes/MarkdownTest.php b/tests/unit/includes/MarkdownTest.php
index 71f13cdb0..e05cec6fb 100644
--- a/tests/unit/includes/MarkdownTest.php
+++ b/tests/unit/includes/MarkdownTest.php
@@ -65,6 +65,10 @@ class MarkdownTest extends UnitTestCase {
 				'[img=https://example.com/image.jpg]https://example.com/image.jpg[/img]',
 				'![](https://example.com/image.jpg)'
 			],
+			'inline image with alt text' => [
+				'[img=https://example.com/image.jpg]Alt text[/img]',
+				'![Alt text](https://example.com/image.jpg)'
+			],
 		];
 	}
 
-- 
cgit v1.2.3