cleanup feeds

Author: hay-kot

backend/internal/core/feeds/feeds.go

@@ -15,6 +15,7 @@ type Config struct {
 // Feed represents a webhook feed configuration
 type Feed struct {
 	Name            string     `yaml:"name"`
+	Category        string     `yaml:"category"`
 	ID              string     `yaml:"id"`   // used as the unique identifier
 	Keys            []string   `yaml:"keys"` // used as the :key value in url path to resolve feed
 	Description     string     `yaml:"description"`
@@ -27,6 +28,7 @@ type Feed struct {
 func (f Feed) IntoParsed() FeedParsed {
 	fp := FeedParsed{
 		Name:            f.Name,
+		Category:        f.Category,
 		ID:              f.ID,
 		Keys:            f.Keys,
 		Description:     f.Description,
@@ -60,6 +62,7 @@ func (f Feed) IntoParsed() FeedParsed {
 // where none were assigned in the base type
 type FeedParsed struct {
 	Name            string          `yaml:"name"`
+	Category        string          `yaml:"category"`
 	ID              string          `yaml:"id"`   // used as the unique identifier
 	Keys            []string        `yaml:"keys"` // used as the :key value in url path to resolve feed
 	Description     string          `yaml:"description"`

backend/internal/data/db/feed_message.sql

@@ -108,21 +108,19 @@ SET
 WHERE
     id = ANY($1::uuid[]);
 
--- name: FeedMessageBulkDelete :one
+-- name: FeedMessageBulkDelete :execrows
 DELETE FROM
     feed_messages
 WHERE
-    id = ANY(sqlc.arg('message_ids')::uuid[])
-RETURNING COUNT(*);
+    id = ANY(sqlc.arg('message_ids')::uuid[]);
 
--- name: FeedMessageBulkDeleteByFilter :one
+-- name: FeedMessageBulkDeleteByFilter :execrows
 DELETE FROM
     feed_messages
 WHERE
     feed_slug = $1
     AND (sqlc.narg('priority')::integer IS NULL OR priority = sqlc.narg('priority'))
-    AND (sqlc.narg('older_than')::timestamp IS NULL OR received_at < sqlc.narg('older_than'))
-RETURNING COUNT(*);
+    AND (sqlc.narg('older_than')::timestamp IS NULL OR received_at < sqlc.narg('older_than'));
 
 -- name: FeedMessageSearch :many
 SELECT

backend/internal/data/db/feed_message.sql.go

@@ -1,9 +1,10 @@
 package dtos
 
 type Feed struct {
-	Name        string `json:"name"`
-	ID          string `json:"id"`
-	Keys        []string
+	Name        string    `json:"name"`
+	Category    string    `json:"category"`
+	ID          string    `json:"id"`
+	Keys        []string  `json:"-"`
 	Description string    `json:"description"`
 	Middleware  []string  `json:"middleware"`
 	Adapters    []string  `json:"adapters"`

backend/internal/data/dtos/feeds.go

@@ -2,7 +2,7 @@ package dtos
 
 type Pagination struct {
 	Skip  int `json:"skip"  validate:"omitempty,gte=0"`
-	Limit int `json:"limit" validate:"omitempty,gte=1,lte=300"`
+	Limit int `json:"limit" validate:"omitempty,gte=1,lte=10000"`
 }
 
 // WithDefaults returns a copy of Pagination where the defaults have been set

backend/internal/data/dtos/pagination.go

@@ -46,6 +46,7 @@ func (f *FeedService) GetAllFeeds() []dtos.Feed {
 	return utils.Map(parsed, func(f feeds.FeedParsed) dtos.Feed {
 		return dtos.Feed{
 			Name:        f.Name,
+			Category:    f.Category,
 			ID:          f.ID,
 			Keys:        f.Keys,
 			Description: f.Description,

backend/internal/services/feed_service.go

@@ -913,18 +913,15 @@
                         "type": "string"
                     }
                 },
+                "category": {
+                    "type": "string"
+                },
                 "description": {
                     "type": "string"
                 },
                 "id": {
                     "type": "string"
                 },
-                "keys": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
                 "middleware": {
                     "type": "array",
                     "items": {

backend/internal/web/docs/swagger.json

@@ -7,6 +7,7 @@ middleware:
 # Feed definitions
 feeds:
   - name: "Production Alerts"
+    category: Alerting
     id: "prod-alerts"
     keys:
       - 1ftyjSfiZott986g1rWykD # github
@@ -25,6 +26,7 @@ feeds:
       maxAgeDays: 90
 
   - name: "GitHub Events"
+    category: External
     id: "github-events"
     keys:
       - 1ftyjSfiZott983g1rWykD # github
@@ -42,6 +44,7 @@ feeds:
       maxAgeDays: 30
 
   - name: "Development Testing"
+    category: Alerting
     id: "dev-test"
     keys:
       - 3ftyjSfiZott983g1rWykD # github
@@ -58,6 +61,7 @@ feeds:
       maxAgeDays: 1
 
   - name: "Ntfy Messages"
+    category: Ntfy
     id: "ntfy-test"
     keys:
       - ntfy-test # Simple key matching the topic name for ntfy compatibility

dev/dev.feeds.yml

@@ -4,9 +4,9 @@
  */
 
 import type { FeedMessage } from "~~/lib/api/types/data-contracts";
-import IconCircle from "~icons/mdi/circle";
-import IconCircleOutline from "~icons/mdi/circle-outline";
-import IconCheck from "~icons/mdi/check";
+import IconBell from "~icons/mdi/bell";
+import IconEyeCheck from "~icons/mdi/eye-check";
+import IconCheckCircle from "~icons/mdi/check-circle";
 import IconArchive from "~icons/mdi/archive";
 import IconClock from "~icons/mdi/clock";
 import IconChevronDown from "~icons/mdi/chevron-down";
@@ -43,9 +43,9 @@ const priorityLabels = {
 
 // State icons
 const stateIcons = {
-  new: IconCircle,
-  acknowledged: IconCircleOutline,
-  resolved: IconCheck,
+  new: IconBell,
+  acknowledged: IconEyeCheck,
+  resolved: IconCheckCircle,
   archived: IconArchive,
 };
 
@@ -57,6 +57,14 @@ const stateColors = {
   archived: "text-base-content/40",
 };
 
+// State border colors
+const stateBorderColors = {
+  new: "border-l-primary",
+  acknowledged: "border-l-info",
+  resolved: "border-l-success",
+  archived: "border-l-base-content/40",
+};
+
 // Expanded state for card details
 const isExpanded = ref(false);
 const activeTab = ref<"request" | "headers" | "queryParams" | "logs">(
@@ -131,7 +139,8 @@ const handleDelete = async () => {
 
 <template>
   <div
-    class="card bg-base-200 shadow-sm border border-base-300 hover:shadow-md transition-shadow"
+    class="card bg-base-200 shadow-sm border border-base-300 hover:shadow-md transition-shadow border-l-8"
+    :class="stateBorderColors[message.state as keyof typeof stateBorderColors]"
   >
     <!-- Card Header - Always visible -->
     <div class="card-body p-4">
@@ -140,7 +149,7 @@ const handleDelete = async () => {
         <div class="flex-shrink-0 pt-1">
           <component
             :is="
-              stateIcons[message.state as keyof typeof stateIcons] || IconCircle
+              stateIcons[message.state as keyof typeof stateIcons] || IconBell
             "
             class="h-5 w-5"
             :class="stateColors[message.state as keyof typeof stateColors]"

frontend/app/components/MessageCard.vue

@@ -10,6 +10,7 @@ export interface Feed {
   name: string
   slug: string
   description: string
+  category?: string
   unreadCount: number
 }
 
@@ -31,6 +32,7 @@ export const useAppState = () => {
         name: dto.name || '',
         slug: dto.id || '', // Backend uses ID as slug
         description: dto.description || '',
+        category: dto.category,
         unreadCount: 0, // Will be calculated separately
       }))
     } catch (error) {