Feat: allow to get single message by id

xtrime-ru · Jan 26, 2024 · a4902c0 · a4902c0
1 parent dcf40fb
commit a4902c0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -82,6 +82,7 @@ docker compose up -d
   Maximum: 100 posts
 
 * Pagination: https://tg.i-c-a.su/json/breakingmash?page=2
+* Get one message: https://tg.i-c-a.su/json/breakingmash?id=10738&limit=1
 
 ### RSS
 * URL: https://tg.i-c-a.su/rss/breakingmash
@@ -90,6 +91,7 @@ docker compose up -d
   Maximum: 100 posts
 
 * Pagination: https://tg.i-c-a.su/rss/breakingmash/2
+* Get one message: https://tg.i-c-a.su/rss/breakingmash?id=10738&limit=1
 
 ### Media
 * https://tg.i-c-a.su/media/breakingmash/10738/preview

diff --git a/app/Controller/BaseFeedController.php b/app/Controller/BaseFeedController.php
@@ -33,9 +33,14 @@ protected function getLimit(Request $request): int
         return max(1, min($limit, self::LIMIT_MAX));
     }
 
+    protected function getId(Request $request): int
+    {
+        return (int)($request->getQueryParameter('id') ?? 0);
+    }
+
     abstract protected function getHeaders(): array;
 
-    protected function getMessages(string $channel, int $page, int $limit): array
+    protected function getMessages(string $channel, int $page, int $limit, int $message_id = 0): array
     {
         $isChannel = in_array($this->client->getInfo($channel)['type'], ['channel', 'supergroup']);
 
@@ -44,6 +49,7 @@ protected function getMessages(string $channel, int $page, int $limit): array
                 'peer' => $channel,
                 'limit' => $limit,
                 'add_offset' => ($page - 1) * $limit,
+                'offset_id' => $message_id ? ($message_id + 1) : 0,
             ]
         );
         if ($isChannel) {

diff --git a/app/Controller/JsonController.php b/app/Controller/JsonController.php
@@ -26,7 +26,8 @@ public function handleRequest(Request $request): Response
                 $this->getMessages(
                     $request->getAttribute('channel'),
                     $this->getPage($request),
-                    $this->getLimit($request)
+                    $this->getLimit($request),
+                    $this->getId($request)
                 ),
                 JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_INVALID_UTF8_SUBSTITUTE
             )

diff --git a/app/Controller/RSSController.php b/app/Controller/RSSController.php
@@ -31,7 +31,7 @@ protected function getContent(Request $request): string
     {
         $channel = $request->getAttribute('channel');
         $messages = new Messages(
-            $this->getMessages($channel, $this->getPage($request), $this->getLimit($request)),
+            $this->getMessages($channel, $this->getPage($request), $this->getLimit($request), $this->getId($request)),
             $this->client,
             $channel
         );

diff --git a/public/index.html b/public/index.html
@@ -75,6 +75,7 @@ <h3>JSON</h3>
             <br />Maximum posts - 100 posts
         </li>
         <li>Pagination: <a href="/json/breakingmash?page=2" target="_blank" rel="noreferrer">https://tg.i-c-a.su/json/breakingmash?page=2</a></li>
+        <li>One post: <a href="/json/breakingmash/?id=10738&limit=1" target="_blank" rel="noreferrer">https://tg.i-c-a.su/json/breakingmash/?id=10738&limit=1</a></li>
     </ul>
     <h3>RSS</h3>
     <ul>
@@ -83,6 +84,7 @@ <h3>RSS</h3>
             <br />Maximum posts - 100 posts
         </li>
         <li>Pagination: <a href="/rss/breakingmash/2" target="_blank" rel="noreferrer">https://tg.i-c-a.su/rss/breakingmash/2</a></li>
+        <li>One post: <a href="/rss/breakingmash/?id=10738&limit=1" target="_blank" rel="noreferrer">https://tg.i-c-a.su/rss/breakingmash/?id=10738&limit=1</a></li>
     </ul>
     <h3>Media</h3>
     <ul>