From 67f72bfa5d35c25922bd759e001236fce473b095 Mon Sep 17 00:00:00 2001
From: Joseph <VerifiedJoseph@users.noreply.github.com>
Date: Mon, 13 Feb 2023 21:19:41 +0000
Subject: [PATCH] [TelegramBridge] Support new username URL format (#3257)

* [TelegramBridge] Support new username URL format

* [TelegramBridge] Fix text error
---
 bridges/TelegramBridge.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/bridges/TelegramBridge.php b/bridges/TelegramBridge.php
index abe486f5..14359009 100644
--- a/bridges/TelegramBridge.php
+++ b/bridges/TelegramBridge.php
@@ -22,6 +22,8 @@ class TelegramBridge extends BridgeAbstract
         'https://telegram.me/s/rssbridge' => ['username' => 'rssbridge'],
         'https://telegram.me/rssbridge' => ['username' => 'rssbridge'],
         'http://telegram.me/rssbridge' => ['username' => 'rssbridge'],
+        'http://rssbridge.t.me/' => ['username' => 'rssbridge'],
+        'https://rssbridge.t.me/' => ['username' => 'rssbridge'],
     ];
 
     const CACHE_TIMEOUT = 60 * 15; // 15 mins
@@ -360,10 +362,17 @@ EOD;
 
     public function detectParameters($url)
     {
-        $detectParamsRegex = '/^https?:\/\/(?:t|telegram)\.me\/(?:s\/)?([\w]+)$/';
+        $detectParamsRegex = '/^https?:\/\/(?:(?:t|telegram)\.me\/(?:s\/)?([\w]+)|([\w]+)\.t\.me\/?)$/';
         $params = [];
         if (preg_match($detectParamsRegex, $url, $matches) > 0) {
-            $params['username'] = $matches[1];
+            if ($matches[1] !== '') {
+                $params['username'] = $matches[1];
+            }
+
+            if (isset($matches[2]) && $matches[2] !== '') {
+                $params['username'] = $matches[2];
+            }
+
             return $params;
         }
         return null;