From 3f2c1b3701e571f498b9d5ff757f51708ba2a6a3 Mon Sep 17 00:00:00 2001
From: Owais Jamil <desertthunder.dev@gmail.com>
Date: Mon, 16 Mar 2026 20:20:08 -0500
Subject: [PATCH] feat: add feed management screen

* update home to show feeds
---
 docs/designs/compose.html                     | 1032 +++++-----
 docs/designs/devtools.html                    |    2 +-
 docs/designs/feeds.html                       |    2 +-
 docs/designs/home.html                        |    2 +-
 docs/designs/login.html                       |    2 +-
 docs/designs/logs.html                        |    2 +-
 docs/designs/messages.html                    |    2 +-
 docs/designs/notifications.html               |    2 +-
 docs/designs/profile.html                     |    2 +-
 docs/designs/search.html                      |    2 +-
 docs/designs/settings.html                    |    2 +-
 docs/designs/styles.css                       |    2 +-
 docs/tasks/phase-2.md                         |   14 +-
 justfile                                      |    2 +-
 lib/core/database/app_database.dart           |   30 +-
 lib/core/database/app_database.g.dart         | 1696 ++++++++++++++---
 lib/core/database/tables.dart                 |   14 +
 lib/core/router/app_router.dart               |    6 +-
 .../feed/cubit/feed_preferences_cubit.dart    |  229 +++
 lib/features/feed/data/feed_repository.dart   |   49 +-
 .../presentation/feed_management_screen.dart  |  364 ++++
 .../feed/presentation/home_feed_screen.dart   |  280 +++
 lib/main.dart                                 |   10 +-
 pubspec.lock                                  |    2 +-
 pubspec.yaml                                  |    1 +
 .../cubit/feed_preferences_cubit_test.dart    |  327 ++++
 .../feed/data/feed_repository_test.dart       |  236 +++
 27 files changed, 3533 insertions(+), 781 deletions(-)
 create mode 100644 lib/features/feed/cubit/feed_preferences_cubit.dart
 create mode 100644 lib/features/feed/presentation/feed_management_screen.dart
 create mode 100644 lib/features/feed/presentation/home_feed_screen.dart
 create mode 100644 test/features/feed/cubit/feed_preferences_cubit_test.dart
 create mode 100644 test/features/feed/data/feed_repository_test.dart

diff --git a/docs/designs/compose.html b/docs/designs/compose.html
index f0d7977..fb0c1a9 100644
--- a/docs/designs/compose.html
+++ b/docs/designs/compose.html
@@ -1,515 +1,565 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>Compose - Lazurite</title>
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css">
-  <link rel="stylesheet" href="styles.css">
-  <style>
-    .compose-header {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 12px 16px;
-      border-bottom: 1px solid var(--border);
-      background-color: var(--bg);
-      position: sticky;
-      top: 0;
-      z-index: 50;
-    }
-
-    .compose-header-cancel {
-      background: none;
-      border: none;
-      color: var(--text-secondary);
-      font-size: 15px;
-      font-weight: 500;
-      cursor: pointer;
-    }
-
-    .compose-header-title {
-      font-size: 18px;
-      font-weight: 600;
-      color: var(--text-primary);
-      font-family: var(--font-heading);
-    }
-
-    .compose-header-post {
-      padding: 8px 20px;
-      border-radius: 9999px;
-      border: none;
-      background-color: var(--accent-primary);
-      color: white;
-      font-weight: 600;
-      font-size: 14px;
-      cursor: pointer;
-      transition: background-color 0.2s ease;
-    }
-
-    .compose-header-post:hover {
-      background-color: var(--accent-primary-hover);
-    }
-
-    .compose-header-post:disabled {
-      opacity: 0.5;
-      cursor: not-allowed;
-    }
-
-    .compose-body {
-      padding: 16px;
-      display: flex;
-      gap: 12px;
-      min-height: 200px;
-    }
-
-    .compose-textarea {
-      flex: 1;
-      border: none;
-      background: transparent;
-      color: var(--text-primary);
-      font-size: 16px;
-      font-family: var(--font-body);
-      resize: none;
-      outline: none;
-      min-height: 160px;
-      line-height: 1.5;
-    }
-
-    .compose-textarea::placeholder {
-      color: var(--text-muted);
-    }
-
-    /* Reply Context */
-    .reply-context {
-      padding: 12px 16px;
-      border-bottom: 1px solid var(--border);
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      background-color: var(--surface);
-    }
-
-    .reply-context-icon {
-      width: 16px;
-      height: 16px;
-      color: var(--text-muted);
-    }
-
-    .reply-context-text {
-      font-size: 13px;
-      color: var(--text-secondary);
-    }
-
-    .reply-context-handle {
-      color: var(--accent-primary);
-      font-weight: 500;
-    }
-
-    /* Media Attachments */
-    .compose-media {
-      padding: 0 16px 16px;
-      padding-left: 68px;
-    }
-
-    .media-grid {
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 8px;
-    }
-
-    .media-item {
-      position: relative;
-      border-radius: 12px;
-      overflow: hidden;
-      background: linear-gradient(135deg, var(--surface) 0%, var(--surface-variant) 100%);
-      aspect-ratio: 4 / 3;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: var(--text-muted);
-      font-size: 13px;
-    }
-
-    .media-item-remove {
-      position: absolute;
-      top: 6px;
-      right: 6px;
-      width: 24px;
-      height: 24px;
-      border-radius: 50%;
-      background-color: rgba(0, 0, 0, 0.6);
-      border: none;
-      color: white;
-      cursor: pointer;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .media-item-remove svg {
-      width: 14px;
-      height: 14px;
-    }
-
-    .media-item-alt {
-      position: absolute;
-      bottom: 6px;
-      left: 6px;
-      padding: 2px 8px;
-      border-radius: 4px;
-      background-color: rgba(0, 0, 0, 0.6);
-      color: white;
-      font-size: 11px;
-      font-weight: 600;
-      cursor: pointer;
-    }
-
-    .media-item-alt.has-alt {
-      background-color: var(--accent-primary);
-    }
-
-    /* Toolbar */
-    .compose-toolbar {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 12px 16px;
-      border-top: 1px solid var(--border);
-      position: sticky;
-      bottom: 0;
-      background-color: var(--bg);
-    }
-
-    .toolbar-actions {
-      display: flex;
-      gap: 4px;
-    }
-
-    .toolbar-btn {
-      width: 40px;
-      height: 40px;
-      border-radius: 50%;
-      border: none;
-      background: transparent;
-      color: var(--accent-primary);
-      cursor: pointer;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      transition: background-color 0.2s ease;
-    }
-
-    .toolbar-btn:hover {
-      background-color: var(--surface);
-    }
-
-    .toolbar-btn svg {
-      width: 22px;
-      height: 22px;
-    }
-
-    .toolbar-btn.disabled {
-      color: var(--text-muted);
-      cursor: not-allowed;
-    }
-
-    /* Character Counter */
-    .char-counter {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-    }
-
-    .char-counter-ring {
-      width: 28px;
-      height: 28px;
-      position: relative;
-    }
-
-    .char-counter-ring svg {
-      width: 28px;
-      height: 28px;
-      transform: rotate(-90deg);
-    }
-
-    .char-counter-ring circle {
-      fill: none;
-      stroke-width: 2.5;
-    }
-
-    .char-counter-bg {
-      stroke: var(--surface-variant);
-    }
-
-    .char-counter-fill {
-      stroke: var(--accent-primary);
-      stroke-dasharray: 75.4;
-      stroke-dashoffset: 30;
-      stroke-linecap: round;
-      transition: stroke-dashoffset 0.2s ease, stroke 0.2s ease;
-    }
-
-    .char-counter-fill.warning {
-      stroke: var(--accent-warning);
-    }
-
-    .char-counter-fill.danger {
-      stroke: var(--accent-error);
-    }
-
-    .char-counter-text {
-      font-size: 13px;
-      color: var(--text-muted);
-      font-variant-numeric: tabular-nums;
-    }
-
-    /* Drafts */
-    .drafts-divider {
-      height: 8px;
-      background-color: var(--surface);
-      border-top: 1px solid var(--border);
-      border-bottom: 1px solid var(--border);
-    }
-
-    .drafts-header {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 16px;
-    }
-
-    .drafts-title {
-      font-size: 16px;
-      font-weight: 600;
-      color: var(--text-primary);
-    }
-
-    .drafts-count {
-      font-size: 13px;
-      color: var(--text-muted);
-    }
-
-    .draft-item {
-      padding: 12px 16px;
-      border-bottom: 1px solid var(--border);
-      cursor: pointer;
-      transition: background-color 0.2s ease;
-    }
-
-    .draft-item:hover {
-      background-color: var(--surface);
-    }
-
-    .draft-item-text {
-      font-size: 15px;
-      color: var(--text-primary);
-      line-height: 1.4;
-      display: -webkit-box;
-      -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical;
-      overflow: hidden;
-    }
-
-    .draft-item-meta {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      margin-top: 6px;
-      font-size: 12px;
-      color: var(--text-muted);
-    }
-
-    .draft-item-badge {
-      padding: 2px 6px;
-      border-radius: 4px;
-      background-color: var(--surface-variant);
-      font-size: 11px;
-      font-weight: 600;
-      color: var(--text-secondary);
-    }
-
-    .draft-item-badge.scheduled {
-      background-color: var(--accent-primary);
-      color: white;
-    }
-
-    /* Schedule Pill */
-    .schedule-pill {
-      display: inline-flex;
-      align-items: center;
-      gap: 6px;
-      padding: 6px 12px;
-      border-radius: 9999px;
-      background-color: var(--surface);
-      border: 1px solid var(--border);
-      font-size: 13px;
-      color: var(--text-secondary);
-      margin-left: 68px;
-      margin-bottom: 12px;
-      cursor: pointer;
-      transition: all 0.2s ease;
-    }
-
-    .schedule-pill:hover {
-      border-color: var(--accent-primary);
-      color: var(--accent-primary);
-    }
-
-    .schedule-pill svg {
-      width: 14px;
-      height: 14px;
-    }
-
-    .schedule-pill.active {
-      background-color: var(--accent-primary);
-      border-color: var(--accent-primary);
-      color: white;
-    }
-  </style>
-</head>
-<body>
-  <div class="mobile-container">
-
-    <!-- Compose Header -->
-    <div class="compose-header">
-      <button class="compose-header-cancel">Cancel</button>
-      <span class="compose-header-title">New Post</span>
-      <button class="compose-header-post">Post</button>
-    </div>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>Compose - Lazurite</title>
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap"
+      rel="stylesheet" />
+    <link rel="stylesheet" href="styles.css" />
+    <style>
+      .compose-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 12px 16px;
+        border-bottom: 1px solid var(--border);
+        background-color: var(--bg);
+        position: sticky;
+        top: 0;
+        z-index: 50;
+      }
+
+      .compose-header-cancel {
+        background: none;
+        border: none;
+        color: var(--text-secondary);
+        font-size: 15px;
+        font-weight: 500;
+        cursor: pointer;
+      }
+
+      .compose-header-title {
+        font-size: 18px;
+        font-weight: 600;
+        color: var(--text-primary);
+        font-family: var(--font-heading);
+      }
+
+      .compose-header-post {
+        padding: 8px 20px;
+        border-radius: 9999px;
+        border: none;
+        background-color: var(--accent-primary);
+        color: white;
+        font-weight: 600;
+        font-size: 14px;
+        cursor: pointer;
+        transition: background-color 0.2s ease;
+      }
+
+      .compose-header-post:hover {
+        background-color: var(--accent-primary-hover);
+      }
+
+      .compose-header-post:disabled {
+        opacity: 0.5;
+        cursor: not-allowed;
+      }
+
+      .compose-body {
+        padding: 16px;
+        display: flex;
+        gap: 12px;
+        min-height: 200px;
+      }
+
+      .compose-textarea {
+        flex: 1;
+        border: none;
+        background: transparent;
+        color: var(--text-primary);
+        font-size: 16px;
+        font-family: var(--font-body);
+        resize: none;
+        outline: none;
+        min-height: 160px;
+        line-height: 1.5;
+      }
+
+      .compose-textarea::placeholder {
+        color: var(--text-muted);
+      }
+
+      /* Reply Context */
+      .reply-context {
+        padding: 12px 16px;
+        border-bottom: 1px solid var(--border);
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        background-color: var(--surface);
+      }
+
+      .reply-context-icon {
+        width: 16px;
+        height: 16px;
+        color: var(--text-muted);
+      }
+
+      .reply-context-text {
+        font-size: 13px;
+        color: var(--text-secondary);
+      }
+
+      .reply-context-handle {
+        color: var(--accent-primary);
+        font-weight: 500;
+      }
+
+      /* Media Attachments */
+      .compose-media {
+        padding: 0 16px 16px;
+        padding-left: 68px;
+      }
+
+      .media-grid {
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 8px;
+      }
+
+      .media-item {
+        position: relative;
+        border-radius: 12px;
+        overflow: hidden;
+        background: linear-gradient(135deg, var(--surface) 0%, var(--surface-variant) 100%);
+        aspect-ratio: 4 / 3;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: var(--text-muted);
+        font-size: 13px;
+      }
+
+      .media-item-remove {
+        position: absolute;
+        top: 6px;
+        right: 6px;
+        width: 24px;
+        height: 24px;
+        border-radius: 50%;
+        background-color: rgba(0, 0, 0, 0.6);
+        border: none;
+        color: white;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      .media-item-remove svg {
+        width: 14px;
+        height: 14px;
+      }
+
+      .media-item-alt {
+        position: absolute;
+        bottom: 6px;
+        left: 6px;
+        padding: 2px 8px;
+        border-radius: 4px;
+        background-color: rgba(0, 0, 0, 0.6);
+        color: white;
+        font-size: 11px;
+        font-weight: 600;
+        cursor: pointer;
+      }
+
+      .media-item-alt.has-alt {
+        background-color: var(--accent-primary);
+      }
+
+      /* Toolbar */
+      .compose-toolbar {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 12px 16px;
+        border-top: 1px solid var(--border);
+        position: sticky;
+        bottom: 0;
+        background-color: var(--bg);
+      }
+
+      .toolbar-actions {
+        display: flex;
+        gap: 4px;
+      }
+
+      .toolbar-btn {
+        width: 40px;
+        height: 40px;
+        border-radius: 50%;
+        border: none;
+        background: transparent;
+        color: var(--accent-primary);
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: background-color 0.2s ease;
+      }
+
+      .toolbar-btn:hover {
+        background-color: var(--surface);
+      }
+
+      .toolbar-btn svg {
+        width: 22px;
+        height: 22px;
+      }
+
+      .toolbar-btn.disabled {
+        color: var(--text-muted);
+        cursor: not-allowed;
+      }
+
+      /* Character Counter */
+      .char-counter {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+
+      .char-counter-ring {
+        width: 28px;
+        height: 28px;
+        position: relative;
+      }
+
+      .char-counter-ring svg {
+        width: 28px;
+        height: 28px;
+        transform: rotate(-90deg);
+      }
+
+      .char-counter-ring circle {
+        fill: none;
+        stroke-width: 2.5;
+      }
+
+      .char-counter-bg {
+        stroke: var(--surface-variant);
+      }
+
+      .char-counter-fill {
+        stroke: var(--accent-primary);
+        stroke-dasharray: 75.4;
+        stroke-dashoffset: 30;
+        stroke-linecap: round;
+        transition:
+          stroke-dashoffset 0.2s ease,
+          stroke 0.2s ease;
+      }
+
+      .char-counter-fill.warning {
+        stroke: var(--accent-warning);
+      }
+
+      .char-counter-fill.danger {
+        stroke: var(--accent-error);
+      }
+
+      .char-counter-text {
+        font-size: 13px;
+        color: var(--text-muted);
+        font-variant-numeric: tabular-nums;
+      }
+
+      /* Drafts */
+      .drafts-divider {
+        height: 8px;
+        background-color: var(--surface);
+        border-top: 1px solid var(--border);
+        border-bottom: 1px solid var(--border);
+      }
+
+      .drafts-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 16px;
+      }
+
+      .drafts-title {
+        font-size: 16px;
+        font-weight: 600;
+        color: var(--text-primary);
+      }
+
+      .drafts-count {
+        font-size: 13px;
+        color: var(--text-muted);
+      }
+
+      .draft-item {
+        padding: 12px 16px;
+        border-bottom: 1px solid var(--border);
+        cursor: pointer;
+        transition: background-color 0.2s ease;
+      }
+
+      .draft-item:hover {
+        background-color: var(--surface);
+      }
+
+      .draft-item-text {
+        font-size: 15px;
+        color: var(--text-primary);
+        line-height: 1.4;
+        display: -webkit-box;
+        line-clamp: 2;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        overflow: hidden;
+      }
+
+      .draft-item-meta {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        margin-top: 6px;
+        font-size: 12px;
+        color: var(--text-muted);
+      }
+
+      .draft-item-badge {
+        padding: 2px 6px;
+        border-radius: 4px;
+        background-color: var(--surface-variant);
+        font-size: 11px;
+        font-weight: 600;
+        color: var(--text-secondary);
+      }
+
+      .draft-item-badge.scheduled {
+        background-color: var(--accent-primary);
+        color: white;
+      }
+
+      /* Schedule Pill */
+      .schedule-pill {
+        display: inline-flex;
+        align-items: center;
+        gap: 6px;
+        padding: 6px 12px;
+        border-radius: 9999px;
+        background-color: var(--surface);
+        border: 1px solid var(--border);
+        font-size: 13px;
+        color: var(--text-secondary);
+        margin-left: 68px;
+        margin-bottom: 12px;
+        cursor: pointer;
+        transition: all 0.2s ease;
+      }
+
+      .schedule-pill:hover {
+        border-color: var(--accent-primary);
+        color: var(--accent-primary);
+      }
+
+      .schedule-pill svg {
+        width: 14px;
+        height: 14px;
+      }
+
+      .schedule-pill.active {
+        background-color: var(--accent-primary);
+        border-color: var(--accent-primary);
+        color: white;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="mobile-container">
+      <!-- Compose Header -->
+      <div class="compose-header">
+        <button class="compose-header-cancel">Cancel</button>
+        <span class="compose-header-title">New Post</span>
+        <button class="compose-header-post">Post</button>
+      </div>
 
-    <!-- Reply Context (shown when replying) -->
-    <div class="reply-context">
-      <svg class="reply-context-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-        <polyline points="9 14 4 9 9 4"/>
-        <path d="M20 20v-7a4 4 0 0 0-4-4H4"/>
-      </svg>
-      <span class="reply-context-text">Replying to <span class="reply-context-handle">@alice.bsky.social</span></span>
-    </div>
+      <!-- Reply Context (shown when replying) -->
+      <div class="reply-context">
+        <svg
+          class="reply-context-icon"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2"
+          stroke-linecap="round"
+          stroke-linejoin="round">
+          <polyline points="9 14 4 9 9 4" />
+          <path d="M20 20v-7a4 4 0 0 0-4-4H4" />
+        </svg>
+        <span class="reply-context-text">Replying to <span class="reply-context-handle">@alice.bsky.social</span></span>
+      </div>
 
-    <!-- Compose Body -->
-    <div class="compose-body">
-      <div class="avatar avatar-sm">JD</div>
-      <textarea class="compose-textarea" placeholder="What's on your mind?" rows="6">Excited to share my latest project built with the AT Protocol! Check it out and let me know what you think.</textarea>
-    </div>
+      <!-- Compose Body -->
+      <div class="compose-body">
+        <div class="avatar avatar-sm">JD</div>
+        <textarea class="compose-textarea" placeholder="What's on your mind?" rows="6">
+Excited to share my latest project built with the AT Protocol! Check it out and let me know what you think.</textarea
+        >
+      </div>
 
-    <!-- Schedule Pill -->
-    <div class="schedule-pill">
-      <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-        <circle cx="12" cy="12" r="10"/>
-        <polyline points="12 6 12 12 16 14"/>
-      </svg>
-      Schedule for later
-    </div>
+      <!-- Schedule Pill -->
+      <div class="schedule-pill">
+        <svg
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2"
+          stroke-linecap="round"
+          stroke-linejoin="round">
+          <circle cx="12" cy="12" r="10" />
+          <polyline points="12 6 12 12 16 14" />
+        </svg>
+        Schedule for later
+      </div>
 
-    <!-- Media Attachments -->
-    <div class="compose-media">
-      <div class="media-grid">
-        <div class="media-item">
-          [Photo 1]
-          <button class="media-item-remove">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-              <line x1="18" y1="6" x2="6" y2="18"/>
-              <line x1="6" y1="6" x2="18" y2="18"/>
+      <!-- Media Attachments -->
+      <div class="compose-media">
+        <div class="media-grid">
+          <div class="media-item">
+            [Photo 1]
+            <button class="media-item-remove">
+              <svg
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round">
+                <line x1="18" y1="6" x2="6" y2="18" />
+                <line x1="6" y1="6" x2="18" y2="18" />
+              </svg>
+            </button>
+            <span class="media-item-alt has-alt">ALT</span>
+          </div>
+          <div class="media-item">
+            [Photo 2]
+            <button class="media-item-remove">
+              <svg
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round">
+                <line x1="18" y1="6" x2="6" y2="18" />
+                <line x1="6" y1="6" x2="18" y2="18" />
+              </svg>
+            </button>
+            <span class="media-item-alt">ALT</span>
+          </div>
+        </div>
+      </div>
+
+      <!-- Toolbar -->
+      <div class="compose-toolbar">
+        <div class="toolbar-actions">
+          <!-- Image -->
+          <button class="toolbar-btn" title="Add image">
+            <svg
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round">
+              <rect x="3" y="3" width="18" height="18" rx="2" ry="2" />
+              <circle cx="8.5" cy="8.5" r="1.5" />
+              <polyline points="21 15 16 10 5 21" />
             </svg>
           </button>
-          <span class="media-item-alt has-alt">ALT</span>
-        </div>
-        <div class="media-item">
-          [Photo 2]
-          <button class="media-item-remove">
-            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-              <line x1="18" y1="6" x2="6" y2="18"/>
-              <line x1="6" y1="6" x2="18" y2="18"/>
+          <!-- Drafts -->
+          <button class="toolbar-btn" title="Drafts">
+            <svg
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round">
+              <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
+              <polyline points="14 2 14 8 20 8" />
+              <line x1="16" y1="13" x2="8" y2="13" />
+              <line x1="16" y1="17" x2="8" y2="17" />
+            </svg>
+          </button>
+          <!-- Schedule -->
+          <button class="toolbar-btn" title="Schedule">
+            <svg
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round">
+              <circle cx="12" cy="12" r="10" />
+              <polyline points="12 6 12 12 16 14" />
             </svg>
           </button>
-          <span class="media-item-alt">ALT</span>
         </div>
-      </div>
-    </div>
-
-    <!-- Toolbar -->
-    <div class="compose-toolbar">
-      <div class="toolbar-actions">
-        <!-- Image -->
-        <button class="toolbar-btn" title="Add image">
-          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
-            <circle cx="8.5" cy="8.5" r="1.5"/>
-            <polyline points="21 15 16 10 5 21"/>
-          </svg>
-        </button>
-        <!-- Drafts -->
-        <button class="toolbar-btn" title="Drafts">
-          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
-            <polyline points="14 2 14 8 20 8"/>
-            <line x1="16" y1="13" x2="8" y2="13"/>
-            <line x1="16" y1="17" x2="8" y2="17"/>
-          </svg>
-        </button>
-        <!-- Schedule -->
-        <button class="toolbar-btn" title="Schedule">
-          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <circle cx="12" cy="12" r="10"/>
-            <polyline points="12 6 12 12 16 14"/>
-          </svg>
-        </button>
-      </div>
 
-      <div class="char-counter">
-        <span class="char-counter-text">192</span>
-        <div class="char-counter-ring">
-          <svg viewBox="0 0 28 28">
-            <circle class="char-counter-bg" cx="14" cy="14" r="12"/>
-            <circle class="char-counter-fill" cx="14" cy="14" r="12"/>
-          </svg>
+        <div class="char-counter">
+          <span class="char-counter-text">192</span>
+          <div class="char-counter-ring">
+            <svg viewBox="0 0 28 28">
+              <circle class="char-counter-bg" cx="14" cy="14" r="12" />
+              <circle class="char-counter-fill" cx="14" cy="14" r="12" />
+            </svg>
+          </div>
         </div>
       </div>
-    </div>
 
-    <!-- Drafts Section (shown when drafts toolbar button is tapped) -->
-    <div class="drafts-divider"></div>
+      <!-- Drafts Section (shown when drafts toolbar button is tapped) -->
+      <div class="drafts-divider"></div>
 
-    <div class="drafts-header">
-      <span class="drafts-title">Drafts</span>
-      <span class="drafts-count">3 drafts</span>
-    </div>
+      <div class="drafts-header">
+        <span class="drafts-title">Drafts</span>
+        <span class="drafts-count">3 drafts</span>
+      </div>
 
-    <div class="draft-item">
-      <div class="draft-item-text">Working on a thread about decentralised identity and why it matters for the open web...</div>
-      <div class="draft-item-meta">
-        <span>2 hours ago</span>
-        <span class="draft-item-badge">Draft</span>
+      <div class="draft-item">
+        <div class="draft-item-text">
+          Working on a thread about decentralised identity and why it matters for the open web...
+        </div>
+        <div class="draft-item-meta">
+          <span>2 hours ago</span>
+          <span class="draft-item-badge">Draft</span>
+        </div>
       </div>
-    </div>
 
-    <div class="draft-item">
-      <div class="draft-item-text">Hot take: the best developer experience is the one you don't notice</div>
-      <div class="draft-item-meta">
-        <span>Yesterday</span>
-        <span class="draft-item-badge scheduled">Mar 18, 9:00 AM</span>
+      <div class="draft-item">
+        <div class="draft-item-text">Hot take: the best developer experience is the one you don't notice</div>
+        <div class="draft-item-meta">
+          <span>Yesterday</span>
+          <span class="draft-item-badge scheduled">Mar 18, 9:00 AM</span>
+        </div>
       </div>
-    </div>
 
-    <div class="draft-item">
-      <div class="draft-item-text">Quick review of the new AT Protocol SDK features that shipped this week</div>
-      <div class="draft-item-meta">
-        <span>3 days ago</span>
-        <span class="draft-item-badge">Draft</span>
+      <div class="draft-item">
+        <div class="draft-item-text">Quick review of the new AT Protocol SDK features that shipped this week</div>
+        <div class="draft-item-meta">
+          <span>3 days ago</span>
+          <span class="draft-item-badge">Draft</span>
+        </div>
       </div>
     </div>
 
-  </div>
-
-  <script>
-    if (localStorage.getItem('theme')) {
-      const t = localStorage.getItem('theme');
-      if (t !== 'light') document.documentElement.setAttribute('data-theme', t);
-    }
-  </script>
-</body>
+    <script>
+      if (localStorage.getItem("theme")) {
+        const t = localStorage.getItem("theme");
+        if (t !== "light") document.documentElement.setAttribute("data-theme", t);
+      }
+    </script>
+  </body>
 </html>
diff --git a/docs/designs/devtools.html b/docs/designs/devtools.html
index d5f426c..08a9337 100644
--- a/docs/designs/devtools.html
+++ b/docs/designs/devtools.html
@@ -9,7 +9,7 @@
     <link
       href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500;600&display=swap"
       rel="stylesheet" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css" />
+    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="styles.css" />
     <style>
       .devtools-container {
diff --git a/docs/designs/feeds.html b/docs/designs/feeds.html
index 70cb5c2..c2eb78a 100644
--- a/docs/designs/feeds.html
+++ b/docs/designs/feeds.html
@@ -7,7 +7,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css" />
+    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet" />
     <link rel="stylesheet" href="styles.css" />
     <style>
       .feeds-container {
diff --git a/docs/designs/home.html b/docs/designs/home.html
index a477998..c1534ef 100644
--- a/docs/designs/home.html
+++ b/docs/designs/home.html
@@ -7,7 +7,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css">
+  <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="styles.css">
   <style>
     .feed-container {
diff --git a/docs/designs/login.html b/docs/designs/login.html
index ab928af..5f5835f 100644
--- a/docs/designs/login.html
+++ b/docs/designs/login.html
@@ -7,7 +7,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css">
+  <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="styles.css">
   <style>
     .login-screen {
diff --git a/docs/designs/logs.html b/docs/designs/logs.html
index 5e0587a..7cef42e 100644
--- a/docs/designs/logs.html
+++ b/docs/designs/logs.html
@@ -9,7 +9,7 @@
     <link
       href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500;600&display=swap"
       rel="stylesheet" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css" />
+    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet" />
     <link rel="stylesheet" href="styles.css" />
     <style>
       .logs-container {
diff --git a/docs/designs/messages.html b/docs/designs/messages.html
index 2ca8954..736b08d 100644
--- a/docs/designs/messages.html
+++ b/docs/designs/messages.html
@@ -7,7 +7,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css">
+  <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="styles.css">
   <style>
     .messages-container {
diff --git a/docs/designs/notifications.html b/docs/designs/notifications.html
index b9aa85d..f3acc1a 100644
--- a/docs/designs/notifications.html
+++ b/docs/designs/notifications.html
@@ -7,7 +7,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css" />
+    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet" />
     <link rel="stylesheet" href="styles.css" />
     <style>
       .notif-container {
diff --git a/docs/designs/profile.html b/docs/designs/profile.html
index 62229c3..e3f21ec 100644
--- a/docs/designs/profile.html
+++ b/docs/designs/profile.html
@@ -7,7 +7,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css">
+  <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="styles.css">
   <style>
     .profile-container {
diff --git a/docs/designs/search.html b/docs/designs/search.html
index dd6b56e..9ec86f3 100644
--- a/docs/designs/search.html
+++ b/docs/designs/search.html
@@ -10,7 +10,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
-      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans+Condensed:wght@400;500;600&family=IBM+Plex+Sans:wght@400;500;600;700&display=swap"
+      href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap"
       rel="stylesheet"
     />
     <link rel="stylesheet" href="styles.css" />
diff --git a/docs/designs/settings.html b/docs/designs/settings.html
index 2887337..78a0b25 100644
--- a/docs/designs/settings.html
+++ b/docs/designs/settings.html
@@ -7,7 +7,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/geist@1.2.2/dist/fonts/geist-sans/style.css">
+  <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="styles.css">
   <style>
     .settings-container {
diff --git a/docs/designs/styles.css b/docs/designs/styles.css
index 8fcf4b7..69581d6 100644
--- a/docs/designs/styles.css
+++ b/docs/designs/styles.css
@@ -228,7 +228,7 @@ html {
 /* Font Variables */
 :root {
   --font-heading: 'Lora', Georgia, 'Times New Roman', serif;
-  --font-body: 'Geist', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  --font-body: 'DM Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
   --font-mono: 'JetBrains Mono', 'IBM Plex Mono', 'Fira Code', monospace;
 }
 
diff --git a/docs/tasks/phase-2.md b/docs/tasks/phase-2.md
index c3c5942..ee46ded 100644
--- a/docs/tasks/phase-2.md
+++ b/docs/tasks/phase-2.md
@@ -17,13 +17,13 @@
 
 ## M5 — Feeds
 
-- [ ] Build home screen with horizontally-swipable tab bar (one tab per pinned feed)
-- [ ] Implement timeline feed via `getTimeline` with cursor pagination
-- [ ] Implement feed generator rendering via `getFeed` (AT-URI + pagination)
-- [ ] `FeedPreferencesCubit` — read/write `savedFeedsPrefV2` via `getPreferences` / `putPreferences`
-- [ ] Cache feed preferences in Drift for offline access
-- [ ] Feed discovery screen via `getSuggestedFeeds` — browse and add generators
-- [ ] Feed management UI — pin/unpin, drag-to-reorder, remove saved feeds
+- [x] Build home screen with horizontally-swipable tab bar (one tab per pinned feed)
+- [x] Implement timeline feed via `getTimeline` with cursor pagination
+- [x] Implement feed generator rendering via `getFeed` (AT-URI + pagination)
+- [x] `FeedPreferencesCubit` — read/write `savedFeedsPrefV2` via `getPreferences` / `putPreferences`
+- [x] Cache feed preferences in Drift for offline access
+- [x] Feed discovery screen via `getSuggestedFeeds` — browse and add generators
+- [x] Feed management UI — pin/unpin, drag-to-reorder, remove saved feeds
 
 ## M6 — Search
 
diff --git a/justfile b/justfile
index 96786c9..7116cdd 100644
--- a/justfile
+++ b/justfile
@@ -20,7 +20,7 @@ test *paths='':
     flutter test {{ paths }} --fail-fast --timeout=120s
 
 generate:
-    dart run build_runner build --delete-conflicting-outputs
+    flutter pub run build_runner build --delete-conflicting-outputs
 
 # Run code gen
 gen: generate format
diff --git a/lib/core/database/app_database.dart b/lib/core/database/app_database.dart
index c71aacd..724db56 100644
--- a/lib/core/database/app_database.dart
+++ b/lib/core/database/app_database.dart
@@ -6,12 +6,12 @@ import 'package:lazurite/core/database/tables.dart';
 
 part 'app_database.g.dart';
 
-@DriftDatabase(tables: [Accounts, CachedProfiles, CachedPosts, Settings])
+@DriftDatabase(tables: [Accounts, CachedProfiles, CachedPosts, Settings, SavedFeeds])
 class AppDatabase extends _$AppDatabase {
   AppDatabase({QueryExecutor? executor}) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 2;
+  int get schemaVersion => 3;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -26,6 +26,9 @@ class AppDatabase extends _$AppDatabase {
         await migrator.createTable(cachedProfiles);
         await migrator.createTable(cachedPosts);
       }
+      if (from < 3) {
+        await migrator.createTable(savedFeeds);
+      }
     },
   );
 
@@ -114,4 +117,27 @@ class AppDatabase extends _$AppDatabase {
   );
 
   Future<int> deleteSetting(String key) => (delete(settings)..where((s) => s.key.equals(key))).go();
+
+  Future<List<SavedFeedEntry>> getSavedFeeds(String accountDid) =>
+      (select(savedFeeds)
+            ..where((f) => f.accountDid.equals(accountDid))
+            ..orderBy([(f) => OrderingTerm.asc(f.sortOrder)]))
+          .get();
+
+  Future<int> insertSavedFeed(SavedFeedsCompanion feed) => into(savedFeeds).insert(feed, mode: InsertMode.replace);
+
+  Future<int> deleteSavedFeed(String id, String accountDid) =>
+      (delete(savedFeeds)..where((f) => f.id.equals(id) & f.accountDid.equals(accountDid))).go();
+
+  Future<int> deleteAllSavedFeeds(String accountDid) =>
+      (delete(savedFeeds)..where((f) => f.accountDid.equals(accountDid))).go();
+
+  Future<void> replaceSavedFeeds(String accountDid, List<SavedFeedsCompanion> feeds) async {
+    await transaction(() async {
+      await deleteAllSavedFeeds(accountDid);
+      for (final feed in feeds) {
+        await insertSavedFeed(feed);
+      }
+    });
+  }
 }
diff --git a/lib/core/database/app_database.g.dart b/lib/core/database/app_database.g.dart
index 6fb0c23..a5fc281 100644
--- a/lib/core/database/app_database.g.dart
+++ b/lib/core/database/app_database.g.dart
@@ -26,7 +26,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _displayNameMeta = const VerificationMeta('displayName');
+  static const VerificationMeta _displayNameMeta = const VerificationMeta(
+    'displayName',
+  );
   @override
   late final GeneratedColumn<String> displayName = GeneratedColumn<String>(
     'display_name',
@@ -35,7 +37,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _serviceMeta = const VerificationMeta('service');
+  static const VerificationMeta _serviceMeta = const VerificationMeta(
+    'service',
+  );
   @override
   late final GeneratedColumn<String> service = GeneratedColumn<String>(
     'service',
@@ -44,7 +48,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _accessTokenMeta = const VerificationMeta('accessToken');
+  static const VerificationMeta _accessTokenMeta = const VerificationMeta(
+    'accessToken',
+  );
   @override
   late final GeneratedColumn<String> accessToken = GeneratedColumn<String>(
     'access_token',
@@ -53,7 +59,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _refreshTokenMeta = const VerificationMeta('refreshToken');
+  static const VerificationMeta _refreshTokenMeta = const VerificationMeta(
+    'refreshToken',
+  );
   @override
   late final GeneratedColumn<String> refreshToken = GeneratedColumn<String>(
     'refresh_token',
@@ -62,7 +70,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _dpopPublicKeyMeta = const VerificationMeta('dpopPublicKey');
+  static const VerificationMeta _dpopPublicKeyMeta = const VerificationMeta(
+    'dpopPublicKey',
+  );
   @override
   late final GeneratedColumn<String> dpopPublicKey = GeneratedColumn<String>(
     'dpop_public_key',
@@ -71,7 +81,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _dpopPrivateKeyMeta = const VerificationMeta('dpopPrivateKey');
+  static const VerificationMeta _dpopPrivateKeyMeta = const VerificationMeta(
+    'dpopPrivateKey',
+  );
   @override
   late final GeneratedColumn<String> dpopPrivateKey = GeneratedColumn<String>(
     'dpop_private_key',
@@ -80,7 +92,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _dpopNonceMeta = const VerificationMeta('dpopNonce');
+  static const VerificationMeta _dpopNonceMeta = const VerificationMeta(
+    'dpopNonce',
+  );
   @override
   late final GeneratedColumn<String> dpopNonce = GeneratedColumn<String>(
     'dpop_nonce',
@@ -89,7 +103,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.string,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _expiresAtMeta = const VerificationMeta('expiresAt');
+  static const VerificationMeta _expiresAtMeta = const VerificationMeta(
+    'expiresAt',
+  );
   @override
   late final GeneratedColumn<DateTime> expiresAt = GeneratedColumn<DateTime>(
     'expires_at',
@@ -98,7 +114,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     type: DriftSqlType.dateTime,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt');
+  static const VerificationMeta _createdAtMeta = const VerificationMeta(
+    'createdAt',
+  );
   @override
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
     'created_at',
@@ -108,7 +126,9 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
     requiredDuringInsert: false,
     defaultValue: currentDateAndTime,
   );
-  static const VerificationMeta _updatedAtMeta = const VerificationMeta('updatedAt');
+  static const VerificationMeta _updatedAtMeta = const VerificationMeta(
+    'updatedAt',
+  );
   @override
   late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
     'updated_at',
@@ -139,56 +159,104 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
   String get actualTableName => $name;
   static const String $name = 'accounts';
   @override
-  VerificationContext validateIntegrity(Insertable<Account> instance, {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<Account> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('did')) {
-      context.handle(_didMeta, did.isAcceptableOrUnknown(data['did']!, _didMeta));
+      context.handle(
+        _didMeta,
+        did.isAcceptableOrUnknown(data['did']!, _didMeta),
+      );
     } else if (isInserting) {
       context.missing(_didMeta);
     }
     if (data.containsKey('handle')) {
-      context.handle(_handleMeta, handle.isAcceptableOrUnknown(data['handle']!, _handleMeta));
+      context.handle(
+        _handleMeta,
+        handle.isAcceptableOrUnknown(data['handle']!, _handleMeta),
+      );
     } else if (isInserting) {
       context.missing(_handleMeta);
     }
     if (data.containsKey('display_name')) {
-      context.handle(_displayNameMeta, displayName.isAcceptableOrUnknown(data['display_name']!, _displayNameMeta));
+      context.handle(
+        _displayNameMeta,
+        displayName.isAcceptableOrUnknown(
+          data['display_name']!,
+          _displayNameMeta,
+        ),
+      );
     }
     if (data.containsKey('service')) {
-      context.handle(_serviceMeta, service.isAcceptableOrUnknown(data['service']!, _serviceMeta));
+      context.handle(
+        _serviceMeta,
+        service.isAcceptableOrUnknown(data['service']!, _serviceMeta),
+      );
     }
     if (data.containsKey('access_token')) {
-      context.handle(_accessTokenMeta, accessToken.isAcceptableOrUnknown(data['access_token']!, _accessTokenMeta));
+      context.handle(
+        _accessTokenMeta,
+        accessToken.isAcceptableOrUnknown(
+          data['access_token']!,
+          _accessTokenMeta,
+        ),
+      );
     } else if (isInserting) {
       context.missing(_accessTokenMeta);
     }
     if (data.containsKey('refresh_token')) {
-      context.handle(_refreshTokenMeta, refreshToken.isAcceptableOrUnknown(data['refresh_token']!, _refreshTokenMeta));
+      context.handle(
+        _refreshTokenMeta,
+        refreshToken.isAcceptableOrUnknown(
+          data['refresh_token']!,
+          _refreshTokenMeta,
+        ),
+      );
     }
     if (data.containsKey('dpop_public_key')) {
       context.handle(
         _dpopPublicKeyMeta,
-        dpopPublicKey.isAcceptableOrUnknown(data['dpop_public_key']!, _dpopPublicKeyMeta),
+        dpopPublicKey.isAcceptableOrUnknown(
+          data['dpop_public_key']!,
+          _dpopPublicKeyMeta,
+        ),
       );
     }
     if (data.containsKey('dpop_private_key')) {
       context.handle(
         _dpopPrivateKeyMeta,
-        dpopPrivateKey.isAcceptableOrUnknown(data['dpop_private_key']!, _dpopPrivateKeyMeta),
+        dpopPrivateKey.isAcceptableOrUnknown(
+          data['dpop_private_key']!,
+          _dpopPrivateKeyMeta,
+        ),
       );
     }
     if (data.containsKey('dpop_nonce')) {
-      context.handle(_dpopNonceMeta, dpopNonce.isAcceptableOrUnknown(data['dpop_nonce']!, _dpopNonceMeta));
+      context.handle(
+        _dpopNonceMeta,
+        dpopNonce.isAcceptableOrUnknown(data['dpop_nonce']!, _dpopNonceMeta),
+      );
     }
     if (data.containsKey('expires_at')) {
-      context.handle(_expiresAtMeta, expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta));
+      context.handle(
+        _expiresAtMeta,
+        expiresAt.isAcceptableOrUnknown(data['expires_at']!, _expiresAtMeta),
+      );
     }
     if (data.containsKey('created_at')) {
-      context.handle(_createdAtMeta, createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
+      context.handle(
+        _createdAtMeta,
+        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+      );
     }
     if (data.containsKey('updated_at')) {
-      context.handle(_updatedAtMeta, updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
     }
     return context;
   }
@@ -199,21 +267,54 @@ class $AccountsTable extends Accounts with TableInfo<$AccountsTable, Account> {
   Account map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return Account(
-      did: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}did'])!,
-      handle: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}handle'])!,
-      displayName: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}display_name']),
-      service: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}service']),
-      accessToken: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}access_token'])!,
-      refreshToken: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}refresh_token']),
-      dpopPublicKey: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}dpop_public_key']),
+      did: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}did'],
+      )!,
+      handle: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}handle'],
+      )!,
+      displayName: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}display_name'],
+      ),
+      service: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}service'],
+      ),
+      accessToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}access_token'],
+      )!,
+      refreshToken: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}refresh_token'],
+      ),
+      dpopPublicKey: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}dpop_public_key'],
+      ),
       dpopPrivateKey: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
         data['${effectivePrefix}dpop_private_key'],
       ),
-      dpopNonce: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}dpop_nonce']),
-      expiresAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}expires_at']),
-      createdAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
-      updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      dpopNonce: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}dpop_nonce'],
+      ),
+      expiresAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}expires_at'],
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
     );
   }
 
@@ -286,20 +387,37 @@ class Account extends DataClass implements Insertable<Account> {
     return AccountsCompanion(
       did: Value(did),
       handle: Value(handle),
-      displayName: displayName == null && nullToAbsent ? const Value.absent() : Value(displayName),
-      service: service == null && nullToAbsent ? const Value.absent() : Value(service),
+      displayName: displayName == null && nullToAbsent
+          ? const Value.absent()
+          : Value(displayName),
+      service: service == null && nullToAbsent
+          ? const Value.absent()
+          : Value(service),
       accessToken: Value(accessToken),
-      refreshToken: refreshToken == null && nullToAbsent ? const Value.absent() : Value(refreshToken),
-      dpopPublicKey: dpopPublicKey == null && nullToAbsent ? const Value.absent() : Value(dpopPublicKey),
-      dpopPrivateKey: dpopPrivateKey == null && nullToAbsent ? const Value.absent() : Value(dpopPrivateKey),
-      dpopNonce: dpopNonce == null && nullToAbsent ? const Value.absent() : Value(dpopNonce),
-      expiresAt: expiresAt == null && nullToAbsent ? const Value.absent() : Value(expiresAt),
+      refreshToken: refreshToken == null && nullToAbsent
+          ? const Value.absent()
+          : Value(refreshToken),
+      dpopPublicKey: dpopPublicKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(dpopPublicKey),
+      dpopPrivateKey: dpopPrivateKey == null && nullToAbsent
+          ? const Value.absent()
+          : Value(dpopPrivateKey),
+      dpopNonce: dpopNonce == null && nullToAbsent
+          ? const Value.absent()
+          : Value(dpopNonce),
+      expiresAt: expiresAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(expiresAt),
       createdAt: Value(createdAt),
       updatedAt: Value(updatedAt),
     );
   }
 
-  factory Account.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
+  factory Account.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return Account(
       did: serializer.fromJson<String>(json['did']),
@@ -355,8 +473,12 @@ class Account extends DataClass implements Insertable<Account> {
     service: service.present ? service.value : this.service,
     accessToken: accessToken ?? this.accessToken,
     refreshToken: refreshToken.present ? refreshToken.value : this.refreshToken,
-    dpopPublicKey: dpopPublicKey.present ? dpopPublicKey.value : this.dpopPublicKey,
-    dpopPrivateKey: dpopPrivateKey.present ? dpopPrivateKey.value : this.dpopPrivateKey,
+    dpopPublicKey: dpopPublicKey.present
+        ? dpopPublicKey.value
+        : this.dpopPublicKey,
+    dpopPrivateKey: dpopPrivateKey.present
+        ? dpopPrivateKey.value
+        : this.dpopPrivateKey,
     dpopNonce: dpopNonce.present ? dpopNonce.value : this.dpopNonce,
     expiresAt: expiresAt.present ? expiresAt.value : this.expiresAt,
     createdAt: createdAt ?? this.createdAt,
@@ -366,12 +488,22 @@ class Account extends DataClass implements Insertable<Account> {
     return Account(
       did: data.did.present ? data.did.value : this.did,
       handle: data.handle.present ? data.handle.value : this.handle,
-      displayName: data.displayName.present ? data.displayName.value : this.displayName,
+      displayName: data.displayName.present
+          ? data.displayName.value
+          : this.displayName,
       service: data.service.present ? data.service.value : this.service,
-      accessToken: data.accessToken.present ? data.accessToken.value : this.accessToken,
-      refreshToken: data.refreshToken.present ? data.refreshToken.value : this.refreshToken,
-      dpopPublicKey: data.dpopPublicKey.present ? data.dpopPublicKey.value : this.dpopPublicKey,
-      dpopPrivateKey: data.dpopPrivateKey.present ? data.dpopPrivateKey.value : this.dpopPrivateKey,
+      accessToken: data.accessToken.present
+          ? data.accessToken.value
+          : this.accessToken,
+      refreshToken: data.refreshToken.present
+          ? data.refreshToken.value
+          : this.refreshToken,
+      dpopPublicKey: data.dpopPublicKey.present
+          ? data.dpopPublicKey.value
+          : this.dpopPublicKey,
+      dpopPrivateKey: data.dpopPrivateKey.present
+          ? data.dpopPrivateKey.value
+          : this.dpopPrivateKey,
       dpopNonce: data.dpopNonce.present ? data.dpopNonce.value : this.dpopNonce,
       expiresAt: data.expiresAt.present ? data.expiresAt.value : this.expiresAt,
       createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
@@ -607,7 +739,8 @@ class AccountsCompanion extends UpdateCompanion<Account> {
   }
 }
 
-class $CachedProfilesTable extends CachedProfiles with TableInfo<$CachedProfilesTable, CachedProfile> {
+class $CachedProfilesTable extends CachedProfiles
+    with TableInfo<$CachedProfilesTable, CachedProfile> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
@@ -630,7 +763,9 @@ class $CachedProfilesTable extends CachedProfiles with TableInfo<$CachedProfiles
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _payloadMeta = const VerificationMeta('payload');
+  static const VerificationMeta _payloadMeta = const VerificationMeta(
+    'payload',
+  );
   @override
   late final GeneratedColumn<String> payload = GeneratedColumn<String>(
     'payload',
@@ -639,7 +774,9 @@ class $CachedProfilesTable extends CachedProfiles with TableInfo<$CachedProfiles
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt');
+  static const VerificationMeta _fetchedAtMeta = const VerificationMeta(
+    'fetchedAt',
+  );
   @override
   late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>(
     'fetched_at',
@@ -657,26 +794,41 @@ class $CachedProfilesTable extends CachedProfiles with TableInfo<$CachedProfiles
   String get actualTableName => $name;
   static const String $name = 'cached_profiles';
   @override
-  VerificationContext validateIntegrity(Insertable<CachedProfile> instance, {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<CachedProfile> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('did')) {
-      context.handle(_didMeta, did.isAcceptableOrUnknown(data['did']!, _didMeta));
+      context.handle(
+        _didMeta,
+        did.isAcceptableOrUnknown(data['did']!, _didMeta),
+      );
     } else if (isInserting) {
       context.missing(_didMeta);
     }
     if (data.containsKey('handle')) {
-      context.handle(_handleMeta, handle.isAcceptableOrUnknown(data['handle']!, _handleMeta));
+      context.handle(
+        _handleMeta,
+        handle.isAcceptableOrUnknown(data['handle']!, _handleMeta),
+      );
     } else if (isInserting) {
       context.missing(_handleMeta);
     }
     if (data.containsKey('payload')) {
-      context.handle(_payloadMeta, payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta));
+      context.handle(
+        _payloadMeta,
+        payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta),
+      );
     } else if (isInserting) {
       context.missing(_payloadMeta);
     }
     if (data.containsKey('fetched_at')) {
-      context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta));
+      context.handle(
+        _fetchedAtMeta,
+        fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta),
+      );
     }
     return context;
   }
@@ -687,10 +839,22 @@ class $CachedProfilesTable extends CachedProfiles with TableInfo<$CachedProfiles
   CachedProfile map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return CachedProfile(
-      did: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}did'])!,
-      handle: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}handle'])!,
-      payload: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}payload'])!,
-      fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!,
+      did: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}did'],
+      )!,
+      handle: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}handle'],
+      )!,
+      payload: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}payload'],
+      )!,
+      fetchedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}fetched_at'],
+      )!,
     );
   }
 
@@ -705,7 +869,12 @@ class CachedProfile extends DataClass implements Insertable<CachedProfile> {
   final String handle;
   final String payload;
   final DateTime fetchedAt;
-  const CachedProfile({required this.did, required this.handle, required this.payload, required this.fetchedAt});
+  const CachedProfile({
+    required this.did,
+    required this.handle,
+    required this.payload,
+    required this.fetchedAt,
+  });
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -725,7 +894,10 @@ class CachedProfile extends DataClass implements Insertable<CachedProfile> {
     );
   }
 
-  factory CachedProfile.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
+  factory CachedProfile.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return CachedProfile(
       did: serializer.fromJson<String>(json['did']),
@@ -745,7 +917,12 @@ class CachedProfile extends DataClass implements Insertable<CachedProfile> {
     };
   }
 
-  CachedProfile copyWith({String? did, String? handle, String? payload, DateTime? fetchedAt}) => CachedProfile(
+  CachedProfile copyWith({
+    String? did,
+    String? handle,
+    String? payload,
+    DateTime? fetchedAt,
+  }) => CachedProfile(
     did: did ?? this.did,
     handle: handle ?? this.handle,
     payload: payload ?? this.payload,
@@ -871,7 +1048,8 @@ class CachedProfilesCompanion extends UpdateCompanion<CachedProfile> {
   }
 }
 
-class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, CachedPost> {
+class $CachedPostsTable extends CachedPosts
+    with TableInfo<$CachedPostsTable, CachedPost> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
@@ -885,7 +1063,9 @@ class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, Ca
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _authorDidMeta = const VerificationMeta('authorDid');
+  static const VerificationMeta _authorDidMeta = const VerificationMeta(
+    'authorDid',
+  );
   @override
   late final GeneratedColumn<String> authorDid = GeneratedColumn<String>(
     'author_did',
@@ -894,7 +1074,9 @@ class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, Ca
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _payloadMeta = const VerificationMeta('payload');
+  static const VerificationMeta _payloadMeta = const VerificationMeta(
+    'payload',
+  );
   @override
   late final GeneratedColumn<String> payload = GeneratedColumn<String>(
     'payload',
@@ -903,7 +1085,9 @@ class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, Ca
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _createdAtMeta = const VerificationMeta('createdAt');
+  static const VerificationMeta _createdAtMeta = const VerificationMeta(
+    'createdAt',
+  );
   @override
   late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
     'created_at',
@@ -912,7 +1096,9 @@ class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, Ca
     type: DriftSqlType.dateTime,
     requiredDuringInsert: false,
   );
-  static const VerificationMeta _fetchedAtMeta = const VerificationMeta('fetchedAt');
+  static const VerificationMeta _fetchedAtMeta = const VerificationMeta(
+    'fetchedAt',
+  );
   @override
   late final GeneratedColumn<DateTime> fetchedAt = GeneratedColumn<DateTime>(
     'fetched_at',
@@ -923,36 +1109,60 @@ class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, Ca
     defaultValue: currentDateAndTime,
   );
   @override
-  List<GeneratedColumn> get $columns => [uri, authorDid, payload, createdAt, fetchedAt];
+  List<GeneratedColumn> get $columns => [
+    uri,
+    authorDid,
+    payload,
+    createdAt,
+    fetchedAt,
+  ];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
   String get actualTableName => $name;
   static const String $name = 'cached_posts';
   @override
-  VerificationContext validateIntegrity(Insertable<CachedPost> instance, {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<CachedPost> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('uri')) {
-      context.handle(_uriMeta, uri.isAcceptableOrUnknown(data['uri']!, _uriMeta));
+      context.handle(
+        _uriMeta,
+        uri.isAcceptableOrUnknown(data['uri']!, _uriMeta),
+      );
     } else if (isInserting) {
       context.missing(_uriMeta);
     }
     if (data.containsKey('author_did')) {
-      context.handle(_authorDidMeta, authorDid.isAcceptableOrUnknown(data['author_did']!, _authorDidMeta));
+      context.handle(
+        _authorDidMeta,
+        authorDid.isAcceptableOrUnknown(data['author_did']!, _authorDidMeta),
+      );
     } else if (isInserting) {
       context.missing(_authorDidMeta);
     }
     if (data.containsKey('payload')) {
-      context.handle(_payloadMeta, payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta));
+      context.handle(
+        _payloadMeta,
+        payload.isAcceptableOrUnknown(data['payload']!, _payloadMeta),
+      );
     } else if (isInserting) {
       context.missing(_payloadMeta);
     }
     if (data.containsKey('created_at')) {
-      context.handle(_createdAtMeta, createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
+      context.handle(
+        _createdAtMeta,
+        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+      );
     }
     if (data.containsKey('fetched_at')) {
-      context.handle(_fetchedAtMeta, fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta));
+      context.handle(
+        _fetchedAtMeta,
+        fetchedAt.isAcceptableOrUnknown(data['fetched_at']!, _fetchedAtMeta),
+      );
     }
     return context;
   }
@@ -963,11 +1173,26 @@ class $CachedPostsTable extends CachedPosts with TableInfo<$CachedPostsTable, Ca
   CachedPost map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return CachedPost(
-      uri: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}uri'])!,
-      authorDid: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}author_did'])!,
-      payload: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}payload'])!,
-      createdAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}created_at']),
-      fetchedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}fetched_at'])!,
+      uri: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}uri'],
+      )!,
+      authorDid: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}author_did'],
+      )!,
+      payload: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}payload'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      ),
+      fetchedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}fetched_at'],
+      )!,
     );
   }
 
@@ -1008,12 +1233,17 @@ class CachedPost extends DataClass implements Insertable<CachedPost> {
       uri: Value(uri),
       authorDid: Value(authorDid),
       payload: Value(payload),
-      createdAt: createdAt == null && nullToAbsent ? const Value.absent() : Value(createdAt),
+      createdAt: createdAt == null && nullToAbsent
+          ? const Value.absent()
+          : Value(createdAt),
       fetchedAt: Value(fetchedAt),
     );
   }
 
-  factory CachedPost.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
+  factory CachedPost.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return CachedPost(
       uri: serializer.fromJson<String>(json['uri']),
@@ -1071,7 +1301,8 @@ class CachedPost extends DataClass implements Insertable<CachedPost> {
   }
 
   @override
-  int get hashCode => Object.hash(uri, authorDid, payload, createdAt, fetchedAt);
+  int get hashCode =>
+      Object.hash(uri, authorDid, payload, createdAt, fetchedAt);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -1182,7 +1413,8 @@ class CachedPostsCompanion extends UpdateCompanion<CachedPost> {
   }
 }
 
-class $SettingsTable extends Settings with TableInfo<$SettingsTable, SettingsEntry> {
+class $SettingsTable extends Settings
+    with TableInfo<$SettingsTable, SettingsEntry> {
   @override
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
@@ -1205,7 +1437,9 @@ class $SettingsTable extends Settings with TableInfo<$SettingsTable, SettingsEnt
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
-  static const VerificationMeta _updatedAtMeta = const VerificationMeta('updatedAt');
+  static const VerificationMeta _updatedAtMeta = const VerificationMeta(
+    'updatedAt',
+  );
   @override
   late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
     'updated_at',
@@ -1223,21 +1457,33 @@ class $SettingsTable extends Settings with TableInfo<$SettingsTable, SettingsEnt
   String get actualTableName => $name;
   static const String $name = 'settings';
   @override
-  VerificationContext validateIntegrity(Insertable<SettingsEntry> instance, {bool isInserting = false}) {
+  VerificationContext validateIntegrity(
+    Insertable<SettingsEntry> instance, {
+    bool isInserting = false,
+  }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
     if (data.containsKey('key')) {
-      context.handle(_keyMeta, key.isAcceptableOrUnknown(data['key']!, _keyMeta));
+      context.handle(
+        _keyMeta,
+        key.isAcceptableOrUnknown(data['key']!, _keyMeta),
+      );
     } else if (isInserting) {
       context.missing(_keyMeta);
     }
     if (data.containsKey('value')) {
-      context.handle(_valueMeta, value.isAcceptableOrUnknown(data['value']!, _valueMeta));
+      context.handle(
+        _valueMeta,
+        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
+      );
     } else if (isInserting) {
       context.missing(_valueMeta);
     }
     if (data.containsKey('updated_at')) {
-      context.handle(_updatedAtMeta, updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
     }
     return context;
   }
@@ -1248,9 +1494,18 @@ class $SettingsTable extends Settings with TableInfo<$SettingsTable, SettingsEnt
   SettingsEntry map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return SettingsEntry(
-      key: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}key'])!,
-      value: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}value'])!,
-      updatedAt: attachedDatabase.typeMapping.read(DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      key: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}key'],
+      )!,
+      value: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}value'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
     );
   }
 
@@ -1264,7 +1519,11 @@ class SettingsEntry extends DataClass implements Insertable<SettingsEntry> {
   final String key;
   final String value;
   final DateTime updatedAt;
-  const SettingsEntry({required this.key, required this.value, required this.updatedAt});
+  const SettingsEntry({
+    required this.key,
+    required this.value,
+    required this.updatedAt,
+  });
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -1275,10 +1534,17 @@ class SettingsEntry extends DataClass implements Insertable<SettingsEntry> {
   }
 
   SettingsCompanion toCompanion(bool nullToAbsent) {
-    return SettingsCompanion(key: Value(key), value: Value(value), updatedAt: Value(updatedAt));
+    return SettingsCompanion(
+      key: Value(key),
+      value: Value(value),
+      updatedAt: Value(updatedAt),
+    );
   }
 
-  factory SettingsEntry.fromJson(Map<String, dynamic> json, {ValueSerializer? serializer}) {
+  factory SettingsEntry.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return SettingsEntry(
       key: serializer.fromJson<String>(json['key']),
@@ -1297,7 +1563,11 @@ class SettingsEntry extends DataClass implements Insertable<SettingsEntry> {
   }
 
   SettingsEntry copyWith({String? key, String? value, DateTime? updatedAt}) =>
-      SettingsEntry(key: key ?? this.key, value: value ?? this.value, updatedAt: updatedAt ?? this.updatedAt);
+      SettingsEntry(
+        key: key ?? this.key,
+        value: value ?? this.value,
+        updatedAt: updatedAt ?? this.updatedAt,
+      );
   SettingsEntry copyWithCompanion(SettingsCompanion data) {
     return SettingsEntry(
       key: data.key.present ? data.key.value : this.key,
@@ -1403,6 +1673,456 @@ class SettingsCompanion extends UpdateCompanion<SettingsEntry> {
   }
 }
 
+class $SavedFeedsTable extends SavedFeeds
+    with TableInfo<$SavedFeedsTable, SavedFeedEntry> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $SavedFeedsTable(this.attachedDatabase, [this._alias]);
+  static const VerificationMeta _idMeta = const VerificationMeta('id');
+  @override
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _accountDidMeta = const VerificationMeta(
+    'accountDid',
+  );
+  @override
+  late final GeneratedColumn<String> accountDid = GeneratedColumn<String>(
+    'account_did',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _typeMeta = const VerificationMeta('type');
+  @override
+  late final GeneratedColumn<String> type = GeneratedColumn<String>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _valueMeta = const VerificationMeta('value');
+  @override
+  late final GeneratedColumn<String> value = GeneratedColumn<String>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const VerificationMeta _pinnedMeta = const VerificationMeta('pinned');
+  @override
+  late final GeneratedColumn<bool> pinned = GeneratedColumn<bool>(
+    'pinned',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("pinned" IN (0, 1))',
+    ),
+    defaultValue: const Constant(false),
+  );
+  static const VerificationMeta _sortOrderMeta = const VerificationMeta(
+    'sortOrder',
+  );
+  @override
+  late final GeneratedColumn<int> sortOrder = GeneratedColumn<int>(
+    'sort_order',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const Constant(0),
+  );
+  static const VerificationMeta _updatedAtMeta = const VerificationMeta(
+    'updatedAt',
+  );
+  @override
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: currentDateAndTime,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    accountDid,
+    type,
+    value,
+    pinned,
+    sortOrder,
+    updatedAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'saved_feeds';
+  @override
+  VerificationContext validateIntegrity(
+    Insertable<SavedFeedEntry> instance, {
+    bool isInserting = false,
+  }) {
+    final context = VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('account_did')) {
+      context.handle(
+        _accountDidMeta,
+        accountDid.isAcceptableOrUnknown(data['account_did']!, _accountDidMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_accountDidMeta);
+    }
+    if (data.containsKey('type')) {
+      context.handle(
+        _typeMeta,
+        type.isAcceptableOrUnknown(data['type']!, _typeMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_typeMeta);
+    }
+    if (data.containsKey('value')) {
+      context.handle(
+        _valueMeta,
+        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_valueMeta);
+    }
+    if (data.containsKey('pinned')) {
+      context.handle(
+        _pinnedMeta,
+        pinned.isAcceptableOrUnknown(data['pinned']!, _pinnedMeta),
+      );
+    }
+    if (data.containsKey('sort_order')) {
+      context.handle(
+        _sortOrderMeta,
+        sortOrder.isAcceptableOrUnknown(data['sort_order']!, _sortOrderMeta),
+      );
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id, accountDid};
+  @override
+  SavedFeedEntry map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return SavedFeedEntry(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      accountDid: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}account_did'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}type'],
+      )!,
+      value: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}value'],
+      )!,
+      pinned: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}pinned'],
+      )!,
+      sortOrder: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}sort_order'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+    );
+  }
+
+  @override
+  $SavedFeedsTable createAlias(String alias) {
+    return $SavedFeedsTable(attachedDatabase, alias);
+  }
+}
+
+class SavedFeedEntry extends DataClass implements Insertable<SavedFeedEntry> {
+  final String id;
+  final String accountDid;
+  final String type;
+  final String value;
+  final bool pinned;
+  final int sortOrder;
+  final DateTime updatedAt;
+  const SavedFeedEntry({
+    required this.id,
+    required this.accountDid,
+    required this.type,
+    required this.value,
+    required this.pinned,
+    required this.sortOrder,
+    required this.updatedAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['account_did'] = Variable<String>(accountDid);
+    map['type'] = Variable<String>(type);
+    map['value'] = Variable<String>(value);
+    map['pinned'] = Variable<bool>(pinned);
+    map['sort_order'] = Variable<int>(sortOrder);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    return map;
+  }
+
+  SavedFeedsCompanion toCompanion(bool nullToAbsent) {
+    return SavedFeedsCompanion(
+      id: Value(id),
+      accountDid: Value(accountDid),
+      type: Value(type),
+      value: Value(value),
+      pinned: Value(pinned),
+      sortOrder: Value(sortOrder),
+      updatedAt: Value(updatedAt),
+    );
+  }
+
+  factory SavedFeedEntry.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return SavedFeedEntry(
+      id: serializer.fromJson<String>(json['id']),
+      accountDid: serializer.fromJson<String>(json['accountDid']),
+      type: serializer.fromJson<String>(json['type']),
+      value: serializer.fromJson<String>(json['value']),
+      pinned: serializer.fromJson<bool>(json['pinned']),
+      sortOrder: serializer.fromJson<int>(json['sortOrder']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'accountDid': serializer.toJson<String>(accountDid),
+      'type': serializer.toJson<String>(type),
+      'value': serializer.toJson<String>(value),
+      'pinned': serializer.toJson<bool>(pinned),
+      'sortOrder': serializer.toJson<int>(sortOrder),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+    };
+  }
+
+  SavedFeedEntry copyWith({
+    String? id,
+    String? accountDid,
+    String? type,
+    String? value,
+    bool? pinned,
+    int? sortOrder,
+    DateTime? updatedAt,
+  }) => SavedFeedEntry(
+    id: id ?? this.id,
+    accountDid: accountDid ?? this.accountDid,
+    type: type ?? this.type,
+    value: value ?? this.value,
+    pinned: pinned ?? this.pinned,
+    sortOrder: sortOrder ?? this.sortOrder,
+    updatedAt: updatedAt ?? this.updatedAt,
+  );
+  SavedFeedEntry copyWithCompanion(SavedFeedsCompanion data) {
+    return SavedFeedEntry(
+      id: data.id.present ? data.id.value : this.id,
+      accountDid: data.accountDid.present
+          ? data.accountDid.value
+          : this.accountDid,
+      type: data.type.present ? data.type.value : this.type,
+      value: data.value.present ? data.value.value : this.value,
+      pinned: data.pinned.present ? data.pinned.value : this.pinned,
+      sortOrder: data.sortOrder.present ? data.sortOrder.value : this.sortOrder,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SavedFeedEntry(')
+          ..write('id: $id, ')
+          ..write('accountDid: $accountDid, ')
+          ..write('type: $type, ')
+          ..write('value: $value, ')
+          ..write('pinned: $pinned, ')
+          ..write('sortOrder: $sortOrder, ')
+          ..write('updatedAt: $updatedAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(id, accountDid, type, value, pinned, sortOrder, updatedAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SavedFeedEntry &&
+          other.id == this.id &&
+          other.accountDid == this.accountDid &&
+          other.type == this.type &&
+          other.value == this.value &&
+          other.pinned == this.pinned &&
+          other.sortOrder == this.sortOrder &&
+          other.updatedAt == this.updatedAt);
+}
+
+class SavedFeedsCompanion extends UpdateCompanion<SavedFeedEntry> {
+  final Value<String> id;
+  final Value<String> accountDid;
+  final Value<String> type;
+  final Value<String> value;
+  final Value<bool> pinned;
+  final Value<int> sortOrder;
+  final Value<DateTime> updatedAt;
+  final Value<int> rowid;
+  const SavedFeedsCompanion({
+    this.id = const Value.absent(),
+    this.accountDid = const Value.absent(),
+    this.type = const Value.absent(),
+    this.value = const Value.absent(),
+    this.pinned = const Value.absent(),
+    this.sortOrder = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  });
+  SavedFeedsCompanion.insert({
+    required String id,
+    required String accountDid,
+    required String type,
+    required String value,
+    this.pinned = const Value.absent(),
+    this.sortOrder = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.rowid = const Value.absent(),
+  }) : id = Value(id),
+       accountDid = Value(accountDid),
+       type = Value(type),
+       value = Value(value);
+  static Insertable<SavedFeedEntry> custom({
+    Expression<String>? id,
+    Expression<String>? accountDid,
+    Expression<String>? type,
+    Expression<String>? value,
+    Expression<bool>? pinned,
+    Expression<int>? sortOrder,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? rowid,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (accountDid != null) 'account_did': accountDid,
+      if (type != null) 'type': type,
+      if (value != null) 'value': value,
+      if (pinned != null) 'pinned': pinned,
+      if (sortOrder != null) 'sort_order': sortOrder,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (rowid != null) 'rowid': rowid,
+    });
+  }
+
+  SavedFeedsCompanion copyWith({
+    Value<String>? id,
+    Value<String>? accountDid,
+    Value<String>? type,
+    Value<String>? value,
+    Value<bool>? pinned,
+    Value<int>? sortOrder,
+    Value<DateTime>? updatedAt,
+    Value<int>? rowid,
+  }) {
+    return SavedFeedsCompanion(
+      id: id ?? this.id,
+      accountDid: accountDid ?? this.accountDid,
+      type: type ?? this.type,
+      value: value ?? this.value,
+      pinned: pinned ?? this.pinned,
+      sortOrder: sortOrder ?? this.sortOrder,
+      updatedAt: updatedAt ?? this.updatedAt,
+      rowid: rowid ?? this.rowid,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (accountDid.present) {
+      map['account_did'] = Variable<String>(accountDid.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<String>(type.value);
+    }
+    if (value.present) {
+      map['value'] = Variable<String>(value.value);
+    }
+    if (pinned.present) {
+      map['pinned'] = Variable<bool>(pinned.value);
+    }
+    if (sortOrder.present) {
+      map['sort_order'] = Variable<int>(sortOrder.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (rowid.present) {
+      map['rowid'] = Variable<int>(rowid.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('SavedFeedsCompanion(')
+          ..write('id: $id, ')
+          ..write('accountDid: $accountDid, ')
+          ..write('type: $type, ')
+          ..write('value: $value, ')
+          ..write('pinned: $pinned, ')
+          ..write('sortOrder: $sortOrder, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('rowid: $rowid')
+          ..write(')'))
+        .toString();
+  }
+}
+
 abstract class _$AppDatabase extends GeneratedDatabase {
   _$AppDatabase(QueryExecutor e) : super(e);
   $AppDatabaseManager get managers => $AppDatabaseManager(this);
@@ -1410,10 +2130,18 @@ abstract class _$AppDatabase extends GeneratedDatabase {
   late final $CachedProfilesTable cachedProfiles = $CachedProfilesTable(this);
   late final $CachedPostsTable cachedPosts = $CachedPostsTable(this);
   late final $SettingsTable settings = $SettingsTable(this);
+  late final $SavedFeedsTable savedFeeds = $SavedFeedsTable(this);
   @override
-  Iterable<TableInfo<Table, Object?>> get allTables => allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
   @override
-  List<DatabaseSchemaEntity> get allSchemaEntities => [accounts, cachedProfiles, cachedPosts, settings];
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    accounts,
+    cachedProfiles,
+    cachedPosts,
+    settings,
+    savedFeeds,
+  ];
 }
 
 typedef $$AccountsTableCreateCompanionBuilder =
@@ -1449,7 +2177,8 @@ typedef $$AccountsTableUpdateCompanionBuilder =
       Value<int> rowid,
     });
 
-class $$AccountsTableFilterComposer extends Composer<_$AppDatabase, $AccountsTable> {
+class $$AccountsTableFilterComposer
+    extends Composer<_$AppDatabase, $AccountsTable> {
   $$AccountsTableFilterComposer({
     required super.$db,
     required super.$table,
@@ -1457,43 +2186,69 @@ class $$AccountsTableFilterComposer extends Composer<_$AppDatabase, $AccountsTab
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnFilters<String> get did => $composableBuilder(column: $table.did, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get did => $composableBuilder(
+    column: $table.did,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get handle =>
-      $composableBuilder(column: $table.handle, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get handle => $composableBuilder(
+    column: $table.handle,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get displayName =>
-      $composableBuilder(column: $table.displayName, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get displayName => $composableBuilder(
+    column: $table.displayName,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get service =>
-      $composableBuilder(column: $table.service, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get service => $composableBuilder(
+    column: $table.service,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get accessToken =>
-      $composableBuilder(column: $table.accessToken, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get accessToken => $composableBuilder(
+    column: $table.accessToken,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get refreshToken =>
-      $composableBuilder(column: $table.refreshToken, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get refreshToken => $composableBuilder(
+    column: $table.refreshToken,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get dpopPublicKey =>
-      $composableBuilder(column: $table.dpopPublicKey, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get dpopPublicKey => $composableBuilder(
+    column: $table.dpopPublicKey,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get dpopPrivateKey =>
-      $composableBuilder(column: $table.dpopPrivateKey, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get dpopPrivateKey => $composableBuilder(
+    column: $table.dpopPrivateKey,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get dpopNonce =>
-      $composableBuilder(column: $table.dpopNonce, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get dpopNonce => $composableBuilder(
+    column: $table.dpopNonce,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<DateTime> get expiresAt =>
-      $composableBuilder(column: $table.expiresAt, builder: (column) => ColumnFilters(column));
+  ColumnFilters<DateTime> get expiresAt => $composableBuilder(
+    column: $table.expiresAt,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => ColumnFilters(column));
+  ColumnFilters<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnFilters(column));
+  ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnFilters(column),
+  );
 }
 
-class $$AccountsTableOrderingComposer extends Composer<_$AppDatabase, $AccountsTable> {
+class $$AccountsTableOrderingComposer
+    extends Composer<_$AppDatabase, $AccountsTable> {
   $$AccountsTableOrderingComposer({
     required super.$db,
     required super.$table,
@@ -1501,44 +2256,69 @@ class $$AccountsTableOrderingComposer extends Composer<_$AppDatabase, $AccountsT
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnOrderings<String> get did =>
-      $composableBuilder(column: $table.did, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get did => $composableBuilder(
+    column: $table.did,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get handle =>
-      $composableBuilder(column: $table.handle, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get handle => $composableBuilder(
+    column: $table.handle,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get displayName =>
-      $composableBuilder(column: $table.displayName, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get displayName => $composableBuilder(
+    column: $table.displayName,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get service =>
-      $composableBuilder(column: $table.service, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get service => $composableBuilder(
+    column: $table.service,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get accessToken =>
-      $composableBuilder(column: $table.accessToken, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get accessToken => $composableBuilder(
+    column: $table.accessToken,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get refreshToken =>
-      $composableBuilder(column: $table.refreshToken, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get refreshToken => $composableBuilder(
+    column: $table.refreshToken,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get dpopPublicKey =>
-      $composableBuilder(column: $table.dpopPublicKey, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get dpopPublicKey => $composableBuilder(
+    column: $table.dpopPublicKey,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get dpopPrivateKey =>
-      $composableBuilder(column: $table.dpopPrivateKey, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get dpopPrivateKey => $composableBuilder(
+    column: $table.dpopPrivateKey,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get dpopNonce =>
-      $composableBuilder(column: $table.dpopNonce, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get dpopNonce => $composableBuilder(
+    column: $table.dpopNonce,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<DateTime> get expiresAt =>
-      $composableBuilder(column: $table.expiresAt, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<DateTime> get expiresAt => $composableBuilder(
+    column: $table.expiresAt,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
 }
 
-class $$AccountsTableAnnotationComposer extends Composer<_$AppDatabase, $AccountsTable> {
+class $$AccountsTableAnnotationComposer
+    extends Composer<_$AppDatabase, $AccountsTable> {
   $$AccountsTableAnnotationComposer({
     required super.$db,
     required super.$table,
@@ -1546,34 +2326,51 @@ class $$AccountsTableAnnotationComposer extends Composer<_$AppDatabase, $Account
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  GeneratedColumn<String> get did => $composableBuilder(column: $table.did, builder: (column) => column);
+  GeneratedColumn<String> get did =>
+      $composableBuilder(column: $table.did, builder: (column) => column);
 
-  GeneratedColumn<String> get handle => $composableBuilder(column: $table.handle, builder: (column) => column);
+  GeneratedColumn<String> get handle =>
+      $composableBuilder(column: $table.handle, builder: (column) => column);
 
-  GeneratedColumn<String> get displayName =>
-      $composableBuilder(column: $table.displayName, builder: (column) => column);
+  GeneratedColumn<String> get displayName => $composableBuilder(
+    column: $table.displayName,
+    builder: (column) => column,
+  );
 
-  GeneratedColumn<String> get service => $composableBuilder(column: $table.service, builder: (column) => column);
+  GeneratedColumn<String> get service =>
+      $composableBuilder(column: $table.service, builder: (column) => column);
 
-  GeneratedColumn<String> get accessToken =>
-      $composableBuilder(column: $table.accessToken, builder: (column) => column);
+  GeneratedColumn<String> get accessToken => $composableBuilder(
+    column: $table.accessToken,
+    builder: (column) => column,
+  );
 
-  GeneratedColumn<String> get refreshToken =>
-      $composableBuilder(column: $table.refreshToken, builder: (column) => column);
+  GeneratedColumn<String> get refreshToken => $composableBuilder(
+    column: $table.refreshToken,
+    builder: (column) => column,
+  );
 
-  GeneratedColumn<String> get dpopPublicKey =>
-      $composableBuilder(column: $table.dpopPublicKey, builder: (column) => column);
+  GeneratedColumn<String> get dpopPublicKey => $composableBuilder(
+    column: $table.dpopPublicKey,
+    builder: (column) => column,
+  );
 
-  GeneratedColumn<String> get dpopPrivateKey =>
-      $composableBuilder(column: $table.dpopPrivateKey, builder: (column) => column);
+  GeneratedColumn<String> get dpopPrivateKey => $composableBuilder(
+    column: $table.dpopPrivateKey,
+    builder: (column) => column,
+  );
 
-  GeneratedColumn<String> get dpopNonce => $composableBuilder(column: $table.dpopNonce, builder: (column) => column);
+  GeneratedColumn<String> get dpopNonce =>
+      $composableBuilder(column: $table.dpopNonce, builder: (column) => column);
 
-  GeneratedColumn<DateTime> get expiresAt => $composableBuilder(column: $table.expiresAt, builder: (column) => column);
+  GeneratedColumn<DateTime> get expiresAt =>
+      $composableBuilder(column: $table.expiresAt, builder: (column) => column);
 
-  GeneratedColumn<DateTime> get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column);
+  GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
 
-  GeneratedColumn<DateTime> get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+  GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 }
 
 class $$AccountsTableTableManager
@@ -1596,9 +2393,12 @@ class $$AccountsTableTableManager
         TableManagerState(
           db: db,
           table: table,
-          createFilteringComposer: () => $$AccountsTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () => $$AccountsTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () => $$AccountsTableAnnotationComposer($db: db, $table: table),
+          createFilteringComposer: () =>
+              $$AccountsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$AccountsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$AccountsTableAnnotationComposer($db: db, $table: table),
           updateCompanionCallback:
               ({
                 Value<String> did = const Value.absent(),
@@ -1659,7 +2459,9 @@ class $$AccountsTableTableManager
                 updatedAt: updatedAt,
                 rowid: rowid,
               ),
-          withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
           prefetchHooksCallback: null,
         ),
       );
@@ -1696,7 +2498,8 @@ typedef $$CachedProfilesTableUpdateCompanionBuilder =
       Value<int> rowid,
     });
 
-class $$CachedProfilesTableFilterComposer extends Composer<_$AppDatabase, $CachedProfilesTable> {
+class $$CachedProfilesTableFilterComposer
+    extends Composer<_$AppDatabase, $CachedProfilesTable> {
   $$CachedProfilesTableFilterComposer({
     required super.$db,
     required super.$table,
@@ -1704,19 +2507,29 @@ class $$CachedProfilesTableFilterComposer extends Composer<_$AppDatabase, $Cache
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnFilters<String> get did => $composableBuilder(column: $table.did, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get did => $composableBuilder(
+    column: $table.did,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get handle =>
-      $composableBuilder(column: $table.handle, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get handle => $composableBuilder(
+    column: $table.handle,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get payload =>
-      $composableBuilder(column: $table.payload, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get payload => $composableBuilder(
+    column: $table.payload,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<DateTime> get fetchedAt =>
-      $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column));
+  ColumnFilters<DateTime> get fetchedAt => $composableBuilder(
+    column: $table.fetchedAt,
+    builder: (column) => ColumnFilters(column),
+  );
 }
 
-class $$CachedProfilesTableOrderingComposer extends Composer<_$AppDatabase, $CachedProfilesTable> {
+class $$CachedProfilesTableOrderingComposer
+    extends Composer<_$AppDatabase, $CachedProfilesTable> {
   $$CachedProfilesTableOrderingComposer({
     required super.$db,
     required super.$table,
@@ -1724,20 +2537,29 @@ class $$CachedProfilesTableOrderingComposer extends Composer<_$AppDatabase, $Cac
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnOrderings<String> get did =>
-      $composableBuilder(column: $table.did, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get did => $composableBuilder(
+    column: $table.did,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get handle =>
-      $composableBuilder(column: $table.handle, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get handle => $composableBuilder(
+    column: $table.handle,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get payload =>
-      $composableBuilder(column: $table.payload, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get payload => $composableBuilder(
+    column: $table.payload,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<DateTime> get fetchedAt =>
-      $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<DateTime> get fetchedAt => $composableBuilder(
+    column: $table.fetchedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
 }
 
-class $$CachedProfilesTableAnnotationComposer extends Composer<_$AppDatabase, $CachedProfilesTable> {
+class $$CachedProfilesTableAnnotationComposer
+    extends Composer<_$AppDatabase, $CachedProfilesTable> {
   $$CachedProfilesTableAnnotationComposer({
     required super.$db,
     required super.$table,
@@ -1745,13 +2567,17 @@ class $$CachedProfilesTableAnnotationComposer extends Composer<_$AppDatabase, $C
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  GeneratedColumn<String> get did => $composableBuilder(column: $table.did, builder: (column) => column);
+  GeneratedColumn<String> get did =>
+      $composableBuilder(column: $table.did, builder: (column) => column);
 
-  GeneratedColumn<String> get handle => $composableBuilder(column: $table.handle, builder: (column) => column);
+  GeneratedColumn<String> get handle =>
+      $composableBuilder(column: $table.handle, builder: (column) => column);
 
-  GeneratedColumn<String> get payload => $composableBuilder(column: $table.payload, builder: (column) => column);
+  GeneratedColumn<String> get payload =>
+      $composableBuilder(column: $table.payload, builder: (column) => column);
 
-  GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column);
+  GeneratedColumn<DateTime> get fetchedAt =>
+      $composableBuilder(column: $table.fetchedAt, builder: (column) => column);
 }
 
 class $$CachedProfilesTableTableManager
@@ -1765,18 +2591,26 @@ class $$CachedProfilesTableTableManager
           $$CachedProfilesTableAnnotationComposer,
           $$CachedProfilesTableCreateCompanionBuilder,
           $$CachedProfilesTableUpdateCompanionBuilder,
-          (CachedProfile, BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>),
+          (
+            CachedProfile,
+            BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>,
+          ),
           CachedProfile,
           PrefetchHooks Function()
         > {
-  $$CachedProfilesTableTableManager(_$AppDatabase db, $CachedProfilesTable table)
-    : super(
+  $$CachedProfilesTableTableManager(
+    _$AppDatabase db,
+    $CachedProfilesTable table,
+  ) : super(
         TableManagerState(
           db: db,
           table: table,
-          createFilteringComposer: () => $$CachedProfilesTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () => $$CachedProfilesTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () => $$CachedProfilesTableAnnotationComposer($db: db, $table: table),
+          createFilteringComposer: () =>
+              $$CachedProfilesTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$CachedProfilesTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$CachedProfilesTableAnnotationComposer($db: db, $table: table),
           updateCompanionCallback:
               ({
                 Value<String> did = const Value.absent(),
@@ -1805,7 +2639,9 @@ class $$CachedProfilesTableTableManager
                 fetchedAt: fetchedAt,
                 rowid: rowid,
               ),
-          withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
           prefetchHooksCallback: null,
         ),
       );
@@ -1821,7 +2657,10 @@ typedef $$CachedProfilesTableProcessedTableManager =
       $$CachedProfilesTableAnnotationComposer,
       $$CachedProfilesTableCreateCompanionBuilder,
       $$CachedProfilesTableUpdateCompanionBuilder,
-      (CachedProfile, BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>),
+      (
+        CachedProfile,
+        BaseReferences<_$AppDatabase, $CachedProfilesTable, CachedProfile>,
+      ),
       CachedProfile,
       PrefetchHooks Function()
     >;
@@ -1844,7 +2683,8 @@ typedef $$CachedPostsTableUpdateCompanionBuilder =
       Value<int> rowid,
     });
 
-class $$CachedPostsTableFilterComposer extends Composer<_$AppDatabase, $CachedPostsTable> {
+class $$CachedPostsTableFilterComposer
+    extends Composer<_$AppDatabase, $CachedPostsTable> {
   $$CachedPostsTableFilterComposer({
     required super.$db,
     required super.$table,
@@ -1852,22 +2692,34 @@ class $$CachedPostsTableFilterComposer extends Composer<_$AppDatabase, $CachedPo
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnFilters<String> get uri => $composableBuilder(column: $table.uri, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get uri => $composableBuilder(
+    column: $table.uri,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get authorDid =>
-      $composableBuilder(column: $table.authorDid, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get authorDid => $composableBuilder(
+    column: $table.authorDid,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get payload =>
-      $composableBuilder(column: $table.payload, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get payload => $composableBuilder(
+    column: $table.payload,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => ColumnFilters(column));
+  ColumnFilters<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<DateTime> get fetchedAt =>
-      $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnFilters(column));
+  ColumnFilters<DateTime> get fetchedAt => $composableBuilder(
+    column: $table.fetchedAt,
+    builder: (column) => ColumnFilters(column),
+  );
 }
 
-class $$CachedPostsTableOrderingComposer extends Composer<_$AppDatabase, $CachedPostsTable> {
+class $$CachedPostsTableOrderingComposer
+    extends Composer<_$AppDatabase, $CachedPostsTable> {
   $$CachedPostsTableOrderingComposer({
     required super.$db,
     required super.$table,
@@ -1875,23 +2727,34 @@ class $$CachedPostsTableOrderingComposer extends Composer<_$AppDatabase, $Cached
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnOrderings<String> get uri =>
-      $composableBuilder(column: $table.uri, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get uri => $composableBuilder(
+    column: $table.uri,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get authorDid =>
-      $composableBuilder(column: $table.authorDid, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get authorDid => $composableBuilder(
+    column: $table.authorDid,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get payload =>
-      $composableBuilder(column: $table.payload, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get payload => $composableBuilder(
+    column: $table.payload,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<DateTime> get createdAt =>
-      $composableBuilder(column: $table.createdAt, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<DateTime> get fetchedAt =>
-      $composableBuilder(column: $table.fetchedAt, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<DateTime> get fetchedAt => $composableBuilder(
+    column: $table.fetchedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
 }
 
-class $$CachedPostsTableAnnotationComposer extends Composer<_$AppDatabase, $CachedPostsTable> {
+class $$CachedPostsTableAnnotationComposer
+    extends Composer<_$AppDatabase, $CachedPostsTable> {
   $$CachedPostsTableAnnotationComposer({
     required super.$db,
     required super.$table,
@@ -1899,15 +2762,20 @@ class $$CachedPostsTableAnnotationComposer extends Composer<_$AppDatabase, $Cach
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  GeneratedColumn<String> get uri => $composableBuilder(column: $table.uri, builder: (column) => column);
+  GeneratedColumn<String> get uri =>
+      $composableBuilder(column: $table.uri, builder: (column) => column);
 
-  GeneratedColumn<String> get authorDid => $composableBuilder(column: $table.authorDid, builder: (column) => column);
+  GeneratedColumn<String> get authorDid =>
+      $composableBuilder(column: $table.authorDid, builder: (column) => column);
 
-  GeneratedColumn<String> get payload => $composableBuilder(column: $table.payload, builder: (column) => column);
+  GeneratedColumn<String> get payload =>
+      $composableBuilder(column: $table.payload, builder: (column) => column);
 
-  GeneratedColumn<DateTime> get createdAt => $composableBuilder(column: $table.createdAt, builder: (column) => column);
+  GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
 
-  GeneratedColumn<DateTime> get fetchedAt => $composableBuilder(column: $table.fetchedAt, builder: (column) => column);
+  GeneratedColumn<DateTime> get fetchedAt =>
+      $composableBuilder(column: $table.fetchedAt, builder: (column) => column);
 }
 
 class $$CachedPostsTableTableManager
@@ -1921,7 +2789,10 @@ class $$CachedPostsTableTableManager
           $$CachedPostsTableAnnotationComposer,
           $$CachedPostsTableCreateCompanionBuilder,
           $$CachedPostsTableUpdateCompanionBuilder,
-          (CachedPost, BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>),
+          (
+            CachedPost,
+            BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>,
+          ),
           CachedPost,
           PrefetchHooks Function()
         > {
@@ -1930,9 +2801,12 @@ class $$CachedPostsTableTableManager
         TableManagerState(
           db: db,
           table: table,
-          createFilteringComposer: () => $$CachedPostsTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () => $$CachedPostsTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () => $$CachedPostsTableAnnotationComposer($db: db, $table: table),
+          createFilteringComposer: () =>
+              $$CachedPostsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$CachedPostsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$CachedPostsTableAnnotationComposer($db: db, $table: table),
           updateCompanionCallback:
               ({
                 Value<String> uri = const Value.absent(),
@@ -1965,7 +2839,9 @@ class $$CachedPostsTableTableManager
                 fetchedAt: fetchedAt,
                 rowid: rowid,
               ),
-          withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
           prefetchHooksCallback: null,
         ),
       );
@@ -1981,7 +2857,10 @@ typedef $$CachedPostsTableProcessedTableManager =
       $$CachedPostsTableAnnotationComposer,
       $$CachedPostsTableCreateCompanionBuilder,
       $$CachedPostsTableUpdateCompanionBuilder,
-      (CachedPost, BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>),
+      (
+        CachedPost,
+        BaseReferences<_$AppDatabase, $CachedPostsTable, CachedPost>,
+      ),
       CachedPost,
       PrefetchHooks Function()
     >;
@@ -1993,9 +2872,15 @@ typedef $$SettingsTableCreateCompanionBuilder =
       Value<int> rowid,
     });
 typedef $$SettingsTableUpdateCompanionBuilder =
-    SettingsCompanion Function({Value<String> key, Value<String> value, Value<DateTime> updatedAt, Value<int> rowid});
+    SettingsCompanion Function({
+      Value<String> key,
+      Value<String> value,
+      Value<DateTime> updatedAt,
+      Value<int> rowid,
+    });
 
-class $$SettingsTableFilterComposer extends Composer<_$AppDatabase, $SettingsTable> {
+class $$SettingsTableFilterComposer
+    extends Composer<_$AppDatabase, $SettingsTable> {
   $$SettingsTableFilterComposer({
     required super.$db,
     required super.$table,
@@ -2003,16 +2888,24 @@ class $$SettingsTableFilterComposer extends Composer<_$AppDatabase, $SettingsTab
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnFilters<String> get key => $composableBuilder(column: $table.key, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<String> get value =>
-      $composableBuilder(column: $table.value, builder: (column) => ColumnFilters(column));
+  ColumnFilters<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => ColumnFilters(column),
+  );
 
-  ColumnFilters<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnFilters(column));
+  ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnFilters(column),
+  );
 }
 
-class $$SettingsTableOrderingComposer extends Composer<_$AppDatabase, $SettingsTable> {
+class $$SettingsTableOrderingComposer
+    extends Composer<_$AppDatabase, $SettingsTable> {
   $$SettingsTableOrderingComposer({
     required super.$db,
     required super.$table,
@@ -2020,17 +2913,24 @@ class $$SettingsTableOrderingComposer extends Composer<_$AppDatabase, $SettingsT
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnOrderings<String> get key =>
-      $composableBuilder(column: $table.key, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<String> get value =>
-      $composableBuilder(column: $table.value, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => ColumnOrderings(column),
+  );
 
-  ColumnOrderings<DateTime> get updatedAt =>
-      $composableBuilder(column: $table.updatedAt, builder: (column) => ColumnOrderings(column));
+  ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
 }
 
-class $$SettingsTableAnnotationComposer extends Composer<_$AppDatabase, $SettingsTable> {
+class $$SettingsTableAnnotationComposer
+    extends Composer<_$AppDatabase, $SettingsTable> {
   $$SettingsTableAnnotationComposer({
     required super.$db,
     required super.$table,
@@ -2038,11 +2938,14 @@ class $$SettingsTableAnnotationComposer extends Composer<_$AppDatabase, $Setting
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  GeneratedColumn<String> get key => $composableBuilder(column: $table.key, builder: (column) => column);
+  GeneratedColumn<String> get key =>
+      $composableBuilder(column: $table.key, builder: (column) => column);
 
-  GeneratedColumn<String> get value => $composableBuilder(column: $table.value, builder: (column) => column);
+  GeneratedColumn<String> get value =>
+      $composableBuilder(column: $table.value, builder: (column) => column);
 
-  GeneratedColumn<DateTime> get updatedAt => $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+  GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 }
 
 class $$SettingsTableTableManager
@@ -2056,7 +2959,10 @@ class $$SettingsTableTableManager
           $$SettingsTableAnnotationComposer,
           $$SettingsTableCreateCompanionBuilder,
           $$SettingsTableUpdateCompanionBuilder,
-          (SettingsEntry, BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>),
+          (
+            SettingsEntry,
+            BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>,
+          ),
           SettingsEntry,
           PrefetchHooks Function()
         > {
@@ -2065,24 +2971,39 @@ class $$SettingsTableTableManager
         TableManagerState(
           db: db,
           table: table,
-          createFilteringComposer: () => $$SettingsTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () => $$SettingsTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () => $$SettingsTableAnnotationComposer($db: db, $table: table),
+          createFilteringComposer: () =>
+              $$SettingsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$SettingsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$SettingsTableAnnotationComposer($db: db, $table: table),
           updateCompanionCallback:
               ({
                 Value<String> key = const Value.absent(),
                 Value<String> value = const Value.absent(),
                 Value<DateTime> updatedAt = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
-              }) => SettingsCompanion(key: key, value: value, updatedAt: updatedAt, rowid: rowid),
+              }) => SettingsCompanion(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+                rowid: rowid,
+              ),
           createCompanionCallback:
               ({
                 required String key,
                 required String value,
                 Value<DateTime> updatedAt = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
-              }) => SettingsCompanion.insert(key: key, value: value, updatedAt: updatedAt, rowid: rowid),
-          withReferenceMapper: (p0) => p0.map((e) => (e.readTable(table), BaseReferences(db, table, e))).toList(),
+              }) => SettingsCompanion.insert(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+                rowid: rowid,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
           prefetchHooksCallback: null,
         ),
       );
@@ -2098,16 +3019,265 @@ typedef $$SettingsTableProcessedTableManager =
       $$SettingsTableAnnotationComposer,
       $$SettingsTableCreateCompanionBuilder,
       $$SettingsTableUpdateCompanionBuilder,
-      (SettingsEntry, BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>),
+      (
+        SettingsEntry,
+        BaseReferences<_$AppDatabase, $SettingsTable, SettingsEntry>,
+      ),
       SettingsEntry,
       PrefetchHooks Function()
     >;
+typedef $$SavedFeedsTableCreateCompanionBuilder =
+    SavedFeedsCompanion Function({
+      required String id,
+      required String accountDid,
+      required String type,
+      required String value,
+      Value<bool> pinned,
+      Value<int> sortOrder,
+      Value<DateTime> updatedAt,
+      Value<int> rowid,
+    });
+typedef $$SavedFeedsTableUpdateCompanionBuilder =
+    SavedFeedsCompanion Function({
+      Value<String> id,
+      Value<String> accountDid,
+      Value<String> type,
+      Value<String> value,
+      Value<bool> pinned,
+      Value<int> sortOrder,
+      Value<DateTime> updatedAt,
+      Value<int> rowid,
+    });
+
+class $$SavedFeedsTableFilterComposer
+    extends Composer<_$AppDatabase, $SavedFeedsTable> {
+  $$SavedFeedsTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnFilters<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get accountDid => $composableBuilder(
+    column: $table.accountDid,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get type => $composableBuilder(
+    column: $table.type,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<bool> get pinned => $composableBuilder(
+    column: $table.pinned,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<int> get sortOrder => $composableBuilder(
+    column: $table.sortOrder,
+    builder: (column) => ColumnFilters(column),
+  );
+
+  ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnFilters(column),
+  );
+}
+
+class $$SavedFeedsTableOrderingComposer
+    extends Composer<_$AppDatabase, $SavedFeedsTable> {
+  $$SavedFeedsTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  ColumnOrderings<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get accountDid => $composableBuilder(
+    column: $table.accountDid,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get type => $composableBuilder(
+    column: $table.type,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<bool> get pinned => $composableBuilder(
+    column: $table.pinned,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<int> get sortOrder => $composableBuilder(
+    column: $table.sortOrder,
+    builder: (column) => ColumnOrderings(column),
+  );
+
+  ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => ColumnOrderings(column),
+  );
+}
+
+class $$SavedFeedsTableAnnotationComposer
+    extends Composer<_$AppDatabase, $SavedFeedsTable> {
+  $$SavedFeedsTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  GeneratedColumn<String> get accountDid => $composableBuilder(
+    column: $table.accountDid,
+    builder: (column) => column,
+  );
+
+  GeneratedColumn<String> get type =>
+      $composableBuilder(column: $table.type, builder: (column) => column);
+
+  GeneratedColumn<String> get value =>
+      $composableBuilder(column: $table.value, builder: (column) => column);
+
+  GeneratedColumn<bool> get pinned =>
+      $composableBuilder(column: $table.pinned, builder: (column) => column);
+
+  GeneratedColumn<int> get sortOrder =>
+      $composableBuilder(column: $table.sortOrder, builder: (column) => column);
+
+  GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+}
+
+class $$SavedFeedsTableTableManager
+    extends
+        RootTableManager<
+          _$AppDatabase,
+          $SavedFeedsTable,
+          SavedFeedEntry,
+          $$SavedFeedsTableFilterComposer,
+          $$SavedFeedsTableOrderingComposer,
+          $$SavedFeedsTableAnnotationComposer,
+          $$SavedFeedsTableCreateCompanionBuilder,
+          $$SavedFeedsTableUpdateCompanionBuilder,
+          (
+            SavedFeedEntry,
+            BaseReferences<_$AppDatabase, $SavedFeedsTable, SavedFeedEntry>,
+          ),
+          SavedFeedEntry,
+          PrefetchHooks Function()
+        > {
+  $$SavedFeedsTableTableManager(_$AppDatabase db, $SavedFeedsTable table)
+    : super(
+        TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              $$SavedFeedsTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              $$SavedFeedsTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              $$SavedFeedsTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                Value<String> id = const Value.absent(),
+                Value<String> accountDid = const Value.absent(),
+                Value<String> type = const Value.absent(),
+                Value<String> value = const Value.absent(),
+                Value<bool> pinned = const Value.absent(),
+                Value<int> sortOrder = const Value.absent(),
+                Value<DateTime> updatedAt = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => SavedFeedsCompanion(
+                id: id,
+                accountDid: accountDid,
+                type: type,
+                value: value,
+                pinned: pinned,
+                sortOrder: sortOrder,
+                updatedAt: updatedAt,
+                rowid: rowid,
+              ),
+          createCompanionCallback:
+              ({
+                required String id,
+                required String accountDid,
+                required String type,
+                required String value,
+                Value<bool> pinned = const Value.absent(),
+                Value<int> sortOrder = const Value.absent(),
+                Value<DateTime> updatedAt = const Value.absent(),
+                Value<int> rowid = const Value.absent(),
+              }) => SavedFeedsCompanion.insert(
+                id: id,
+                accountDid: accountDid,
+                type: type,
+                value: value,
+                pinned: pinned,
+                sortOrder: sortOrder,
+                updatedAt: updatedAt,
+                rowid: rowid,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$SavedFeedsTableProcessedTableManager =
+    ProcessedTableManager<
+      _$AppDatabase,
+      $SavedFeedsTable,
+      SavedFeedEntry,
+      $$SavedFeedsTableFilterComposer,
+      $$SavedFeedsTableOrderingComposer,
+      $$SavedFeedsTableAnnotationComposer,
+      $$SavedFeedsTableCreateCompanionBuilder,
+      $$SavedFeedsTableUpdateCompanionBuilder,
+      (
+        SavedFeedEntry,
+        BaseReferences<_$AppDatabase, $SavedFeedsTable, SavedFeedEntry>,
+      ),
+      SavedFeedEntry,
+      PrefetchHooks Function()
+    >;
 
 class $AppDatabaseManager {
   final _$AppDatabase _db;
   $AppDatabaseManager(this._db);
-  $$AccountsTableTableManager get accounts => $$AccountsTableTableManager(_db, _db.accounts);
-  $$CachedProfilesTableTableManager get cachedProfiles => $$CachedProfilesTableTableManager(_db, _db.cachedProfiles);
-  $$CachedPostsTableTableManager get cachedPosts => $$CachedPostsTableTableManager(_db, _db.cachedPosts);
-  $$SettingsTableTableManager get settings => $$SettingsTableTableManager(_db, _db.settings);
+  $$AccountsTableTableManager get accounts =>
+      $$AccountsTableTableManager(_db, _db.accounts);
+  $$CachedProfilesTableTableManager get cachedProfiles =>
+      $$CachedProfilesTableTableManager(_db, _db.cachedProfiles);
+  $$CachedPostsTableTableManager get cachedPosts =>
+      $$CachedPostsTableTableManager(_db, _db.cachedPosts);
+  $$SettingsTableTableManager get settings =>
+      $$SettingsTableTableManager(_db, _db.settings);
+  $$SavedFeedsTableTableManager get savedFeeds =>
+      $$SavedFeedsTableTableManager(_db, _db.savedFeeds);
 }
diff --git a/lib/core/database/tables.dart b/lib/core/database/tables.dart
index 7cef21c..16f8bce 100644
--- a/lib/core/database/tables.dart
+++ b/lib/core/database/tables.dart
@@ -51,3 +51,17 @@ class Settings extends Table {
   @override
   Set<Column> get primaryKey => {key};
 }
+
+@DataClassName('SavedFeedEntry')
+class SavedFeeds extends Table {
+  TextColumn get id => text()();
+  TextColumn get accountDid => text()();
+  TextColumn get type => text()();
+  TextColumn get value => text()();
+  BoolColumn get pinned => boolean().withDefault(const Constant(false))();
+  IntColumn get sortOrder => integer().withDefault(const Constant(0))();
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  @override
+  Set<Column> get primaryKey => {id, accountDid};
+}
diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart
index 76ecf97..b9e1a38 100644
--- a/lib/core/router/app_router.dart
+++ b/lib/core/router/app_router.dart
@@ -3,8 +3,9 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lazurite/features/auth/bloc/auth_bloc.dart';
-import 'package:lazurite/features/auth/presentation/home_screen.dart';
 import 'package:lazurite/features/auth/presentation/login_screen.dart';
+import 'package:lazurite/features/feed/presentation/feed_management_screen.dart';
+import 'package:lazurite/features/feed/presentation/home_feed_screen.dart';
 import 'package:lazurite/features/logs/presentation/logs_screen.dart';
 import 'package:lazurite/features/profile/presentation/profile_screen.dart';
 import 'package:lazurite/features/settings/presentation/settings_screen.dart';
@@ -32,7 +33,7 @@ class AppRouter {
       return null;
     },
     routes: [
-      GoRoute(path: '/', builder: (context, state) => const HomeScreen()),
+      GoRoute(path: '/', builder: (context, state) => const HomeFeedScreen()),
       GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
       GoRoute(
         path: '/profile',
@@ -40,6 +41,7 @@ class AppRouter {
       ),
       GoRoute(path: '/settings', builder: (context, state) => const SettingsScreen()),
       GoRoute(path: '/logs', builder: (context, state) => const LogsScreen()),
+      GoRoute(path: '/feeds', builder: (context, state) => const FeedManagementScreen()),
     ],
   );
 }
diff --git a/lib/features/feed/cubit/feed_preferences_cubit.dart b/lib/features/feed/cubit/feed_preferences_cubit.dart
new file mode 100644
index 0000000..8fb5dbd
--- /dev/null
+++ b/lib/features/feed/cubit/feed_preferences_cubit.dart
@@ -0,0 +1,229 @@
+import 'package:bluesky/app_bsky_actor_defs.dart';
+import 'package:drift/drift.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:lazurite/core/database/app_database.dart';
+import 'package:lazurite/features/feed/data/feed_repository.dart';
+import 'package:uuid/uuid.dart';
+
+class FeedPreferencesCubit extends Cubit<FeedPreferencesState> {
+  FeedPreferencesCubit({
+    required FeedRepository feedRepository,
+    required AppDatabase database,
+    required String accountDid,
+  }) : _feedRepository = feedRepository,
+       _database = database,
+       _accountDid = accountDid,
+       super(const FeedPreferencesState.initial());
+
+  final FeedRepository _feedRepository;
+  final AppDatabase _database;
+  final String _accountDid;
+
+  Future<void> loadPreferences() async {
+    emit(state.copyWith(status: FeedPreferencesStatus.loading));
+
+    try {
+      final cachedFeeds = await _database.getSavedFeeds(_accountDid);
+
+      if (cachedFeeds.isNotEmpty) {
+        final feeds = cachedFeeds.map(_mapFromCached).toList();
+        emit(FeedPreferencesState.loaded(feeds: feeds));
+      }
+
+      final result = await _feedRepository.getPreferences();
+      final savedFeedsPref = result.preferences.whereType<UPreferencesSavedFeedsPrefV2>().firstOrNull;
+
+      if (savedFeedsPref != null) {
+        final feeds = savedFeedsPref.data.items;
+        await _cacheFeeds(feeds);
+        emit(FeedPreferencesState.loaded(feeds: feeds));
+      } else {
+        final defaultFeeds = [_createDefaultTimelineFeed()];
+        await _cacheFeeds(defaultFeeds);
+        emit(FeedPreferencesState.loaded(feeds: defaultFeeds));
+      }
+    } catch (e) {
+      final cachedFeeds = await _database.getSavedFeeds(_accountDid);
+      if (cachedFeeds.isNotEmpty) {
+        final feeds = cachedFeeds.map(_mapFromCached).toList();
+        emit(FeedPreferencesState.loaded(feeds: feeds));
+      } else {
+        emit(FeedPreferencesState.error(message: e.toString()));
+      }
+    }
+  }
+
+  Future<void> pinFeed(String feedId) async {
+    final currentFeeds = state.feeds;
+    final feedToPin = currentFeeds.firstWhere((f) => f.id == feedId);
+    final pinnedFeeds = currentFeeds.where((f) => f.pinned).toList();
+    final unpinnedFeeds = currentFeeds.where((f) => !f.pinned && f.id != feedId).toList();
+
+    final updatedFeed = SavedFeed(id: feedToPin.id, type: feedToPin.type, value: feedToPin.value, pinned: true);
+    final newFeeds = [...pinnedFeeds, updatedFeed, ...unpinnedFeeds];
+
+    await _savePreferences(newFeeds);
+  }
+
+  Future<void> unpinFeed(String feedId) async {
+    final currentFeeds = state.feeds;
+    final feedToUnpin = currentFeeds.firstWhere((f) => f.id == feedId);
+    final pinnedFeeds = currentFeeds.where((f) => f.pinned && f.id != feedId).toList();
+    final unpinnedFeeds = currentFeeds.where((f) => !f.pinned).toList();
+
+    final updatedFeed = SavedFeed(id: feedToUnpin.id, type: feedToUnpin.type, value: feedToUnpin.value, pinned: false);
+    final newFeeds = [...pinnedFeeds, ...unpinnedFeeds, updatedFeed];
+
+    await _savePreferences(newFeeds);
+  }
+
+  Future<void> reorderPinnedFeeds(int oldIndex, int newIndex) async {
+    final pinnedFeeds = List<SavedFeed>.from(state.pinnedFeeds);
+    final unpinnedFeeds = state.unpinnedFeeds;
+
+    if (oldIndex < 0 || oldIndex >= pinnedFeeds.length) return;
+
+    final adjustedNewIndex = newIndex > oldIndex ? newIndex - 1 : newIndex;
+    final item = pinnedFeeds.removeAt(oldIndex);
+    pinnedFeeds.insert(adjustedNewIndex, item);
+
+    final newFeeds = [...pinnedFeeds, ...unpinnedFeeds];
+    await _savePreferences(newFeeds);
+  }
+
+  Future<void> reorderFeeds(int oldIndex, int newIndex) async {
+    final feeds = List<SavedFeed>.from(state.feeds);
+    if (oldIndex < 0 || oldIndex >= feeds.length) return;
+
+    final item = feeds.removeAt(oldIndex);
+    final adjustedNewIndex = newIndex > oldIndex ? newIndex - 1 : newIndex;
+    feeds.insert(adjustedNewIndex, item);
+
+    await _savePreferences(feeds);
+  }
+
+  Future<void> removeFeed(String feedId) async {
+    final feeds = state.feeds.where((f) => f.id != feedId).toList();
+    await _savePreferences(feeds);
+  }
+
+  Future<void> addFeed({required SavedFeedType type, required String value, bool pinned = false}) async {
+    final newFeed = SavedFeed(id: _generateId(), type: type, value: value, pinned: pinned);
+    final feeds = [...state.feeds, newFeed];
+    await _savePreferences(feeds);
+  }
+
+  Future<bool> _savePreferences(List<SavedFeed> feeds) async {
+    final previousState = state;
+    emit(state.copyWith(status: FeedPreferencesStatus.saving));
+
+    try {
+      await _cacheFeeds(feeds);
+
+      final result = await _feedRepository.getPreferences();
+      final preferences = List<UPreferences>.from(result.preferences);
+
+      preferences.removeWhere((p) => p is UPreferencesSavedFeedsPrefV2);
+      preferences.add(UPreferences.savedFeedsPrefV2(data: SavedFeedsPrefV2(items: feeds)));
+
+      await _feedRepository.putPreferences(preferences: preferences);
+
+      emit(FeedPreferencesState.loaded(feeds: feeds));
+      return true;
+    } catch (e) {
+      emit(FeedPreferencesState.saveError(feeds: feeds, message: e.toString(), previousState: previousState));
+      return false;
+    }
+  }
+
+  void clearError() {
+    if (state.status == FeedPreferencesStatus.saveError && state.previousState != null) {
+      emit(state.previousState!);
+    }
+  }
+
+  Future<void> _cacheFeeds(List<SavedFeed> feeds) async {
+    final companions = feeds.asMap().entries.map((entry) {
+      final index = entry.key;
+      final feed = entry.value;
+      return SavedFeedsCompanion(
+        id: Value(feed.id),
+        accountDid: Value(_accountDid),
+        type: Value(feed.type.toJson()),
+        value: Value(feed.value),
+        pinned: Value(feed.pinned),
+        sortOrder: Value(index),
+        updatedAt: Value(DateTime.now()),
+      );
+    }).toList();
+
+    await _database.replaceSavedFeeds(_accountDid, companions);
+  }
+
+  SavedFeed _mapFromCached(SavedFeedEntry entry) {
+    return SavedFeed(
+      id: entry.id,
+      type: SavedFeedType.valueOf(entry.type) ?? const SavedFeedType.knownValue(data: KnownSavedFeedType.feed),
+      value: entry.value,
+      pinned: entry.pinned,
+    );
+  }
+
+  String _generateId() => const Uuid().v4();
+
+  SavedFeed _createDefaultTimelineFeed() {
+    return SavedFeed(
+      id: _generateId(),
+      type: const SavedFeedType.knownValue(data: KnownSavedFeedType.timeline),
+      value: 'timeline',
+      pinned: true,
+    );
+  }
+}
+
+enum FeedPreferencesStatus { initial, loading, loaded, saving, saveError, error }
+
+class FeedPreferencesState extends Equatable {
+  const FeedPreferencesState._({required this.status, this.feeds = const [], this.message, this.previousState});
+
+  const FeedPreferencesState.initial() : this._(status: FeedPreferencesStatus.initial);
+
+  const FeedPreferencesState.loaded({required List<SavedFeed> feeds})
+    : this._(status: FeedPreferencesStatus.loaded, feeds: feeds);
+
+  const FeedPreferencesState.error({required String message})
+    : this._(status: FeedPreferencesStatus.error, message: message);
+
+  const FeedPreferencesState.saveError({
+    required List<SavedFeed> feeds,
+    required String message,
+    required FeedPreferencesState previousState,
+  }) : this._(status: FeedPreferencesStatus.saveError, feeds: feeds, message: message, previousState: previousState);
+
+  final FeedPreferencesStatus status;
+  final List<SavedFeed> feeds;
+  final String? message;
+  final FeedPreferencesState? previousState;
+
+  List<SavedFeed> get pinnedFeeds => feeds.where((f) => f.pinned).toList();
+
+  List<SavedFeed> get unpinnedFeeds => feeds.where((f) => !f.pinned).toList();
+
+  FeedPreferencesState copyWith({
+    FeedPreferencesStatus? status,
+    List<SavedFeed>? feeds,
+    String? message,
+    FeedPreferencesState? previousState,
+  }) {
+    return FeedPreferencesState._(
+      status: status ?? this.status,
+      feeds: feeds ?? this.feeds,
+      message: message ?? this.message,
+      previousState: previousState ?? this.previousState,
+    );
+  }
+
+  @override
+  List<Object?> get props => [status, feeds, message, previousState];
+}
diff --git a/lib/features/feed/data/feed_repository.dart b/lib/features/feed/data/feed_repository.dart
index 85824af..2d550f0 100644
--- a/lib/features/feed/data/feed_repository.dart
+++ b/lib/features/feed/data/feed_repository.dart
@@ -1,10 +1,13 @@
+import 'package:atproto_core/atproto_core.dart';
+import 'package:bluesky/app_bsky_actor_defs.dart';
 import 'package:bluesky/app_bsky_feed_defs.dart';
 import 'package:bluesky/app_bsky_feed_getauthorfeed.dart';
+import 'package:bluesky/bluesky.dart';
 
 class FeedRepository {
-  FeedRepository({required dynamic bluesky}) : _bluesky = bluesky;
+  FeedRepository({required Bluesky bluesky}) : _bluesky = bluesky;
 
-  final dynamic _bluesky;
+  final Bluesky _bluesky;
 
   Future<FeedResult> getAuthorFeed({
     required String actor,
@@ -19,6 +22,43 @@ class FeedRepository {
     return FeedResult(posts: response.data.feed, cursor: response.data.cursor);
   }
 
+  Future<FeedResult> getTimeline({String? cursor, int limit = 50}) async {
+    final response = await _bluesky.feed.getTimeline(cursor: cursor, limit: limit);
+
+    return FeedResult(posts: response.data.feed, cursor: response.data.cursor);
+  }
+
+  Future<FeedResult> getFeed({required AtUri feedUri, String? cursor, int limit = 50}) async {
+    final response = await _bluesky.feed.getFeed(feed: feedUri, cursor: cursor, limit: limit);
+
+    return FeedResult(posts: response.data.feed, cursor: response.data.cursor);
+  }
+
+  Future<PreferencesResult> getPreferences() async {
+    final response = await _bluesky.actor.getPreferences();
+    return PreferencesResult(preferences: response.data.preferences);
+  }
+
+  Future<void> putPreferences({required List<UPreferences> preferences}) async {
+    await _bluesky.actor.putPreferences(preferences: preferences);
+  }
+
+  Future<List<GeneratorView>> getSuggestedFeeds({String? cursor, int limit = 50}) async {
+    final response = await _bluesky.feed.getSuggestedFeeds(cursor: cursor, limit: limit);
+    return response.data.feeds;
+  }
+
+  Future<GeneratorView> getFeedGenerator(AtUri feedUri) async {
+    final response = await _bluesky.feed.getFeedGenerator(feed: feedUri);
+    return response.data.view;
+  }
+
+  Future<List<GeneratorView>> getFeedGenerators(List<AtUri> feedUris) async {
+    if (feedUris.isEmpty) return [];
+    final response = await _bluesky.feed.getFeedGenerators(feeds: feedUris);
+    return response.data.feeds;
+  }
+
   FeedGetAuthorFeedFilter? _mapToBskyFilter(FeedFilter filter) {
     switch (filter) {
       case FeedFilter.postsNoReplies:
@@ -37,4 +77,9 @@ class FeedResult {
   final String? cursor;
 }
 
+class PreferencesResult {
+  PreferencesResult({required this.preferences});
+  final List<UPreferences> preferences;
+}
+
 enum FeedFilter { postsNoReplies, postsWithMedia, postsAndAuthorThreads }
diff --git a/lib/features/feed/presentation/feed_management_screen.dart b/lib/features/feed/presentation/feed_management_screen.dart
new file mode 100644
index 0000000..fcd22ad
--- /dev/null
+++ b/lib/features/feed/presentation/feed_management_screen.dart
@@ -0,0 +1,364 @@
+import 'package:atproto_core/atproto_core.dart';
+import 'package:bluesky/app_bsky_actor_defs.dart';
+import 'package:bluesky/app_bsky_feed_defs.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:lazurite/features/feed/cubit/feed_preferences_cubit.dart';
+import 'package:lazurite/features/feed/data/feed_repository.dart';
+
+class FeedManagementScreen extends StatefulWidget {
+  const FeedManagementScreen({super.key});
+
+  @override
+  State<FeedManagementScreen> createState() => _FeedManagementScreenState();
+}
+
+class _FeedManagementScreenState extends State<FeedManagementScreen> {
+  List<GeneratorView>? _suggestedFeeds;
+  bool _isLoadingSuggestions = false;
+  bool _isReordering = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadSuggestedFeeds();
+  }
+
+  Future<void> _loadSuggestedFeeds() async {
+    setState(() => _isLoadingSuggestions = true);
+
+    try {
+      final feedRepository = context.read<FeedRepository>();
+      final feeds = await feedRepository.getSuggestedFeeds(limit: 10);
+      setState(() {
+        _suggestedFeeds = feeds;
+        _isLoadingSuggestions = false;
+      });
+    } catch (e) {
+      setState(() => _isLoadingSuggestions = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('My Feeds'),
+        actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('Done'))],
+      ),
+      body: BlocConsumer<FeedPreferencesCubit, FeedPreferencesState>(
+        listener: (context, state) {
+          if (state.status == FeedPreferencesStatus.saveError) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text('Failed to sync: ${state.message}'),
+                action: SnackBarAction(
+                  label: 'Dismiss',
+                  onPressed: () => context.read<FeedPreferencesCubit>().clearError(),
+                ),
+              ),
+            );
+          }
+        },
+        builder: (context, state) {
+          if (state.status == FeedPreferencesStatus.loading) {
+            return const Center(child: CircularProgressIndicator());
+          }
+
+          return ListView(
+            children: [
+              _buildSectionHeader(
+                context,
+                'Pinned Feeds',
+                showReorder: state.pinnedFeeds.length > 1 && !_isReordering,
+                isReordering: _isReordering,
+                onAction: () => setState(() => _isReordering = !_isReordering),
+              ),
+              if (_isReordering && state.pinnedFeeds.length > 1)
+                _buildReorderablePinnedFeeds(context, state)
+              else
+                ...state.pinnedFeeds.map((feed) => _buildPinnedFeedItem(context, feed, state)),
+              const SizedBox(height: 16),
+              _buildSectionHeader(context, 'Saved Feeds'),
+              if (state.unpinnedFeeds.isEmpty)
+                Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Text(
+                    'No saved feeds',
+                    style: Theme.of(
+                      context,
+                    ).textTheme.bodyMedium?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant),
+                  ),
+                )
+              else
+                ...state.unpinnedFeeds.map((feed) => _buildSavedFeedItem(context, feed)),
+              const SizedBox(height: 16),
+              _buildSectionHeader(context, 'Discover Feeds', actionText: 'Refresh', onAction: _loadSuggestedFeeds),
+              _buildDiscoverSection(context),
+              const SizedBox(height: 24),
+            ],
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildReorderablePinnedFeeds(BuildContext context, FeedPreferencesState state) {
+    final pinnedFeeds = state.pinnedFeeds;
+
+    return ReorderableListView.builder(
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      buildDefaultDragHandles: false,
+      itemCount: pinnedFeeds.length,
+      onReorder: (oldIndex, newIndex) {
+        context.read<FeedPreferencesCubit>().reorderPinnedFeeds(oldIndex, newIndex);
+      },
+      itemBuilder: (context, index) {
+        final feed = pinnedFeeds[index];
+        final isTimeline =
+            feed.type is SavedFeedTypeKnownValue &&
+            (feed.type as SavedFeedTypeKnownValue).data == KnownSavedFeedType.timeline;
+
+        return ListTile(
+          key: ValueKey(feed.id),
+          leading: isTimeline ? _buildTimelineIcon(context) : _buildFeedIcon(context, feed.value),
+          title: Text(isTimeline ? 'Following' : _getFeedDisplayName(feed.value)),
+          subtitle: Text(isTimeline ? 'Timeline' : 'Custom Feed'),
+          trailing: ReorderableDragStartListener(index: index, child: const Icon(Icons.drag_handle)),
+        );
+      },
+    );
+  }
+
+  Widget _buildSectionHeader(
+    BuildContext context,
+    String title, {
+    String? actionText,
+    VoidCallback? onAction,
+    bool showReorder = false,
+    bool isReordering = false,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
+      child: Row(
+        children: [
+          Text(
+            title.toUpperCase(),
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(fontWeight: FontWeight.w600, letterSpacing: 0.5),
+          ),
+          const Spacer(),
+          if (showReorder) TextButton(onPressed: onAction, child: Text(isReordering ? 'Done' : 'Reorder')),
+          if (actionText != null && !showReorder) TextButton(onPressed: onAction, child: Text(actionText)),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildPinnedFeedItem(BuildContext context, SavedFeed feed, FeedPreferencesState state) {
+    final isTimeline =
+        feed.type is SavedFeedTypeKnownValue &&
+        (feed.type as SavedFeedTypeKnownValue).data == KnownSavedFeedType.timeline;
+
+    return ListTile(
+      leading: isTimeline ? _buildTimelineIcon(context) : _buildFeedIcon(context, feed.value),
+      title: Text(isTimeline ? 'Following' : _getFeedDisplayName(feed.value)),
+      subtitle: Text(isTimeline ? 'Timeline' : 'Custom Feed'),
+      trailing: IconButton(
+        icon: const Icon(Icons.check_circle),
+        color: Theme.of(context).colorScheme.primary,
+        onPressed: () => context.read<FeedPreferencesCubit>().unpinFeed(feed.id),
+      ),
+    );
+  }
+
+  Widget _buildSavedFeedItem(BuildContext context, SavedFeed feed) {
+    return ListTile(
+      leading: _buildFeedIcon(context, feed.value),
+      title: Text(_getFeedDisplayName(feed.value)),
+      subtitle: const Text('Custom Feed'),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          IconButton(
+            icon: const Icon(Icons.pin_end_outlined),
+            onPressed: () => context.read<FeedPreferencesCubit>().pinFeed(feed.id),
+          ),
+          IconButton(
+            icon: Icon(Icons.close, color: Theme.of(context).colorScheme.error),
+            onPressed: () => _confirmRemoveFeed(context, feed.id),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDiscoverSection(BuildContext context) {
+    if (_isLoadingSuggestions) {
+      return const Padding(
+        padding: EdgeInsets.all(32),
+        child: Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    if (_suggestedFeeds == null || _suggestedFeeds!.isEmpty) {
+      return Padding(
+        padding: const EdgeInsets.all(16),
+        child: Text(
+          'No suggested feeds available',
+          style: Theme.of(
+            context,
+          ).textTheme.bodyMedium?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant),
+        ),
+      );
+    }
+
+    return Column(children: _suggestedFeeds!.map((feed) => _buildDiscoverCard(context, feed)).toList());
+  }
+
+  Widget _buildDiscoverCard(BuildContext context, GeneratorView feed) {
+    final prefsState = context.watch<FeedPreferencesCubit>().state;
+    final isAdded = prefsState.feeds.any((f) => f.value == feed.uri.toString());
+
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Row(
+          children: [
+            _buildGeneratorIcon(context, feed),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    feed.displayName,
+                    style: Theme.of(context).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w600),
+                  ),
+                  Text(
+                    'by ${feed.creator.displayName ?? feed.creator.handle}',
+                    style: Theme.of(
+                      context,
+                    ).textTheme.bodySmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant),
+                  ),
+                  if (feed.description != null) ...[
+                    const SizedBox(height: 4),
+                    Text(
+                      feed.description!,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
+                  ],
+                  if (feed.likeCount != null) ...[
+                    const SizedBox(height: 4),
+                    Text(
+                      '${feed.likeCount} likes',
+                      style: Theme.of(
+                        context,
+                      ).textTheme.bodySmall?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant),
+                    ),
+                  ],
+                ],
+              ),
+            ),
+            const SizedBox(width: 8),
+            OutlinedButton(
+              onPressed: isAdded
+                  ? null
+                  : () => context.read<FeedPreferencesCubit>().addFeed(
+                      type: const SavedFeedType.knownValue(data: KnownSavedFeedType.feed),
+                      value: feed.uri.toString(),
+                      pinned: false,
+                    ),
+              child: Text(isAdded ? 'Added' : '+ Add'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTimelineIcon(BuildContext context) {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(
+        gradient: const LinearGradient(colors: [Color(0xFF0066FF), Color(0xFF0EA5E9)]),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: const Icon(Icons.people, color: Colors.white),
+    );
+  }
+
+  Widget _buildFeedIcon(BuildContext context, String feedUri) {
+    final gradients = [
+      const [Color(0xFFF59E0B), Color(0xFFFB923C)],
+      const [Color(0xFF8B5CF6), Color(0xFFBE95FF)],
+      const [Color(0xFF22C55E), Color(0xFF42BE65)],
+      const [Color(0xFFEE5396), Color(0xFFFF7EB6)],
+    ];
+    final index = feedUri.hashCode % gradients.length;
+
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(
+        gradient: LinearGradient(colors: gradients[index]),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: const Icon(Icons.rss_feed, color: Colors.white),
+    );
+  }
+
+  Widget _buildGeneratorIcon(BuildContext context, GeneratorView feed) {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(
+        gradient: const LinearGradient(colors: [Color(0xFF08BDBA), Color(0xFF3DDBD9)]),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: feed.avatar != null
+          ? ClipRRect(
+              borderRadius: BorderRadius.circular(10),
+              child: Image.network(
+                feed.avatar!,
+                fit: BoxFit.cover,
+                errorBuilder: (_, _, _) => const Icon(Icons.rss_feed, color: Colors.white),
+              ),
+            )
+          : const Icon(Icons.rss_feed, color: Colors.white),
+    );
+  }
+
+  String _getFeedDisplayName(String feedUri) {
+    try {
+      final uri = AtUri.parse(feedUri);
+      return uri.rkey;
+    } catch (_) {
+      return feedUri.split('/').lastOrNull ?? feedUri;
+    }
+  }
+
+  void _confirmRemoveFeed(BuildContext context, String feedId) {
+    showDialog<void>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Remove Feed'),
+        content: const Text('Are you sure you want to remove this feed from your saved feeds?'),
+        actions: [
+          TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('Cancel')),
+          TextButton(
+            onPressed: () {
+              context.read<FeedPreferencesCubit>().removeFeed(feedId);
+              Navigator.of(context).pop();
+            },
+            child: Text('Remove', style: TextStyle(color: Theme.of(context).colorScheme.error)),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/feed/presentation/home_feed_screen.dart b/lib/features/feed/presentation/home_feed_screen.dart
new file mode 100644
index 0000000..0dfe51f
--- /dev/null
+++ b/lib/features/feed/presentation/home_feed_screen.dart
@@ -0,0 +1,280 @@
+import 'package:atproto_core/atproto_core.dart';
+import 'package:bluesky/app_bsky_actor_defs.dart';
+import 'package:bluesky/app_bsky_feed_defs.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'package:lazurite/features/feed/cubit/feed_preferences_cubit.dart';
+import 'package:lazurite/features/feed/data/feed_repository.dart';
+import 'package:lazurite/features/feed/presentation/widgets/post_card.dart';
+
+class HomeFeedScreen extends StatefulWidget {
+  const HomeFeedScreen({super.key});
+
+  @override
+  State<HomeFeedScreen> createState() => _HomeFeedScreenState();
+}
+
+class _HomeFeedScreenState extends State<HomeFeedScreen> {
+  late final PageController _pageController;
+  int _currentTabIndex = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    _pageController = PageController();
+  }
+
+  @override
+  void dispose() {
+    _pageController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<FeedPreferencesCubit, FeedPreferencesState>(
+      builder: (context, prefsState) {
+        final pinnedFeeds = prefsState.pinnedFeeds;
+
+        if (pinnedFeeds.isEmpty) {
+          return Scaffold(
+            appBar: AppBar(title: const Text('Home')),
+            body: const Center(child: Text('No feeds pinned. Add feeds from settings.')),
+          );
+        }
+
+        return Scaffold(
+          appBar: AppBar(
+            title: const Text('Home'),
+            actions: [IconButton(icon: const Icon(Icons.settings_outlined), onPressed: () => context.push('/feeds'))],
+          ),
+          body: Column(
+            children: [
+              _buildTabBar(context, pinnedFeeds),
+              Expanded(
+                child: PageView.builder(
+                  controller: _pageController,
+                  onPageChanged: (index) => setState(() => _currentTabIndex = index),
+                  itemCount: pinnedFeeds.length,
+                  itemBuilder: (context, index) =>
+                      _FeedListView(feed: pinnedFeeds[index], key: ValueKey(pinnedFeeds[index].id)),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildTabBar(BuildContext context, List<SavedFeed> feeds) {
+    return Container(
+      decoration: BoxDecoration(
+        border: Border(bottom: BorderSide(color: Theme.of(context).dividerColor)),
+      ),
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Row(
+          children: feeds.asMap().entries.map((entry) {
+            final index = entry.key;
+            final feed = entry.value;
+            final isSelected = _currentTabIndex == index;
+
+            return GestureDetector(
+              onTap: () {
+                _pageController.animateToPage(
+                  index,
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.easeInOut,
+                );
+                setState(() => _currentTabIndex = index);
+              },
+              child: Container(
+                padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14),
+                decoration: BoxDecoration(
+                  border: Border(
+                    bottom: BorderSide(
+                      color: isSelected ? Theme.of(context).colorScheme.primary : Colors.transparent,
+                      width: 2,
+                    ),
+                  ),
+                ),
+                child: Text(
+                  _getFeedName(feed),
+                  style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                    fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
+                    color: isSelected
+                        ? Theme.of(context).colorScheme.onSurface
+                        : Theme.of(context).colorScheme.onSurfaceVariant,
+                  ),
+                ),
+              ),
+            );
+          }).toList(),
+        ),
+      ),
+    );
+  }
+
+  String _getFeedName(SavedFeed feed) {
+    if (feed.type is SavedFeedTypeKnownValue) {
+      final knownType = (feed.type as SavedFeedTypeKnownValue).data;
+      if (knownType == KnownSavedFeedType.timeline) {
+        return 'Following';
+      }
+    }
+    return feed.value.split('/').lastOrNull ?? 'Feed';
+  }
+}
+
+class _FeedListView extends StatefulWidget {
+  const _FeedListView({required this.feed, super.key});
+
+  final SavedFeed feed;
+
+  @override
+  State<_FeedListView> createState() => _FeedListViewState();
+}
+
+class _FeedListViewState extends State<_FeedListView> with AutomaticKeepAliveClientMixin {
+  final List<FeedViewPost> _posts = [];
+  String? _cursor;
+  bool _isLoading = false;
+  bool _isLoadingMore = false;
+  bool _hasError = false;
+  String? _errorMessage;
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  bool get wantKeepAlive => true;
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController.addListener(_onScroll);
+    _loadFeed();
+  }
+
+  @override
+  void dispose() {
+    _scrollController.removeListener(_onScroll);
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  void _onScroll() {
+    if (_scrollController.position.pixels >= _scrollController.position.maxScrollExtent - 200) {
+      _loadMore();
+    }
+  }
+
+  Future<void> _loadFeed() async {
+    if (_isLoading) return;
+
+    setState(() {
+      _isLoading = true;
+      _hasError = false;
+      _errorMessage = null;
+    });
+
+    try {
+      final feedRepository = context.read<FeedRepository>();
+      final result = await _fetchFeed(feedRepository, cursor: null);
+
+      setState(() {
+        _posts.clear();
+        _posts.addAll(result.posts);
+        _cursor = result.cursor;
+        _isLoading = false;
+        _hasError = false;
+      });
+    } catch (e) {
+      setState(() {
+        _isLoading = false;
+        _hasError = true;
+        _errorMessage = e.toString();
+      });
+    }
+  }
+
+  Future<void> _loadMore() async {
+    if (_isLoadingMore || _cursor == null) return;
+
+    setState(() => _isLoadingMore = true);
+
+    try {
+      final feedRepository = context.read<FeedRepository>();
+      final result = await _fetchFeed(feedRepository, cursor: _cursor);
+
+      setState(() {
+        _posts.addAll(result.posts);
+        _cursor = result.cursor;
+        _isLoadingMore = false;
+      });
+    } catch (e) {
+      setState(() => _isLoadingMore = false);
+    }
+  }
+
+  Future<FeedResult> _fetchFeed(FeedRepository repo, {String? cursor}) async {
+    final feedType = widget.feed.type;
+    if (feedType is SavedFeedTypeKnownValue) {
+      if (feedType.data == KnownSavedFeedType.timeline) {
+        return repo.getTimeline(cursor: cursor);
+      }
+    }
+
+    final feedUri = AtUri.parse(widget.feed.value);
+    return repo.getFeed(feedUri: feedUri, cursor: cursor);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    super.build(context);
+
+    if (_isLoading) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
+    if (_hasError) {
+      return Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text('Failed to load feed', style: Theme.of(context).textTheme.bodyLarge),
+            const SizedBox(height: 8),
+            Text(
+              _errorMessage ?? 'Unknown error',
+              style: Theme.of(context).textTheme.bodySmall?.copyWith(color: Theme.of(context).colorScheme.error),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            FilledButton(onPressed: _loadFeed, child: const Text('Retry')),
+          ],
+        ),
+      );
+    }
+
+    if (_posts.isEmpty) {
+      return Center(child: Text('No posts yet', style: Theme.of(context).textTheme.bodyLarge));
+    }
+
+    return RefreshIndicator(
+      onRefresh: _loadFeed,
+      child: ListView.builder(
+        controller: _scrollController,
+        itemCount: _posts.length + (_isLoadingMore ? 1 : 0),
+        itemBuilder: (context, index) {
+          if (index == _posts.length) {
+            return const Center(
+              child: Padding(padding: EdgeInsets.all(16), child: CircularProgressIndicator()),
+            );
+          }
+
+          return PostCard(feedViewPost: _posts[index]);
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
index d1f6ef0..35143f7 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -11,6 +11,7 @@ import 'package:lazurite/core/theme/app_theme.dart';
 import 'package:lazurite/features/auth/bloc/auth_bloc.dart';
 import 'package:lazurite/features/auth/data/auth_repository.dart';
 import 'package:lazurite/features/feed/bloc/feed_bloc.dart';
+import 'package:lazurite/features/feed/cubit/feed_preferences_cubit.dart';
 import 'package:lazurite/features/feed/data/feed_repository.dart';
 import 'package:lazurite/features/profile/bloc/profile_bloc.dart';
 import 'package:lazurite/features/profile/data/profile_repository.dart';
@@ -92,6 +93,9 @@ class LazuriteApp extends StatelessWidget {
             return appShell;
           }
 
+          final feedRepository = FeedRepository(bluesky: bluesky);
+          final accountDid = authState.tokens?.did ?? '';
+
           return MultiBlocProvider(
             providers: [
               BlocProvider(
@@ -99,9 +103,13 @@ class LazuriteApp extends StatelessWidget {
                   profileRepository: ProfileRepository(database: database, bluesky: bluesky),
                 ),
               ),
+              BlocProvider(create: (_) => FeedBloc(feedRepository: feedRepository)),
               BlocProvider(
-                create: (_) => FeedBloc(feedRepository: FeedRepository(bluesky: bluesky)),
+                create: (_) =>
+                    FeedPreferencesCubit(feedRepository: feedRepository, database: database, accountDid: accountDid)
+                      ..loadPreferences(),
               ),
+              RepositoryProvider.value(value: feedRepository),
             ],
             child: appShell,
           );
diff --git a/pubspec.lock b/pubspec.lock
index 61b68f1..ba9d851 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1030,7 +1030,7 @@ packages:
     source: hosted
     version: "3.1.5"
   uuid:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: uuid
       sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
diff --git a/pubspec.yaml b/pubspec.yaml
index ddfe61a..04b8124 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -31,6 +31,7 @@ dependencies:
   logger: ^2.6.2
   share_plus: ^10.1.4
   http: ^1.2.2
+  uuid: ^4.5.1
 
 dev_dependencies:
   flutter_test:
diff --git a/test/features/feed/cubit/feed_preferences_cubit_test.dart b/test/features/feed/cubit/feed_preferences_cubit_test.dart
new file mode 100644
index 0000000..34a8e68
--- /dev/null
+++ b/test/features/feed/cubit/feed_preferences_cubit_test.dart
@@ -0,0 +1,327 @@
+import 'package:bloc_test/bloc_test.dart';
+import 'package:bluesky/app_bsky_actor_defs.dart';
+import 'package:drift/drift.dart' hide isNotNull;
+import 'package:drift/native.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:lazurite/core/database/app_database.dart';
+import 'package:lazurite/features/feed/cubit/feed_preferences_cubit.dart';
+import 'package:lazurite/features/feed/data/feed_repository.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockFeedRepository extends Mock implements FeedRepository {}
+
+void main() {
+  late AppDatabase database;
+  late MockFeedRepository mockFeedRepository;
+
+  setUp(() async {
+    database = AppDatabase(executor: NativeDatabase.memory());
+    mockFeedRepository = MockFeedRepository();
+  });
+
+  tearDown(() async {
+    await database.close();
+  });
+
+  SavedFeed createTestFeed({
+    required String id,
+    String value = 'at://did:plc:test/app.bsky.feed.generator/test',
+    bool pinned = false,
+    SavedFeedType? type,
+  }) {
+    return SavedFeed(
+      id: id,
+      type: type ?? const SavedFeedType.knownValue(data: KnownSavedFeedType.feed),
+      value: value,
+      pinned: pinned,
+    );
+  }
+
+  group('FeedPreferencesCubit', () {
+    test('initial state is initial', () {
+      final cubit = FeedPreferencesCubit(
+        feedRepository: mockFeedRepository,
+        database: database,
+        accountDid: 'did:plc:test',
+      );
+      expect(cubit.state.status, FeedPreferencesStatus.initial);
+      expect(cubit.state.feeds, isEmpty);
+    });
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'loadPreferences loads from API and caches to database',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenAnswer(
+          (_) async => PreferencesResult(
+            preferences: [
+              UPreferences.savedFeedsPrefV2(
+                data: SavedFeedsPrefV2(
+                  items: [
+                    createTestFeed(id: 'feed-1', pinned: true),
+                    createTestFeed(id: 'feed-2', pinned: false),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+      act: (cubit) => cubit.loadPreferences(),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.loading),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.feeds.length, 'feeds.length', 2)
+            .having((s) => s.pinnedFeeds.length, 'pinnedFeeds.length', 1)
+            .having((s) => s.unpinnedFeeds.length, 'unpinnedFeeds.length', 1),
+      ],
+      verify: (cubit) async {
+        final cached = await database.getSavedFeeds('did:plc:test');
+        expect(cached.length, 2);
+      },
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'loadPreferences creates default timeline feed when no preferences exist',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenAnswer((_) async => PreferencesResult(preferences: []));
+      },
+      act: (cubit) => cubit.loadPreferences(),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.loading),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.feeds.length, 'feeds.length', 1)
+            .having((s) => s.pinnedFeeds.length, 'pinnedFeeds.length', 1),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'loadPreferences falls back to cached data on API error',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      setUp: () async {
+        await database.replaceSavedFeeds('did:plc:test', [
+          SavedFeedsCompanion(
+            id: const Value('cached-1'),
+            accountDid: const Value('did:plc:test'),
+            type: const Value('{"\$type":"app.bsky.actor.defs#savedFeedTypeKnownValue","data":"feed"}'),
+            value: const Value('at://test'),
+            pinned: const Value(true),
+            sortOrder: const Value(0),
+            updatedAt: Value(DateTime.now()),
+          ),
+        ]);
+        when(() => mockFeedRepository.getPreferences()).thenThrow(Exception('Network error'));
+      },
+      act: (cubit) => cubit.loadPreferences(),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.loading),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.feeds.length, 'feeds.length', 1),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'pinFeed moves feed to pinned section',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      seed: () => FeedPreferencesState.loaded(
+        feeds: [
+          createTestFeed(id: 'feed-1', pinned: true),
+          createTestFeed(id: 'feed-2', pinned: false),
+        ],
+      ),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenAnswer((_) async => PreferencesResult(preferences: []));
+        when(() => mockFeedRepository.putPreferences(preferences: any(named: 'preferences'))).thenAnswer((_) async {});
+      },
+      act: (cubit) => cubit.pinFeed('feed-2'),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.saving),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.pinnedFeeds.length, 'pinnedFeeds.length', 2),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'unpinFeed moves feed to unpinned section',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      seed: () => FeedPreferencesState.loaded(
+        feeds: [
+          createTestFeed(id: 'feed-1', pinned: true),
+          createTestFeed(id: 'feed-2', pinned: true),
+          createTestFeed(id: 'feed-3', pinned: false),
+        ],
+      ),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenAnswer((_) async => PreferencesResult(preferences: []));
+        when(() => mockFeedRepository.putPreferences(preferences: any(named: 'preferences'))).thenAnswer((_) async {});
+      },
+      act: (cubit) => cubit.unpinFeed('feed-1'),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.saving),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.pinnedFeeds.length, 'pinnedFeeds.length', 1)
+            .having((s) => s.unpinnedFeeds.length, 'unpinnedFeeds.length', 2)
+            .having((s) => s.pinnedFeeds.first.id, 'remaining pinned', 'feed-2'),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'reorderPinnedFeeds reorders within pinned section only',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      seed: () => FeedPreferencesState.loaded(
+        feeds: [
+          createTestFeed(id: 'pinned-1', value: 'at://a', pinned: true),
+          createTestFeed(id: 'pinned-2', value: 'at://b', pinned: true),
+          createTestFeed(id: 'pinned-3', value: 'at://c', pinned: true),
+          createTestFeed(id: 'unpinned-1', value: 'at://d', pinned: false),
+        ],
+      ),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenAnswer((_) async => PreferencesResult(preferences: []));
+        when(() => mockFeedRepository.putPreferences(preferences: any(named: 'preferences'))).thenAnswer((_) async {});
+      },
+      act: (cubit) => cubit.reorderPinnedFeeds(0, 3),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.saving),
+        predicate<FeedPreferencesState>(
+          (s) =>
+              s.status == FeedPreferencesStatus.loaded &&
+              s.pinnedFeeds[0].id == 'pinned-2' &&
+              s.pinnedFeeds[1].id == 'pinned-3' &&
+              s.pinnedFeeds[2].id == 'pinned-1' &&
+              s.unpinnedFeeds.length == 1,
+        ),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'removeFeed removes feed from list',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      seed: () => FeedPreferencesState.loaded(
+        feeds: [
+          createTestFeed(id: 'feed-1', pinned: true),
+          createTestFeed(id: 'feed-2', pinned: false),
+        ],
+      ),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenAnswer((_) async => PreferencesResult(preferences: []));
+        when(() => mockFeedRepository.putPreferences(preferences: any(named: 'preferences'))).thenAnswer((_) async {});
+      },
+      act: (cubit) => cubit.removeFeed('feed-2'),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.saving),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.feeds.length, 'feeds.length', 1)
+            .having((s) => s.feeds.first.id, 'remaining feed', 'feed-1'),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'addFeed appends new feed to list',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      seed: () => FeedPreferencesState.loaded(feeds: [createTestFeed(id: 'feed-1', pinned: true)]),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenAnswer((_) async => PreferencesResult(preferences: []));
+        when(() => mockFeedRepository.putPreferences(preferences: any(named: 'preferences'))).thenAnswer((_) async {});
+      },
+      act: (cubit) => cubit.addFeed(
+        type: const SavedFeedType.knownValue(data: KnownSavedFeedType.feed),
+        value: 'at://new-feed',
+        pinned: true,
+      ),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.saving),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.feeds.length, 'feeds.length', 2)
+            .having((s) => s.pinnedFeeds.length, 'pinnedFeeds.length', 2),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      '_savePreferences emits saveError on API failure',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      seed: () => FeedPreferencesState.loaded(feeds: [createTestFeed(id: 'feed-1', pinned: true)]),
+      setUp: () {
+        when(() => mockFeedRepository.getPreferences()).thenThrow(Exception('API error'));
+      },
+      act: (cubit) => cubit.pinFeed('feed-1'),
+      expect: () => [
+        isA<FeedPreferencesState>().having((s) => s.status, 'status', FeedPreferencesStatus.saving),
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.saveError)
+            .having((s) => s.message, 'message', isNotNull),
+      ],
+    );
+
+    blocTest<FeedPreferencesCubit, FeedPreferencesState>(
+      'clearError restores previous state',
+      build: () =>
+          FeedPreferencesCubit(feedRepository: mockFeedRepository, database: database, accountDid: 'did:plc:test'),
+      seed: () => FeedPreferencesState.saveError(
+        feeds: [createTestFeed(id: 'feed-1', pinned: true)],
+        message: 'Error',
+        previousState: FeedPreferencesState.loaded(feeds: [createTestFeed(id: 'feed-1', pinned: false)]),
+      ),
+      act: (cubit) => cubit.clearError(),
+      expect: () => [
+        isA<FeedPreferencesState>()
+            .having((s) => s.status, 'status', FeedPreferencesStatus.loaded)
+            .having((s) => s.feeds.first.pinned, 'pinned', false),
+      ],
+    );
+  });
+
+  group('FeedPreferencesState', () {
+    test('pinnedFeeds returns only pinned feeds', () {
+      final state = FeedPreferencesState.loaded(
+        feeds: [
+          createTestFeed(id: '1', pinned: true),
+          createTestFeed(id: '2', pinned: false),
+          createTestFeed(id: '3', pinned: true),
+        ],
+      );
+
+      expect(state.pinnedFeeds.length, 2);
+      expect(state.pinnedFeeds.every((f) => f.pinned), isTrue);
+    });
+
+    test('unpinnedFeeds returns only unpinned feeds', () {
+      final state = FeedPreferencesState.loaded(
+        feeds: [
+          createTestFeed(id: '1', pinned: true),
+          createTestFeed(id: '2', pinned: false),
+          createTestFeed(id: '3', pinned: true),
+        ],
+      );
+
+      expect(state.unpinnedFeeds.length, 1);
+      expect(state.unpinnedFeeds.every((f) => !f.pinned), isTrue);
+    });
+
+    test('copyWith preserves unspecified values', () {
+      final state = FeedPreferencesState.loaded(feeds: [createTestFeed(id: '1', pinned: true)]);
+
+      final copied = state.copyWith(status: FeedPreferencesStatus.saving);
+
+      expect(copied.status, FeedPreferencesStatus.saving);
+      expect(copied.feeds.length, 1);
+    });
+  });
+}
diff --git a/test/features/feed/data/feed_repository_test.dart b/test/features/feed/data/feed_repository_test.dart
new file mode 100644
index 0000000..d7b0e59
--- /dev/null
+++ b/test/features/feed/data/feed_repository_test.dart
@@ -0,0 +1,236 @@
+import 'package:atproto_core/atproto_core.dart';
+import 'package:bluesky/app_bsky_actor_defs.dart';
+import 'package:bluesky/app_bsky_feed_defs.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:lazurite/features/feed/data/feed_repository.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockFeedRepository extends Mock implements FeedRepository {}
+
+void main() {
+  late MockFeedRepository mockRepository;
+
+  setUp(() {
+    mockRepository = MockFeedRepository();
+  });
+
+  group('FeedRepository contract', () {
+    final samplePost = FeedViewPost(
+      post: PostView(
+        uri: const AtUri('at://did:plc:author/app.bsky.feed.post/abc'),
+        cid: 'cid-123',
+        author: const ProfileViewBasic(did: 'did:plc:author', handle: 'author.bsky.social'),
+        record: {
+          r'$type': 'app.bsky.feed.post',
+          'text': 'Hello world',
+          'createdAt': DateTime.utc(2026, 3, 15).toIso8601String(),
+        },
+        indexedAt: DateTime.utc(2026, 3, 15),
+      ),
+    );
+
+    test('getTimeline returns FeedResult with posts and cursor', () async {
+      when(
+        () => mockRepository.getTimeline(
+          cursor: any(named: 'cursor'),
+          limit: any(named: 'limit'),
+        ),
+      ).thenAnswer((_) async => FeedResult(posts: [samplePost], cursor: 'next-cursor'));
+
+      final result = await mockRepository.getTimeline();
+
+      expect(result.posts.length, 1);
+      expect(result.cursor, 'next-cursor');
+    });
+
+    test('getTimeline with cursor returns paginated results', () async {
+      when(
+        () => mockRepository.getTimeline(
+          cursor: 'page-2',
+          limit: any(named: 'limit'),
+        ),
+      ).thenAnswer((_) async => FeedResult(posts: [samplePost], cursor: 'page-3'));
+
+      final result = await mockRepository.getTimeline(cursor: 'page-2');
+
+      expect(result.cursor, 'page-3');
+    });
+
+    test('getFeed returns FeedResult for feed generator', () async {
+      final feedUri = AtUri.parse('at://did:plc:gen/app.bsky.feed.generator/whats-hot');
+      when(
+        () => mockRepository.getFeed(
+          feedUri: feedUri,
+          cursor: any(named: 'cursor'),
+          limit: any(named: 'limit'),
+        ),
+      ).thenAnswer((_) async => FeedResult(posts: [samplePost], cursor: 'next-cursor'));
+
+      final result = await mockRepository.getFeed(feedUri: feedUri);
+
+      expect(result.posts.length, 1);
+    });
+
+    test('getPreferences returns preferences list', () async {
+      when(() => mockRepository.getPreferences()).thenAnswer((_) async => PreferencesResult(preferences: []));
+
+      final result = await mockRepository.getPreferences();
+
+      expect(result.preferences, isEmpty);
+    });
+
+    test('putPreferences calls with correct parameters', () async {
+      when(() => mockRepository.putPreferences(preferences: any(named: 'preferences'))).thenAnswer((_) async {});
+
+      await mockRepository.putPreferences(preferences: []);
+
+      verify(() => mockRepository.putPreferences(preferences: [])).called(1);
+    });
+
+    test('getSuggestedFeeds returns list of generators', () async {
+      final generator = GeneratorView(
+        uri: const AtUri('at://did:plc:gen/app.bsky.feed.generator/discover'),
+        cid: 'cid-gen',
+        creator: const ProfileView(did: 'did:plc:gen', handle: 'gen.bsky.social'),
+        did: 'did:plc:gen',
+        displayName: 'Discover',
+        indexedAt: DateTime.now(),
+      );
+
+      when(
+        () => mockRepository.getSuggestedFeeds(
+          cursor: any(named: 'cursor'),
+          limit: any(named: 'limit'),
+        ),
+      ).thenAnswer((_) async => [generator]);
+
+      final result = await mockRepository.getSuggestedFeeds();
+
+      expect(result.length, 1);
+      expect(result.first.displayName, 'Discover');
+    });
+
+    test('getFeedGenerator returns single generator', () async {
+      final feedUri = AtUri.parse('at://did:plc:gen/app.bsky.feed.generator/discover');
+      final generator = GeneratorView(
+        uri: feedUri,
+        cid: 'cid-gen',
+        creator: const ProfileView(did: 'did:plc:gen', handle: 'gen.bsky.social'),
+        did: 'did:plc:gen',
+        displayName: 'Discover',
+        indexedAt: DateTime.now(),
+      );
+
+      when(() => mockRepository.getFeedGenerator(feedUri)).thenAnswer((_) async => generator);
+
+      final result = await mockRepository.getFeedGenerator(feedUri);
+
+      expect(result.displayName, 'Discover');
+    });
+
+    test('getFeedGenerators returns list for multiple URIs', () async {
+      final feedUri = AtUri.parse('at://did:plc:gen/app.bsky.feed.generator/discover');
+      final generator = GeneratorView(
+        uri: feedUri,
+        cid: 'cid-gen',
+        creator: const ProfileView(did: 'did:plc:gen', handle: 'gen.bsky.social'),
+        did: 'did:plc:gen',
+        displayName: 'Discover',
+        indexedAt: DateTime.now(),
+      );
+
+      when(() => mockRepository.getFeedGenerators([feedUri])).thenAnswer((_) async => [generator]);
+
+      final result = await mockRepository.getFeedGenerators([feedUri]);
+
+      expect(result.length, 1);
+    });
+
+    test('getFeedGenerator returns single generator', () async {
+      final feedUri = AtUri.parse('at://did:plc:gen/app.bsky.feed.generator/discover');
+      final generator = GeneratorView(
+        uri: feedUri,
+        cid: 'cid-gen',
+        creator: const ProfileView(did: 'did:plc:gen', handle: 'gen.bsky.social'),
+        did: 'did:plc:gen',
+        displayName: 'Discover',
+        indexedAt: DateTime.now(),
+      );
+
+      when(() => mockRepository.getFeedGenerator(feedUri)).thenAnswer((_) async => generator);
+
+      final result = await mockRepository.getFeedGenerator(feedUri);
+
+      expect(result.displayName, 'Discover');
+    });
+
+    test('getFeedGenerators returns list for multiple URIs', () async {
+      final feedUri = AtUri.parse('at://did:plc:gen/app.bsky.feed.generator/discover');
+      final generator = GeneratorView(
+        uri: feedUri,
+        cid: 'cid-gen',
+        creator: const ProfileView(did: 'did:plc:gen', handle: 'gen.bsky.social'),
+        did: 'did:plc:gen',
+        displayName: 'Discover',
+        indexedAt: DateTime.now(),
+      );
+
+      when(() => mockRepository.getFeedGenerators([feedUri])).thenAnswer((_) async => [generator]);
+
+      final result = await mockRepository.getFeedGenerators([feedUri]);
+
+      expect(result.length, 1);
+    });
+
+    test('getFeedGenerators returns empty list for empty input', () async {
+      when(() => mockRepository.getFeedGenerators([])).thenAnswer((_) async => []);
+
+      final result = await mockRepository.getFeedGenerators([]);
+
+      expect(result, isEmpty);
+    });
+  });
+
+  group('FeedResult', () {
+    test('stores posts and cursor', () {
+      final post = FeedViewPost(
+        post: PostView(
+          uri: const AtUri('at://did:plc:test/app.bsky.feed.post/1'),
+          cid: 'cid',
+          author: const ProfileViewBasic(did: 'did:plc:test', handle: 'test.bsky.social'),
+          record: {'text': 'Test'},
+          indexedAt: DateTime.now(),
+        ),
+      );
+
+      final result = FeedResult(posts: [post], cursor: 'cursor-1');
+
+      expect(result.posts.length, 1);
+      expect(result.cursor, 'cursor-1');
+    });
+
+    test('allows null cursor', () {
+      final result = FeedResult(posts: const [], cursor: null);
+
+      expect(result.posts, isEmpty);
+      expect(result.cursor, isNull);
+    });
+  });
+
+  group('PreferencesResult', () {
+    test('stores preferences list', () {
+      final result = PreferencesResult(preferences: []);
+
+      expect(result.preferences, isEmpty);
+    });
+  });
+
+  group('FeedFilter', () {
+    test('has expected filter values', () {
+      expect(FeedFilter.values.length, 3);
+      expect(FeedFilter.values, contains(FeedFilter.postsNoReplies));
+      expect(FeedFilter.values, contains(FeedFilter.postsWithMedia));
+      expect(FeedFilter.values, contains(FeedFilter.postsAndAuthorThreads));
+    });
+  });
+}
-- 
2.51.2