Merge pull request #1440 from TelegramBots/develop

ToHtml/ToMarkdown: support for ExpandableBlockquote
TelegramBots · Nov 20, 2024 · 4837cf5 · 4837cf5
2 parents 454f298 + 81fe54c
commit 4837cf5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.azure-pipelines/variables.yml b/.azure-pipelines/variables.yml
@@ -1,7 +1,7 @@
-variables:
+variables:
   - group: Integration Tests Variables
   - name: versionPrefix
-    value: 22.1.0
+    value: 22.1.1
   - name: versionSuffix
     value: ''
   - name: ciVersionSuffix

diff --git a/src/Telegram.Bot/Extensions/FormatExtensions.cs b/src/Telegram.Bot/Extensions/FormatExtensions.cs
@@ -36,7 +36,7 @@ public static string ToMarkdown(string message, MessageEntity[]? entities)
                 var md = closings[0].md;
                 closings.RemoveAt(0);
                 if (i > 0 && md[0] == '_' && sb[i - 1] == '_') md = '\r' + md;
-                if (md[0] == '>') { inBlockQuote = false; if (lastCh != '\n' && i < sb.Length && sb[i] != '\n') md = "\n"; else continue; }
+                if (md[0] == '>') { inBlockQuote = false; md = md[1..]; if (lastCh != '\n' && i < sb.Length && sb[i] != '\n') md += '\n'; }
                 sb.Insert(i, md); i += md.Length;
             }
             if (i == sb.Length) break;
@@ -56,7 +56,7 @@ public static string ToMarkdown(string message, MessageEntity[]? entities)
                             closing.md = $"](tg://emoji?id={nextEntity.CustomEmojiId})";
                     }
                     else if (md[0] == '>')
-                    { inBlockQuote = true; if (lastCh is not '\n' and not '\0') md = "\n>"; }
+                    { inBlockQuote = true; md = lastCh is not '\n' and not '\0' ? "\n>" : ">"; }
                     else if (nextEntity.Type is MessageEntityType.Pre)
                         md = $"```{nextEntity.Language}\n";
                     int index = ~closings.BinarySearch(closing, Comparer<(int, string)>.Create((x, y) => x.Item1.CompareTo(y.Item1) | 1));
@@ -92,6 +92,7 @@ public static string ToMarkdown(string message, MessageEntity[]? entities)
         [MessageEntityType.Spoiler] = "||",
         [MessageEntityType.CustomEmoji] = "![",
         [MessageEntityType.Blockquote] = ">",
+        [MessageEntityType.ExpandableBlockquote] = ">||",
     };
 
     /// <summary>Insert backslashes in front of MarkdownV2 reserved characters</summary>
@@ -168,6 +169,8 @@ public static string ToHtml(string message, MessageEntity[]? entities)
                         closing.Item2 = "</code></pre>";
                         tag = $"<pre><code class=\"language-{nextEntity.Language}\">";
                     }
+                    else if (nextEntity.Type is MessageEntityType.ExpandableBlockquote)
+                        tag = "<blockquote expandable>";
                     else
                         tag = $"<{tag}>";
                     int index = ~closings.BinarySearch(closing, Comparer<(int, string)>.Create((x, y) => x.Item1.CompareTo(y.Item1) | 1));
@@ -198,6 +201,7 @@ public static string ToHtml(string message, MessageEntity[]? entities)
         [MessageEntityType.Spoiler] = "tg-spoiler",
         [MessageEntityType.CustomEmoji] = "tg-emoji",
         [MessageEntityType.Blockquote] = "blockquote",
+        [MessageEntityType.ExpandableBlockquote] = "blockquote",
     };
 
     /// <summary>Replace special HTML characters with their &amp;xx; equivalent</summary>

diff --git a/test/Telegram.Bot.Tests.Integ/Framework/RetryTelegramBotClient.cs b/test/Telegram.Bot.Tests.Integ/Framework/RetryTelegramBotClient.cs
@@ -16,10 +16,12 @@ namespace Telegram.Bot.Tests.Integ.Framework;
 internal class RetryTelegramBotClient(TestConfiguration configuration, IMessageSink diagnosticMessageSink, CancellationToken ct = default)
     : WTelegramBotClient(MakeOptions(configuration.ApiToken, configuration.ClientApiToken.Split(':')), cancellationToken: ct)
 {
+    private static StreamWriter WTelegramLogs = new StreamWriter("WTelegramBot.log", true, System.Text.Encoding.UTF8) { AutoFlush = true };
     private static WTelegramBotClientOptions MakeOptions(string botToken, string[] api)
     {
         var connection = new Microsoft.Data.Sqlite.SqliteConnection($"Data Source=WTelegramBot.{botToken.Split(':')[0]}.sqlite");
         WTelegram.Helpers.Log = (lvl, str) => System.Diagnostics.Trace.WriteLine(str);
+        WTelegram.Helpers.Log += (lvl, str) => WTelegramLogs.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss} [{"TDIWE!"[lvl]}] {str}");
         return new(botToken, int.Parse(api[0]), api[1], connection);
     }
     public void WithStreams(Stream[] _) { }