feat: add feed event url support

src/client/components/feed/FeedArchivePageButton.tsx

@@ -110,7 +110,7 @@ export const FeedArchivePageButton: React.FC<FeedArchivePageButtonProps> =
                     <Button
                       size="icon"
                       variant="secondary"
-                      className="absolute right-0 top-0 h-6 w-6 overflow-hidden"
+                      className="h-6 w-6 overflow-hidden"
                       onClick={() => handleUnArchive(item)}
                     >
                       <LuArchiveRestore size={12} />

src/client/components/feed/FeedEventItem.tsx

@@ -33,7 +33,7 @@ export const FeedEventItem: React.FC<{
           </div>
         </div>
 
-        {actions}
+        <div className="absolute right-0 top-0 flex gap-1">{actions}</div>
 
         <div className="flex justify-between">
           <div className="flex flex-wrap gap-2">

src/client/routes/feed/$channelId/index.tsx

@@ -12,7 +12,13 @@ import { useTranslation } from '@i18next-toolkit/react';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
 import { useEvent } from '@/hooks/useEvent';
 import { AlertConfirm } from '@/components/AlertConfirm';
-import { LuArchive, LuPencil, LuTrash, LuWebhook } from 'react-icons/lu';
+import {
+  LuArchive,
+  LuLink,
+  LuPencil,
+  LuTrash,
+  LuWebhook,
+} from 'react-icons/lu';
 import { Button } from '@/components/ui/button';
 import { FeedApiGuide } from '@/components/feed/FeedApiGuide';
 import { FeedEventItem } from '@/components/feed/FeedEventItem';
@@ -156,14 +162,27 @@ function PageComponent() {
               className="animate-fade-in mb-2"
               event={item}
               actions={
+                <>
+                  {item.url && (
                     <Button
                       size="icon"
                       variant="secondary"
-                  className="absolute right-0 top-0 h-6 w-6 overflow-hidden"
+                      className="h-6 w-6 overflow-hidden"
+                      onClick={() => window.open(item.url)}
+                    >
+                      <LuLink size={12} />
+                    </Button>
+                  )}
+
+                  <Button
+                    size="icon"
+                    variant="secondary"
+                    className="h-6 w-6 overflow-hidden"
                     onClick={() => handleArchive(item)}
                   >
                     <LuArchive size={12} />
                   </Button>
+                </>
               }
             />
           )}

src/server/model/feed/event.ts

@@ -12,6 +12,7 @@ import {
 } from '../../prisma/zod/index.js';
 import dayjs from 'dayjs';
 import { z } from 'zod';
+import { compact } from 'lodash-es';
 
 const { get: getFeedEventNotify, del: delFeedEventNotifyCache } =
   buildQueryWithCache(async (channelId: string) => {
@@ -80,9 +81,12 @@ export async function sendFeedEventsNotify(
   const eventTokens: ContentToken[] = [
     token.list(
       events.map((event) =>
+        compact([
           token.text(
             `[${event.source}:${event.eventName}] ${event.senderName ?? ''}: ${event.eventContent}`
-        )
+          ),
+          event.url && token.url(event.url, '[→]'),
+        ])
       )
     ),
   ];

src/server/model/notification/token/index.ts

@@ -41,7 +41,7 @@ export const token = {
     url,
     title,
   }),
-  list: (items: ContentToken[]): ListContentToken => ({
+  list: (items: ContentToken[][]): ListContentToken => ({
     type: 'list',
     items,
   }),

src/server/model/notification/token/tokenizer/base.ts

@@ -35,7 +35,7 @@ export class BaseContentTokenizer {
   }
 
   parseList(token: ListContentToken) {
-    return token.items.map((item) => this.parse([item])).join('\n');
+    return token.items.map((tokens) => this.parse(tokens)).join('\n');
   }
 
   parse(tokens: ContentToken[]): string {

src/server/model/notification/token/tokenizer/html.ts

@@ -40,6 +40,6 @@ export class HTMLContentTokenizer extends BaseContentTokenizer {
   }
 
   parseList(token: ListContentToken) {
-    return `<ul>${token.items.map((item) => `<li>${this.parse([item])}</li>`).join('')}</ul>`;
+    return `<ul>${token.items.map((tokens) => `<li>${this.parse(tokens)}</li>`).join('')}</ul>`;
   }
 }

src/server/model/notification/token/tokenizer/markdown.ts

@@ -37,7 +37,7 @@ export class MarkdownContentTokenizer extends BaseContentTokenizer {
   parseList(token: ListContentToken) {
     return (
       '\n' +
-      token.items.map((item) => `- ${this.parse([item])}`).join('\n') +
+      token.items.map((tokens) => `- ${this.parse(tokens)}`).join('\n') +
       '\n'
     );
   }

src/server/model/notification/token/type.ts

@@ -31,7 +31,7 @@ export type UrlContentToken = {
 
 export type ListContentToken = {
   type: 'list';
-  items: ContentToken[];
+  items: ContentToken[][];
 };
 
 export type ContentToken =