feat: complete e621 integration with API key auth, comics/pools, post variations, and server sync (v3.7.0)

README.md

@@ -14,7 +14,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.3-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.3" /></a>
+  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.5-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.5" /></a>
   <img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
   <img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows%20%7C%20macOS-00C853?style=for-the-badge" alt="Platforms" />
   <a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>

README_RU.md

@@ -14,7 +14,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.3-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.3" /></a>
+  <a href="https://github.com/RarDog/Prisma/releases"><img src="https://img.shields.io/badge/Version-3.5.5-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.5.5" /></a>
   <img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
   <img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows%20%7C%20macOS-00C853?style=for-the-badge" alt="Platforms" />
   <a href="https://github.com/RarDog/Prisma/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>

android/app/src/main/AndroidManifest.xml

@@ -4,32 +4,33 @@
 
     <application
         android:label="Prisma"
-        android:name="${applicationName}"
+        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
-        <activity
+        android:largeHeap="true">
-            android:name=".MainActivity"
+        <activity
-            android:exported="true"
+            android:name=".MainActivity"
-            android:launchMode="singleTop"
+            android:exported="true"
-            android:taskAffinity=""
+            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
+            android:taskAffinity=""
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:theme="@style/LaunchTheme"
-            android:hardwareAccelerated="true"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true"
-            <!-- Specifies an Android theme to apply to this Activity as soon as
+            android:windowSoftInputMode="adjustResize">
-                 the Android process has started. This theme is visible to the user
+            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 while the Flutter UI initializes. After that, this theme continues
+                 the Android process has started. This theme is visible to the user
-                 to determine the Window background behind the Flutter UI. -->
+                 while the Flutter UI initializes. After that, this theme continues
-            <meta-data
+                 to determine the Window background behind the Flutter UI. -->
-              android:name="io.flutter.embedding.android.NormalTheme"
+            <meta-data
-              android:resource="@style/NormalTheme"
+              android:name="io.flutter.embedding.android.NormalTheme"
-              />
+              android:resource="@style/NormalTheme"
-            <intent-filter>
+              />
-                <action android:name="android.intent.action.MAIN"/>
+            <intent-filter>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN"/>
-            </intent-filter>
+                <category android:name="android.intent.category.LAUNCHER"/>
-        </activity>
+            </intent-filter>
-        <!-- Don't delete the meta-data below.
+        </activity>
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
@@ -43,15 +44,15 @@
                 android:resource="@xml/file_paths" />
         </provider>
     </application>
-    <!-- Required to query activities that can process text, see:
+    <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/training/package-visibility and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
+
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
-    <queries>
+    <queries>
-        <intent>
+        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
+            <data android:mimeType="text/plain"/>
-        </intent>
+        </intent>
-    </queries>
+    </queries>
-</manifest>
+</manifest>

installer/build_linux_appimage.sh

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+cd "${ROOT_DIR}"
+
+VERSION=$(grep 'version:' pubspec.yaml | head -n 1 | awk '{print $2}' | cut -d'+' -f1)
+if [ -z "$VERSION" ]; then
+  VERSION="3.5.5"
+fi
+
+echo "Building AppImage for Prisma v${VERSION}..."
+
+BUNDLE_DIR="${ROOT_DIR}/build/linux/x64/release/bundle"
+if [ ! -f "${BUNDLE_DIR}/gel_rule_app" ]; then
+  echo "Release bundle not found. Running 'flutter build linux --release'..."
+  flutter build linux --release
+fi
+
+APP_DIR="${ROOT_DIR}/build/AppDir"
+OUTPUT_DIR="${ROOT_DIR}/build"
+APPIMAGE_NAME="Prisma-v${VERSION}-linux-x86_64.AppImage"
+OUTPUT_APPIMAGE="${OUTPUT_DIR}/${APPIMAGE_NAME}"
+
+# Ensure appimagetool is available
+APPIMAGETOOL=""
+if command -v appimagetool >/dev/null 2>&1; then
+  APPIMAGETOOL="appimagetool"
+elif [ -f "${ROOT_DIR}/build/tools/appimagetool" ]; then
+  APPIMAGETOOL="${ROOT_DIR}/build/tools/appimagetool"
+else
+  echo "Downloading appimagetool..."
+  mkdir -p "${ROOT_DIR}/build/tools"
+  curl -fsSL https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage -o "${ROOT_DIR}/build/tools/appimagetool"
+  chmod +x "${ROOT_DIR}/build/tools/appimagetool"
+  APPIMAGETOOL="${ROOT_DIR}/build/tools/appimagetool"
+fi
+
+echo "Preparing AppDir at ${APP_DIR}..."
+rm -rf "${APP_DIR}"
+mkdir -p "${APP_DIR}"
+
+# Copy bundle contents
+cp -r "${BUNDLE_DIR}"/* "${APP_DIR}/"
+
+# AppRun script
+cat << 'EOF' > "${APP_DIR}/AppRun"
+#!/bin/sh
+HERE="$(dirname "$(readlink -f "${0}")")"
+export PATH="${HERE}/usr/bin:${PATH}"
+export LD_LIBRARY_PATH="${HERE}/lib:${HERE}/usr/lib:${LD_LIBRARY_PATH}"
+exec "${HERE}/gel_rule_app" "$@"
+EOF
+chmod +x "${APP_DIR}/AppRun"
+
+# Desktop file
+cat << 'EOF' > "${APP_DIR}/prisma.desktop"
+[Desktop Entry]
+Name=Prisma
+GenericName=Booru Client
+Comment=Prisma - Modern Booru & Art Client
+Exec=gel_rule_app %u
+Icon=prisma
+Terminal=false
+Type=Application
+Categories=Network;Graphics;
+StartupWMClass=com.example.gel_rule_app
+EOF
+
+mkdir -p "${APP_DIR}/usr/share/applications"
+cp "${APP_DIR}/prisma.desktop" "${APP_DIR}/usr/share/applications/prisma.desktop"
+
+# Icons
+ICON_SRC="${ROOT_DIR}/macos/Runner/Assets.xcassets/AppIcon.appiconset"
+if [ -d "${ICON_SRC}" ]; then
+  for size in 16 32 64 128 256 512 1024; do
+    if [ -f "${ICON_SRC}/app_icon_${size}.png" ]; then
+      mkdir -p "${APP_DIR}/usr/share/icons/hicolor/${size}x${size}/apps"
+      cp "${ICON_SRC}/app_icon_${size}.png" "${APP_DIR}/usr/share/icons/hicolor/${size}x${size}/apps/prisma.png"
+    fi
+  done
+  cp "${ICON_SRC}/app_icon_512.png" "${APP_DIR}/prisma.png"
+fi
+
+# Build AppImage
+echo "Generating AppImage with ${APPIMAGETOOL}..."
+ARCH=x86_64 "${APPIMAGETOOL}" -n "${APP_DIR}" "${OUTPUT_APPIMAGE}"
+
+echo "AppImage created successfully: ${OUTPUT_APPIMAGE}"
+ls -lh "${OUTPUT_APPIMAGE}"

lib/app/app_navigator.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+
+import '../backend/models/post.dart';
+import '../features/post/presentation/post_details_screen.dart';
+import '../features/post/presentation/similar_posts_screen.dart';
+
+class AppNavigator {
+  const AppNavigator._();
+
+  static void openPost(
+    BuildContext context, {
+    required Post post,
+    List<Post>? postsList,
+  }) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (ctx) => PostDetailsScreen(
+          providerId: post.providerId,
+          postId: post.id,
+          initialPost: post,
+          postsList: postsList,
+        ),
+      ),
+    );
+  }
+
+  static void openSimilarPosts(
+    BuildContext context, {
+    required Post post,
+  }) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (ctx) => SimilarPostsScreen(
+          providerId: post.providerId,
+          postId: post.id,
+          initialPost: post,
+        ),
+      ),
+    );
+  }
+}

lib/app/app_version.dart

@@ -1,3 +1,3 @@
-const appDisplayVersion = '3.5.3';
+const appDisplayVersion = '3.5.5';
-const appBuildNumber = 79;
+const appBuildNumber = 81;
 const appReleaseChannel = 'Stable';

lib/app/changelog.dart

@@ -1,4 +1,91 @@
 const prismaChangelog = [
+  PrismaChange(
+    version: '3.7.0',
+    title: 'Большое обновление e621: авторизация по API-ключу, комиксы/пулы, вариации постов и синхронизация',
+    bullets: [
+      'Окно авторизации e621 (Username + API Key): красивое модальное окно прямо в карточке источника e621 с быстрой проверкой ключа, снятием жесткого лимита в 2 тега при поиске и персональным User-Agent.',
+      'Комиксы и Пулы (Pools): удобная модальная панель для серий и комиксов с индикатором страниц, навигацией «Предыдущая/Следующая» и сеткой всех страниц серии для быстрого перехода.',
+      'Связанные посты и вариации (Parent/Child relations): карточка версий с быстрым переходом к родительскому арту и альтернативным вариациям (позы, одежда, скетчи).',
+      'Серверное голосование и синхронизация Избранного: возможность ставить лайки/дизлайки с отправкой на e621 и автоматическая синхронизация избранного при наличии API-ключа.',
+      'Защита Rate Limiting: интеллектуальное ограничение частоты запросов (до 2 rps), предотвращающее ошибки 503 и блокировки по IP.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.6.5',
+    title: 'Исправление наложения превью на видеоплеер',
+    bullets: [
+      'Устранение наложения превью-картинки на воспроизводимое видео: убран фоновый слой постера под видеоплеером и восстановлен классический черный бэкграунд для правильного отображения границ и леттербоксинга видео любого формата.',
+      'Чистый рендеринг видео в карточках ленты: предпросмотр видео в ленте также изолирован от просвечивания подложки.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.6.4',
+    title: 'Полное исправление воспроизведения видео на ПК (устранение синего экрана)',
+    bullets: [
+      'Программный рендеринг (S/W) по умолчанию для ПК: на десктопных платформах отключен проблемный OpenGL FBO мост аппаратного ускорения, вызывавший синий экран из-за отсутствия или конфликтов драйверов VAAPI/VDPAU в Linux/AppImage.',
+      'Переключатель декодера H/W / S/W в плеере: на верхней панели управления видеоплеером добавлена кнопка быстрого переключения между аппаратным (H/W) и программным (S/W) декодированием на лету.',
+      'Отображение постера-превью: под видеоплеером теперь отображается превью-постер на время буферизации, исключая появление пустых областей.',
+      'Безопасное превью в ленте: предпросмотр видео в карточках постов на ПК также переведен на надежный программный рендерер.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.6.3',
+    title: 'Горизонтальный скролл колесиком мыши на ПК и исправление синего экрана в видеоплеере',
+    bullets: [
+      'Горизонтальная прокрутка колесиком мыши в настройках: верхняя панель категорий настроек теперь плавно прокручивается колесиком мыши строго при наведении курсора.',
+      'Горизонтальная прокрутка колесиком мыши в авторах: полоса любимых авторов и лента их медиа теперь поддерживают быструю прокрутку колесиком мыши при наведении курсора.',
+      'Устранение «синего экрана» в видеоплеере на ПК: исправлена нативная инициализация MediaKit перед запуском Flutter-движка и настроен оптимальный режим аппаратного ускорения для десктопных платформ.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.6.2',
+    title: 'Комплексная оптимизация памяти на телефоне и ПК, полное отключение зума колесиком',
+    bullets: [
+      'Полное отключение масштабирования колесиком мыши: перехвачен внутренний обработчик PointerScrollEvent в интерактивном вьюере, что навсегда исключило нежелательный зум при прокрутке.',
+      'Предотвращение вылетов на смартфонах (OOM): включен флаг android:largeHeap="true", расширяющий доступный лимит оперативной памяти процесса до 512–1024 МБ.',
+      'Ограничение аппетита кэша изображений: глобальный ImageCache в Flutter ограничен безопасным лимитом в 180 МБ и 120 изображений (вместо неограниченного роста до 1 ГБ+), неактивные растры своевременно выгружаются сборщиком мусора.',
+      'Оптимизация декодирования тяжелых артов: полноразмерные изображения с экстремальным разрешением (до 10K+) теперь безопасно декодируются с ограничением memCacheWidth под экран устройства, снижая расход RAM на 80–90%.',
+      'Оптимизация сетки и миниатюр: карточки ленты изолированы в RepaintBoundary для гладкого 120 FPS скролла без паразитных перерисовок, а всем каруселям, аватаркам и мозаикам заданы строгие границы кэширования.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.6.1',
+    title: 'Плавная боковая панель без лагов и отключение зума колесиком',
+    bullets: [
+      'Устранение лагов боковой панели: полностью переработана анимация наведения на боковую панель на ПК. Убран тяжелый шейдерный блюр при изменении ширины и зафиксирована верстка элементов — текст больше не сжимается, не дергается и раскрывается на 120 FPS максимально плавно.',
+      'Отключение зума фото по колесику мыши: исключено случайное и резкое масштабирование изображений при прокрутке колесиком мыши. Масштабирование фото доступно через горячие клавиши (+, -, 0, F) или двойной клик.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.6.0',
+    title: 'Редизайн интерфейса для ПК и система горячих клавиш (хоткеи)',
+    bullets: [
+      'Горячие клавиши для всех вкладок: переключение разделов по Ctrl+1..8 (и Alt+1..8), циклический переход Ctrl+Tab / Ctrl+Shift+Tab, поиск Ctrl+F, обновление Ctrl+R / F5.',
+      'Хоткеи видеоплеера: пауза/воспроизведение (Space, K), плавная перемотка на 5с (←/→, J/L) и 15с (Shift+←/→) с визуальными индикаторами, регулировка громкости ↑/↓, выключение звука M, полный экран F.',
+      'Хоткеи просмотра фото и галереи: масштабирование клавишами + / - / 0 (сброс в 100%), переключение страниц и фото в постах стрелками ← / →, быстрое сохранение Ctrl+S.',
+      'Окно-шпаргалка горячих клавиш: интерактивное модальное окно со всеми клавиатурными комбинациями по нажатию ? или F1, а также из меню панели.',
+      'Редизайн боковой панели ПК: боковое меню в стиле Liquid Glass с эффектом матового стекла, логотипом Lunaris, бейджами хоткеев, закреплением панели и быстрыми действиями.',
+      'Редизайн вкладок ленты: стильный сегментированный бар выбора периодов (Все время, 24ч, Неделя, Месяц, Год) с анимированными иконками и неоновые чипы источников.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.5.5',
+    title: 'Сохранение последней вкладки и состояния навигации между разделами',
+    bullets: [
+      'Сохранение последней вкладки: приложение запоминает активный раздел при выходе или закрытии и автоматически открывает его при следующем запуске.',
+      'Независимая история и сохранение места: при переключении между вкладками состояние каждого раздела полностью сохраняется. Например, если открыть публикацию или карточку у артиста и переключиться в поиск или ленту, при возврате обратно вы останетесь ровно на том же посте.',
+      'Бесшовные переходы между ветками навигации: улучшена обработка системной кнопки «Назад», переход по разделам стал еще быстрее и плавнее.',
+    ],
+  ),
+  PrismaChange(
+    version: '3.5.4',
+    title: 'Исправление распознавания MP4-видео и отключение устаревших сервисов Kemono/Coomer',
+    bullets: [
+      'Устранена ошибка классификации видео: файлы MP4, содержащие слово «audio» в имени файла или параметрах запроса, больше не распознаются как аудио и корректно воспроизводятся как полноценное видео.',
+      'Точное определение расширений: внедрён строгий парсинг расширений файлов, исключающий ложные срабатывания при определении типа медиа.',
+      'Удаление устаревших провайдеров Kemono и Coomer: окончательно удалены неработающие сервисы Kemono и Coomer из списка провайдеров и настроек (основным источником артистов является Pawchive).',
+    ],
+  ),
   PrismaChange(
     version: '3.5.3',
     title: 'Поддержка аудиозаписей (MP3/WAV/FLAC) и исправление загрузки медиа у авторов',

lib/app/router.dart

@@ -21,116 +21,171 @@ import '../features/settings/presentation/settings_screen.dart';
 import '../features/viewed/presentation/viewed_screen.dart';
 import '../shared/widgets/app_shell.dart';
 
+final branchNavKeys = List.generate(8, (_) => GlobalKey<NavigatorState>());
+
 final appRouterProvider = Provider<GoRouter>((ref) {
   return GoRouter(
     initialLocation: '/',
     routes: [
-      ShellRoute(
+      StatefulShellRoute.indexedStack(
-        builder: (context, state, child) => AppShell(child: child),
+        builder: (context, state, navigationShell) => AppShell(
+          navigationShell: navigationShell,
+          child: navigationShell,
+        ),
+        branches: [
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[0],
+            routes: [
+              GoRoute(
+                path: '/',
+                pageBuilder: (context, state) => _transitionPage(
+                  state,
+                  child: FeedScreen(initialQuery: state.uri.queryParameters['q']),
+                ),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[1],
+            routes: [
+              GoRoute(
+                path: '/search',
+                builder: (context, state) => const SearchScreen(),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[2],
+            routes: [
+              GoRoute(
+                path: '/favorites',
+                builder: (context, state) => const FavoritesScreen(),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[3],
+            routes: [
+              GoRoute(
+                path: '/viewed',
+                builder: (context, state) => const ViewedScreen(),
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[4],
+            routes: [
+              GoRoute(
+                path: '/collections',
+                builder: (context, state) => const CollectionsScreen(),
+                routes: [
+                  GoRoute(
+                    path: ':collectionId',
+                    builder: (context, state) => CollectionDetailsScreen(
+                      collectionId: state.pathParameters['collectionId']!,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[5],
+            routes: [
+              GoRoute(
+                path: '/artists',
+                builder: (context, state) => const ArtistsScreen(),
+                routes: [
+                  GoRoute(
+                    path: ':providerId/:service/:artistId',
+                    builder: (context, state) => ArtistPostsScreen(
+                      providerId: state.pathParameters['providerId']!,
+                      service: state.pathParameters['service']!,
+                      artistId: state.pathParameters['artistId']!,
+                      artistName: state.uri.queryParameters['name'] ??
+                          state.pathParameters['artistId']!,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[6],
+            routes: [
+              GoRoute(
+                path: '/providers',
+                builder: (context, state) => const ProvidersScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'new',
+                    builder: (context, state) => ProviderFormScreen(
+                      initialConfig: state.extra is ContentProviderConfig
+                          ? state.extra! as ContentProviderConfig
+                          : null,
+                    ),
+                  ),
+                  GoRoute(
+                    path: 'check',
+                    builder: (context, state) => const ProviderCheckScreen(),
+                  ),
+                ],
+              ),
+            ],
+          ),
+          StatefulShellBranch(
+            navigatorKey: branchNavKeys[7],
+            routes: [
+              GoRoute(
+                path: '/settings',
+                builder: (context, state) => const SettingsScreen(),
+                routes: [
+                  GoRoute(
+                    path: 'hidden',
+                    builder: (context, state) => const HiddenPostsScreen(),
+                  ),
+                  GoRoute(
+                    path: 'cache',
+                    builder: (context, state) => const CacheManagerScreen(),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ),
+      GoRoute(
+        path: '/post/:providerId/:postId',
+        builder: (context, state) {
+          final extra = state.extra;
+          final Post? initialPost;
+          final List<Post>? postsList;
+          if (extra is PostNavigationContext) {
+            initialPost = extra.currentPost;
+            postsList = extra.posts;
+          } else if (extra is Post) {
+            initialPost = extra;
+            postsList = null;
+          } else {
+            initialPost = null;
+            postsList = null;
+          }
+          return PostDetailsScreen(
+            providerId: state.pathParameters['providerId']!,
+            postId: state.pathParameters['postId']!,
+            initialPost: initialPost,
+            postsList: postsList,
+          );
+        },
         routes: [
           GoRoute(
-            path: '/',
+            path: 'similar',
-            pageBuilder: (context, state) => _transitionPage(
-              state,
-              child: FeedScreen(initialQuery: state.uri.queryParameters['q']),
-            ),
-          ),
-          GoRoute(
-            path: '/search',
-            builder: (context, state) => const SearchScreen(),
-          ),
-          GoRoute(
-            path: '/post/:providerId/:postId',
-            builder: (context, state) {
-              final extra = state.extra;
-              final Post? initialPost;
-              final List<Post>? postsList;
-              if (extra is PostNavigationContext) {
-                initialPost = extra.currentPost;
-                postsList = extra.posts;
-              } else if (extra is Post) {
-                initialPost = extra;
-                postsList = null;
-              } else {
-                initialPost = null;
-                postsList = null;
-              }
-              return PostDetailsScreen(
-                providerId: state.pathParameters['providerId']!,
-                postId: state.pathParameters['postId']!,
-                initialPost: initialPost,
-                postsList: postsList,
-              );
-            },
-          ),
-          GoRoute(
-            path: '/post/:providerId/:postId/similar',
             builder: (context, state) => SimilarPostsScreen(
               providerId: state.pathParameters['providerId']!,
               postId: state.pathParameters['postId']!,
               initialPost: state.extra is Post ? state.extra! as Post : null,
             ),
           ),
-          GoRoute(
-            path: '/favorites',
-            builder: (context, state) => const FavoritesScreen(),
-          ),
-          GoRoute(
-            path: '/viewed',
-            builder: (context, state) => const ViewedScreen(),
-          ),
-          GoRoute(
-            path: '/collections',
-            builder: (context, state) => const CollectionsScreen(),
-          ),
-          GoRoute(
-            path: '/collections/:collectionId',
-            builder: (context, state) => CollectionDetailsScreen(
-              collectionId: state.pathParameters['collectionId']!,
-            ),
-          ),
-          GoRoute(
-            path: '/artists',
-            builder: (context, state) => const ArtistsScreen(),
-          ),
-          GoRoute(
-            path: '/artists/:providerId/:service/:artistId',
-            builder: (context, state) => ArtistPostsScreen(
-              providerId: state.pathParameters['providerId']!,
-              service: state.pathParameters['service']!,
-              artistId: state.pathParameters['artistId']!,
-              artistName: state.uri.queryParameters['name'] ??
-                  state.pathParameters['artistId']!,
-            ),
-          ),
-          GoRoute(
-            path: '/providers',
-            builder: (context, state) => const ProvidersScreen(),
-          ),
-          GoRoute(
-            path: '/providers/new',
-            builder: (context, state) => ProviderFormScreen(
-              initialConfig: state.extra is ContentProviderConfig
-                  ? state.extra! as ContentProviderConfig
-                  : null,
-            ),
-          ),
-          GoRoute(
-            path: '/providers/check',
-            builder: (context, state) => const ProviderCheckScreen(),
-          ),
-          GoRoute(
-            path: '/settings',
-            builder: (context, state) => const SettingsScreen(),
-          ),
-          GoRoute(
-            path: '/settings/hidden',
-            builder: (context, state) => const HiddenPostsScreen(),
-          ),
-          GoRoute(
-            path: '/settings/cache',
-            builder: (context, state) => const CacheManagerScreen(),
-          ),
         ],
       ),
     ],

lib/backend/mappers/e621_mapper.dart

@@ -36,6 +36,38 @@ class E621Mapper {
       for (final entry in tagsMap.entries)
         entry.key: List<String>.from((entry.value as List?) ?? const []),
     }..removeWhere((_, value) => value.isEmpty);
+
+    final relationships = Map<String, dynamic>.from((json['relationships'] as Map?) ?? const {});
+    final parentId = relationships['parent_id']?.toString();
+    if (parentId != null && parentId.isNotEmpty && parentId != 'null') {
+      tagGroups['parent_id'] = [parentId];
+    }
+    final children = (relationships['children'] as List?)
+        ?.map((e) => e?.toString() ?? '')
+        .where((s) => s.isNotEmpty && s != 'null')
+        .toList();
+    if (children != null && children.isNotEmpty) {
+      tagGroups['children'] = children;
+    }
+
+    final rawPools = (json['pools'] as List?)
+        ?.map((e) => e?.toString() ?? '')
+        .where((s) => s.isNotEmpty)
+        .toList();
+    if (rawPools != null && rawPools.isNotEmpty) {
+      tagGroups['pools'] = rawPools;
+    }
+
+    final favCount = json['fav_count'];
+    if (favCount != null) {
+      tagGroups['fav_count'] = [favCount.toString()];
+    }
+
+    final desc = _string(json['description']);
+    if (desc.isNotEmpty) {
+      tagGroups['description'] = [desc];
+    }
+
     final tags = tagGroups.values.expand((items) => items).toSet().toList();
     final fileUrl = _string(file['url']);
     return Post(

lib/backend/models/e621_pool.dart

@@ -0,0 +1,58 @@
+class E621Pool {
+  const E621Pool({
+    required this.id,
+    required this.name,
+    required this.description,
+    required this.postIds,
+    required this.postCount,
+    required this.category,
+    required this.isActive,
+    this.creatorName,
+  });
+
+  final int id;
+  final String name;
+  final String description;
+  final List<String> postIds;
+  final int postCount;
+  final String category; // 'series' or 'collection'
+  final bool isActive;
+  final String? creatorName;
+
+  String get cleanTitle => name.replaceAll('_', ' ');
+
+  int pageOf(String postId) {
+    final idx = postIds.indexOf(postId);
+    return idx >= 0 ? idx + 1 : 0;
+  }
+
+  String? nextPostId(String postId) {
+    final idx = postIds.indexOf(postId);
+    if (idx >= 0 && idx < postIds.length - 1) {
+      return postIds[idx + 1];
+    }
+    return null;
+  }
+
+  String? previousPostId(String postId) {
+    final idx = postIds.indexOf(postId);
+    if (idx > 0) {
+      return postIds[idx - 1];
+    }
+    return null;
+  }
+
+  factory E621Pool.fromJson(Map<String, dynamic> json) {
+    final rawPostIds = (json['post_ids'] as List?) ?? const [];
+    return E621Pool(
+      id: (json['id'] as num?)?.toInt() ?? 0,
+      name: (json['name'] ?? '').toString(),
+      description: (json['description'] ?? '').toString(),
+      postIds: rawPostIds.map((e) => e.toString()).toList(),
+      postCount: (json['post_count'] as num?)?.toInt() ?? rawPostIds.length,
+      category: (json['category'] ?? 'series').toString(),
+      isActive: (json['is_active'] as bool?) ?? true,
+      creatorName: json['creator_name']?.toString(),
+    );
+  }
+}

lib/backend/models/post.dart

@@ -62,6 +62,27 @@ class Post {
 
   String? get description => commentary;
 
+  String? get parentId {
+    final list = tagGroups['parent_id'];
+    return (list != null && list.isNotEmpty && list.first.trim().isNotEmpty)
+        ? list.first.trim()
+        : null;
+  }
+
+  List<String> get childrenIds => tagGroups['children'] ?? const [];
+
+  List<String> get poolIds => tagGroups['pools'] ?? const [];
+
+  bool get hasRelations =>
+      (parentId != null && parentId!.isNotEmpty) || childrenIds.isNotEmpty;
+
+  bool get hasPools => poolIds.isNotEmpty;
+
+  int? get favCount {
+    final raw = tagGroups['fav_count']?.firstOrNull;
+    return raw != null ? int.tryParse(raw) : null;
+  }
+
   String? get title {
     final list = tagGroups['copyright'];
     if (list != null && list.isNotEmpty) {

lib/backend/providers/e621_provider.dart

@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
 
 import '../../core/http/dio_client.dart';
 import '../mappers/e621_mapper.dart';
+import '../models/e621_pool.dart';
 import '../models/post.dart';
 import '../models/post_comment.dart';
 import '../models/provider_health.dart';
@@ -33,6 +34,24 @@ class E621Provider
   final Dio _dio;
   final Map<String, String> _queryParameters;
 
+  static DateTime _lastRequestTime = DateTime.fromMillisecondsSinceEpoch(0);
+
+  static Future<void> _throttle() async {
+    final now = DateTime.now();
+    final diff = now.difference(_lastRequestTime);
+    if (diff.inMilliseconds < 500) {
+      final waitMs = 500 - diff.inMilliseconds;
+      await Future<void>.delayed(Duration(milliseconds: waitMs));
+    }
+    _lastRequestTime = DateTime.now();
+  }
+
+  bool get isAuthorized =>
+      _queryParameters.containsKey('login') ||
+      _dio.options.headers.containsKey('Authorization');
+
+  String? get login => _queryParameters['login'];
+
   @override
   String postPageUrl(Post post) => '$baseUrl/posts/${post.id}';
 
@@ -44,6 +63,7 @@ class E621Provider
     String? rating,
     TopPeriodFilter topPeriod = TopPeriodFilter.none,
   }) async {
+    await _throttle();
     final response = await _dio.get<dynamic>(
       '/posts.json',
       queryParameters: {
@@ -66,6 +86,7 @@ class E621Provider
 
   @override
   Future<Post?> getPost(String id) async {
+    await _throttle();
     final response = await _dio.get<dynamic>(
       '/posts/$id.json',
       queryParameters: _queryParameters,
@@ -78,6 +99,63 @@ class E621Provider
     return posts.isEmpty ? null : posts.first;
   }
 
+  Future<E621Pool?> getPool(String poolId) async {
+    await _throttle();
+    try {
+      final response = await _dio.get<dynamic>(
+        '/pools/$poolId.json',
+        queryParameters: _queryParameters,
+      );
+      if (response.data is Map) {
+        return E621Pool.fromJson(Map<String, dynamic>.from(response.data as Map));
+      }
+    } catch (_) {}
+    return null;
+  }
+
+  Future<bool> votePost(String postId, int score) async {
+    await _throttle();
+    try {
+      final response = await _dio.post<dynamic>(
+        '/posts/$postId/votes.json',
+        data: {'score': score, 'no_unvote': 'true'},
+        queryParameters: _queryParameters,
+        options: Options(contentType: Headers.formUrlEncodedContentType),
+      );
+      return response.statusCode == 200 || response.statusCode == 201;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<bool> addFavorite(String postId) async {
+    await _throttle();
+    try {
+      final response = await _dio.post<dynamic>(
+        '/favorites.json',
+        data: {'post_id': postId},
+        queryParameters: _queryParameters,
+        options: Options(contentType: Headers.formUrlEncodedContentType),
+      );
+      return response.statusCode == 200 || response.statusCode == 201;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<bool> removeFavorite(String postId) async {
+    await _throttle();
+    try {
+      final response = await _dio.delete<dynamic>(
+        '/favorites/$postId.json',
+        queryParameters: _queryParameters,
+      );
+      return response.statusCode == 200 || response.statusCode == 204;
+    } catch (_) {
+      return false;
+    }
+  }
+
   @override
   Future<ProviderHealth> checkHealth() async {
     final startedAt = DateTime.now();
@@ -109,6 +187,7 @@ class E621Provider
   Future<List<TagSuggestion>> suggestTags(String query,
       {int limit = 20}) async {
     if (query.trim().isEmpty) return const [];
+    await _throttle();
     final response = await _dio.get<dynamic>(
       '/tags.json',
       queryParameters: {
@@ -136,6 +215,7 @@ class E621Provider
 
   @override
   Future<List<PostComment>> getComments(String postId) async {
+    await _throttle();
     final response = await _dio.get<dynamic>(
       '/comments.json',
       queryParameters: {

lib/backend/providers/kemono_provider.dart

@@ -1,658 +0,0 @@
-import 'package:dio/dio.dart';
-
-import '../../core/http/dio_client.dart';
-import '../models/artist_announcement.dart';
-import '../models/artist_link.dart';
-import '../models/artist_profile.dart';
-import '../models/artist_tag.dart';
-import '../models/artist_work_query.dart';
-import '../models/post.dart';
-import '../models/post_comment.dart';
-import '../models/provider_health.dart';
-import '../models/top_period_filter.dart';
-import '../services/cloud_link_extractor.dart';
-import 'content_provider.dart';
-
-class KemonoProvider
-    implements ContentProvider, ArtistProvider, CommentProvider {
-  KemonoProvider({
-    required this.id,
-    required this.name,
-    required this.baseUrl,
-    required DioClient dioClient,
-    Map<String, String> queryParameters = const {},
-  })  : _dio = dioClient.dio,
-        _creatorDio = Dio(
-          BaseOptions(
-            baseUrl: queryParameters['creator_api_base'] ??
-                'https://kemono-api.mbaharip.com',
-            connectTimeout: const Duration(seconds: 15),
-            receiveTimeout: const Duration(seconds: 20),
-            headers: const {
-              'Accept': 'application/json',
-              'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
-            },
-          ),
-        );
-
-  @override
-  final String id;
-
-  @override
-  final String name;
-
-  @override
-  final String baseUrl;
-
-  final Dio _dio;
-  final Dio _creatorDio;
-
-  bool get _isCoomer =>
-      id.toLowerCase().contains('coomer') ||
-      baseUrl.toLowerCase().contains('coomer');
-
-  @override
-  Future<List<Post>> searchPosts({
-    required List<String> tags,
-    required int page,
-    int limit = 50,
-    String? rating,
-    TopPeriodFilter topPeriod = TopPeriodFilter.none,
-  }) async {
-    return const [];
-  }
-
-  @override
-  Future<Post?> getPost(String id) async => null;
-
-  @override
-  Future<ProviderHealth> checkHealth() async {
-    final startedAt = DateTime.now();
-    try {
-      await _creatorDio.get<dynamic>(
-        _creatorPath(),
-        queryParameters: {'page': 1, 'itemsPerPage': 1},
-      );
-      return ProviderHealth(
-        providerId: id,
-        status: ProviderStatus.online,
-        pingMs: DateTime.now().difference(startedAt).inMilliseconds,
-        lastCheckedAt: DateTime.now(),
-        apiVersion: _isCoomer ? 'coomer-artists' : 'kemono-artists',
-      );
-    } catch (error) {
-      return ProviderHealth(
-        providerId: id,
-        status: ProviderStatus.offline,
-        pingMs: DateTime.now().difference(startedAt).inMilliseconds,
-        lastCheckedAt: DateTime.now(),
-        errorMessage: error.toString(),
-        apiVersion: _isCoomer ? 'coomer-artists' : 'kemono-artists',
-      );
-    }
-  }
-
-  @override
-  Future<List<ArtistProfile>> listArtists({
-    String? service,
-    List<String>? services,
-    String? query,
-    int page = 1,
-    int limit = 30,
-  }) async {
-    final effectiveService =
-        services != null && services.length == 1 ? services.first : service;
-    List<ArtistProfile> list;
-    try {
-      final response = await _creatorDio.get<dynamic>(
-        effectiveService == null || effectiveService.isEmpty
-            ? _creatorPath()
-            : '${_creatorPath()}/$effectiveService',
-        queryParameters: {
-          'page': page,
-          'itemsPerPage': limit.clamp(1, 100),
-          if (query != null && query.trim().isNotEmpty) 'keyword': query.trim(),
-        },
-      );
-      list = _rankArtists(_artistsFromResponse(response.data), query ?? '');
-    } catch (_) {
-      list = await _listArtistsFromPublicApi(
-        service: effectiveService,
-        query: query,
-        page: page,
-        limit: limit,
-      );
-    }
-    if (services != null && services.isNotEmpty) {
-      final sSet = services.map((s) => s.toLowerCase()).toSet();
-      list = list.where((a) => sSet.contains(a.service.toLowerCase())).toList();
-    }
-    return list;
-  }
-
-  @override
-  Future<List<ArtistProfile>> searchArtists(
-    String query, {
-    String? service,
-    List<String>? services,
-    int page = 1,
-    int limit = 30,
-  }) {
-    return listArtists(
-      service: service,
-      services: services,
-      query: query,
-      page: page,
-      limit: limit,
-    );
-  }
-
-  @override
-  Future<List<Post>> getArtistPosts({
-    required ArtistWorkQuery query,
-    int page = 0,
-    int limit = 50,
-  }) async {
-    Object? lastError;
-    final paths = [
-      '/api/v1/${query.service}/user/${query.artistId}/posts',
-      '/api/v1/${query.service}/user/${query.artistId}',
-    ];
-    for (final apiBase in _apiBaseCandidates()) {
-      for (final path in paths) {
-        try {
-          final response = await _getFromApiBase<dynamic>(
-            apiBase,
-            path,
-            queryParameters: {'o': page * limit},
-          );
-          final posts = _postItems(response.data);
-          final mapped = <Post>[];
-          for (final post in posts.whereType<Map>()) {
-            mapped.addAll(_postsFromArtistPost(
-              Map<String, dynamic>.from(post),
-              query: query,
-              mediaBaseUrl: apiBase,
-            ));
-          }
-          if (mapped.isNotEmpty || posts.isEmpty) {
-            mapped.sort((a, b) => b.createdAt.compareTo(a.createdAt));
-            return mapped.take(limit).toList(growable: false);
-          }
-        } catch (error) {
-          lastError = error;
-        }
-      }
-    }
-    throw StateError(
-      '$name artist works are unavailable right now. Try again later. '
-      '${_shortError(lastError)}',
-    );
-  }
-
-  @override
-  Future<List<PostComment>> getArtistPostComments(
-    String service,
-    String artistId,
-    String postId,
-  ) async {
-    Object? lastError;
-    final path = '/api/v1/$service/user/$artistId/post/$postId/comments';
-    for (final apiBase in _apiBaseCandidates()) {
-      try {
-        final response = await _getFromApiBase<dynamic>(apiBase, path);
-        return _commentsFromResponse(response.data, postId);
-      } catch (error) {
-        lastError = error;
-      }
-    }
-    throw StateError(
-      '$name comments are unavailable right now. ${_shortError(lastError)}',
-    );
-  }
-
-  @override
-  Future<List<PostComment>> getComments(String postId) async {
-    final parts = postId.split(':');
-    if (parts.length < 4) return const [];
-    return getArtistPostComments(parts[0], parts[1], parts[2]);
-  }
-
-  @override
-  Future<List<ArtistTag>> getArtistTags(
-          String service, String artistId) async =>
-      const [];
-
-  @override
-  Future<List<ArtistLink>> getArtistLinks(
-          String service, String artistId) async =>
-      const [];
-
-  @override
-  Future<List<ArtistAnnouncement>> getArtistAnnouncements(
-      String service, String artistId) async {
-    final path = '/api/v1/$service/user/$artistId/announcements';
-    for (final apiBase in _apiBaseCandidates()) {
-      try {
-        final response = await _getFromApiBase<dynamic>(apiBase, path);
-        final items = response.data;
-        if (items is List) {
-          return items
-              .whereType<Map>()
-              .map((item) =>
-                  ArtistAnnouncement.fromJson(Map<String, dynamic>.from(item)))
-              .toList(growable: false);
-        }
-      } catch (_) {}
-    }
-    return const [];
-  }
-
-  String _creatorPath() => _isCoomer ? '/coomer' : '/kemono';
-
-  List<ArtistProfile> _artistsFromResponse(dynamic data) {
-    final items = data is Map ? data['data'] : data;
-    if (items is! List) return const [];
-    return items
-        .whereType<Map>()
-        .map((item) {
-          final json = Map<String, dynamic>.from(item);
-          final service = (json['service'] ?? '').toString();
-          final artistId =
-              (json['id'] ?? json['creator_id'] ?? json['user_id'] ?? '')
-                  .toString();
-          final name = (json['name'] ??
-                  json['display_name'] ??
-                  json['username'] ??
-                  artistId)
-              .toString();
-          final rawAvatar = (json['avatar'] ??
-                  json['icon'] ??
-                  json['image'] ??
-                  json['avatar_url'] ??
-                  '')
-              .toString();
-          return ArtistProfile(
-            id: artistId,
-            providerId: id,
-            service: service,
-            name: name,
-            displayName: name,
-            avatarUrl: _absoluteUrl(rawAvatar) ?? _iconUrl(service, artistId),
-            updatedAt: _dateFromAny(json['updated']),
-            postCount: (json['post_count'] as num?)?.toInt(),
-            url: '$baseUrl/$service/user/$artistId',
-          );
-        })
-        .where((artist) => artist.id.isNotEmpty)
-        .toList(growable: false);
-  }
-
-  Future<List<ArtistProfile>> _listArtistsFromPublicApi({
-    String? service,
-    String? query,
-    required int page,
-    required int limit,
-  }) async {
-    Object? lastError;
-    dynamic data;
-    for (final apiBase in _apiBaseCandidates()) {
-      try {
-        final response =
-            await _getFromApiBase<dynamic>(apiBase, '/api/v1/creators.txt');
-        data = response.data;
-        break;
-      } catch (error) {
-        lastError = error;
-      }
-    }
-    if (data == null) {
-      throw StateError(
-        '$name artist index is unavailable right now. ${_shortError(lastError)}',
-      );
-    }
-    final queryText = (query ?? '').trim().toLowerCase();
-    final offset = (page - 1).clamp(0, 999999) * limit;
-    final items = _artistsFromResponse({'data': data})
-        .where((artist) =>
-            (service == null || service.isEmpty || artist.service == service) &&
-            (queryText.isEmpty ||
-                artist.displayName.toLowerCase().contains(queryText) ||
-                artist.id.toLowerCase().contains(queryText)))
-        .toList(growable: false);
-    final ranked = _rankArtists(items, queryText);
-    return ranked.skip(offset).take(limit).toList(growable: false);
-  }
-
-  List<ArtistProfile> _rankArtists(List<ArtistProfile> artists, String query) {
-    final queryText = query.trim().toLowerCase();
-    final ranked = [...artists];
-    ranked.sort((a, b) {
-      final scoreA = _artistSearchScore(a, queryText);
-      final scoreB = _artistSearchScore(b, queryText);
-      if (scoreA != scoreB) return scoreB.compareTo(scoreA);
-      final updatedA = a.updatedAt ?? DateTime.fromMillisecondsSinceEpoch(0);
-      final updatedB = b.updatedAt ?? DateTime.fromMillisecondsSinceEpoch(0);
-      final updated = updatedB.compareTo(updatedA);
-      if (updated != 0) return updated;
-      final count = (b.postCount ?? 0).compareTo(a.postCount ?? 0);
-      if (count != 0) return count;
-      return a.displayName.compareTo(b.displayName);
-    });
-    return ranked;
-  }
-
-  int _artistSearchScore(ArtistProfile artist, String query) {
-    if (query.isEmpty) return 0;
-    final name = artist.displayName.toLowerCase();
-    final id = artist.id.toLowerCase();
-    if (name == query || id == query) return 100;
-    if (name.startsWith(query) || id.startsWith(query)) return 70;
-    if (name.contains(query) || id.contains(query)) return 40;
-    return 0;
-  }
-
-  List<dynamic> _postItems(dynamic data) {
-    if (data is List) return data;
-    if (data is Map) {
-      final results = data['results'];
-      if (results is List) return results;
-      final posts = data['posts'];
-      if (posts is List) return posts;
-      if (posts is Map) return _postItems(posts);
-      final dataItems = data['data'];
-      if (dataItems is List) return dataItems;
-    }
-    return const [];
-  }
-
-  List<Post> _postsFromArtistPost(
-    Map<String, dynamic> json, {
-    required ArtistWorkQuery query,
-    required String mediaBaseUrl,
-  }) {
-    final postId = (json['id'] ?? json['post_id'] ?? '').toString();
-    final title = (json['title'] ?? '').toString();
-    final published = _dateFromAny(json['published']) ??
-        _dateFromAny(json['added']) ??
-        _dateFromAny(json['edited']) ??
-        DateTime.fromMillisecondsSinceEpoch(0);
-    final postSource =
-        '$baseUrl/${query.service}/user/${query.artistId}/post/$postId';
-    final rawContent = (json['content'] ?? '').toString();
-    final embed = json['embed'] is Map ? Map<String, dynamic>.from(json['embed']) : null;
-    final cloudLinks = CloudLinkExtractor.extractLinks(
-      content: rawContent,
-      source: postSource,
-      embed: embed,
-    );
-    final cloudLinksJson = cloudLinks.map((e) => e.encode()).toList(growable: false);
-    final cleanDesc = CloudLinkExtractor.cleanCommentary(rawContent);
-
-    final files = <Map<String, dynamic>>[];
-    final file = json['file'];
-    if (file is Map && file.isNotEmpty) {
-      files.add(Map<String, dynamic>.from(file));
-    }
-    final attachments = json['attachments'];
-    if (attachments is List) {
-      files.addAll(attachments.whereType<Map>().map(Map<String, dynamic>.from));
-    }
-
-    // Support link-only posts where author uploaded files to cloud drives (MEGA, GDrive, etc.)
-    // or text-only posts where author wrote an announcement, status or note
-    if (files.isEmpty &&
-        (cloudLinks.isNotEmpty ||
-            cleanDesc.isNotEmpty ||
-            rawContent.trim().isNotEmpty ||
-            title.trim().isNotEmpty)) {
-      final stableId = '${query.service}:${query.artistId}:$postId:0';
-      final firstStreamable =
-          cloudLinks.where((l) => l.isStreamable).firstOrNull;
-      final firstLink = cloudLinks.isNotEmpty ? cloudLinks.first : null;
-      final fileUrl = firstStreamable?.directStreamUrl ?? firstLink?.url ?? '';
-      final isTextOnly = cloudLinks.isEmpty;
-      final tags = [
-        query.service,
-        query.artistName,
-        if (title.trim().isNotEmpty) title.trim(),
-        if (!isTextOnly) 'cloud_mirror' else 'text_post',
-      ];
-      return [
-        Post(
-          id: stableId,
-          providerId: id,
-          providerName: name,
-          previewUrl: '',
-          sampleUrl: '',
-          fileUrl: fileUrl,
-          tags: tags,
-          rating: 'unknown',
-          width: 0,
-          height: 0,
-          source: postSource,
-          createdAt: published,
-          fileType: firstStreamable != null
-              ? 'video'
-              : (isTextOnly ? 'text' : 'link'),
-          score: 0,
-          tagGroups: {
-            'artist': [query.artistName],
-            'meta': [query.service],
-            if (title.trim().isNotEmpty) 'copyright': [title.trim()],
-            if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
-            if (cleanDesc.isNotEmpty)
-              'description': [cleanDesc]
-            else if (rawContent.trim().isNotEmpty)
-              'description': [rawContent.trim()],
-          },
-        ),
-      ];
-    }
-
-    var index = 0;
-    return files
-        .map((file) {
-          final url = _mediaUrl(file, mediaBaseUrl: mediaBaseUrl);
-          final fileName =
-              (file['name'] ?? Uri.tryParse(url)?.pathSegments.last ?? '')
-                  .toString();
-          final type = _fileType('$fileName $url');
-          final stableId =
-              '${query.service}:${query.artistId}:$postId:${index++}';
-          final tags = [
-            query.service,
-            query.artistName,
-            if (title.trim().isNotEmpty) title.trim(),
-          ];
-          return Post(
-            id: stableId,
-            providerId: id,
-            providerName: name,
-            previewUrl: url,
-            sampleUrl: url,
-            fileUrl: url,
-            tags: tags,
-            rating: 'unknown',
-            width: 0,
-            height: 0,
-            source: postSource,
-            createdAt: published,
-            fileType: type,
-            score: 0,
-            tagGroups: {
-              'artist': [query.artistName],
-              'meta': [query.service],
-              if (title.trim().isNotEmpty) 'copyright': [title.trim()],
-              if (cloudLinksJson.isNotEmpty) 'cloud_links': cloudLinksJson,
-              if (cleanDesc.isNotEmpty) 'description': [cleanDesc],
-            },
-          );
-        })
-        .where((post) => post.fileUrl.isNotEmpty)
-        .toList(growable: false);
-  }
-
-  List<PostComment> _commentsFromResponse(dynamic data, String postId) {
-    final items = data is Map ? (data['comments'] ?? data['data']) : data;
-    if (items is! List) return const [];
-    return items
-        .whereType<Map>()
-        .map((item) {
-          final json = Map<String, dynamic>.from(item);
-          return PostComment(
-            id: (json['id'] ?? json['comment_id'] ?? '').toString(),
-            postId: postId,
-            providerId: id,
-            authorName: (json['author'] ??
-                    json['username'] ??
-                    json['user'] ??
-                    json['creator_name'] ??
-                    'user')
-                .toString(),
-            body: (json['content'] ?? json['body'] ?? json['comment'] ?? '')
-                .toString(),
-            createdAt: _dateFromAny(json['added']) ??
-                _dateFromAny(json['created_at']) ??
-                DateTime.fromMillisecondsSinceEpoch(0),
-          );
-        })
-        .where((comment) => comment.body.trim().isNotEmpty)
-        .toList(growable: false);
-  }
-
-  String _mediaUrl(
-    Map<String, dynamic> file, {
-    required String mediaBaseUrl,
-  }) {
-    final path = (file['path'] ?? file['url'] ?? '').toString();
-    if (path.isEmpty) return '';
-    final uri = Uri.tryParse(path);
-    if (uri != null && uri.hasScheme) return path;
-    if (path.startsWith('/data/')) {
-      return '$mediaBaseUrl$path';
-    }
-    if (path.startsWith('/')) {
-      return '$mediaBaseUrl/data$path';
-    }
-    return '$mediaBaseUrl/data/$path';
-  }
-
-  String? _iconUrl(String service, String artistId) {
-    if (service.isEmpty || artistId.isEmpty) return null;
-    final host = _isCoomer ? 'https://img.coomer.su' : 'https://img.kemono.su';
-    return '$host/icons/$service/$artistId';
-  }
-
-  String? _absoluteUrl(String value) {
-    final trimmed = value.trim();
-    if (trimmed.isEmpty) return null;
-    final uri = Uri.tryParse(trimmed);
-    if (uri != null && uri.hasScheme) return trimmed;
-    if (trimmed.startsWith('/')) return '$baseUrl$trimmed';
-    return '$baseUrl/$trimmed';
-  }
-
-  List<String> _apiBaseCandidates() {
-    final candidates = <String>[
-      baseUrl,
-      if (_isCoomer) ...[
-        'https://coomer.st',
-        'https://coomer.su',
-      ] else ...[
-        'https://kemono.cr',
-        'https://kemono.su',
-      ],
-    ];
-    return candidates.map(_trimTrailingSlash).toSet().toList(growable: false);
-  }
-
-  Future<Response<T>> _getFromApiBase<T>(
-    String apiBase,
-    String path, {
-    Map<String, Object?> queryParameters = const {},
-  }) {
-    if (_trimTrailingSlash(apiBase) == _trimTrailingSlash(baseUrl)) {
-      return _dio.get<T>(path, queryParameters: queryParameters);
-    }
-    final dio = Dio(
-      BaseOptions(
-        baseUrl: apiBase,
-        connectTimeout: const Duration(seconds: 15),
-        receiveTimeout: const Duration(seconds: 25),
-        headers: const {
-          'Accept': 'application/json',
-          'User-Agent': 'Prisma/2.0.1 Flutter local booru browser',
-        },
-      ),
-    );
-    return dio.get<T>(path, queryParameters: queryParameters);
-  }
-
-  String _trimTrailingSlash(String value) =>
-      value.endsWith('/') ? value.substring(0, value.length - 1) : value;
-
-  String _shortError(Object? error) {
-    if (error == null) return '';
-    final message = error.toString();
-    if (message.length <= 160) return message;
-    return '${message.substring(0, 160)}...';
-  }
-
-  String _fileType(String value) {
-    final lower = value.toLowerCase().split('?').first.trim();
-    if (lower.endsWith('.webm') ||
-        lower.endsWith('.mp4') ||
-        lower.endsWith('.mov') ||
-        lower.endsWith('.mkv') ||
-        lower.endsWith('.avi') ||
-        lower.endsWith('.flv') ||
-        lower.endsWith('.wmv') ||
-        lower.endsWith('.m4v') ||
-        lower.endsWith('.ts')) {
-      return 'video';
-    }
-    if (lower.endsWith('.mp3') ||
-        lower.endsWith('.m4a') ||
-        lower.endsWith('.wav') ||
-        lower.endsWith('.ogg') ||
-        lower.endsWith('.flac') ||
-        lower.endsWith('.aac') ||
-        lower.endsWith('.opus') ||
-        lower.endsWith('.wma')) {
-      return 'audio';
-    }
-    if (lower.endsWith('.gif')) return 'gif';
-    if (lower.endsWith('.swf')) return 'swf';
-    if (lower.endsWith('.zip') ||
-        lower.endsWith('.rar') ||
-        lower.endsWith('.7z') ||
-        lower.endsWith('.tar') ||
-        lower.endsWith('.gz') ||
-        lower.endsWith('.pdf') ||
-        lower.endsWith('.txt')) {
-      return 'archive';
-    }
-    if (lower.endsWith('.png') ||
-        lower.endsWith('.jpg') ||
-        lower.endsWith('.jpeg') ||
-        lower.endsWith('.webp') ||
-        lower.endsWith('.avif') ||
-        lower.endsWith('.bmp') ||
-        lower.endsWith('.heic') ||
-        lower.endsWith('.tiff')) {
-      return 'photo';
-    }
-    return 'unknown';
-  }
-
-  DateTime? _dateFromAny(dynamic value) {
-    if (value == null) return null;
-    if (value is num) {
-      final raw = value.toInt();
-      if (raw > 9999999999) return DateTime.fromMillisecondsSinceEpoch(raw);
-      return DateTime.fromMillisecondsSinceEpoch(raw * 1000);
-    }
-    return DateTime.tryParse(value.toString());
-  }
-}

lib/backend/providers/pawchive_provider.dart

@@ -481,7 +481,7 @@ class PawchiveProvider
     for (final f in files) {
       final p = (f['path'] ?? '').toString();
       final n = (f['name'] ?? '').toString();
-      if (_isPhotoType('$n $p') && p.isNotEmpty) {
+      if (_isPhotoType(p, n) && p.isNotEmpty) {
         postCoverUrl = _thumbnailUrl(p);
         break;
       }
@@ -494,8 +494,8 @@ class PawchiveProvider
           final fileName = (fileMap['name'] ?? '').toString();
           final previewOnly = fileMap['preview_only'] == true;
 
-          final type = _fileType('$fileName $rawPath');
+          final type = _fileTypeFor(rawPath, fileName);
-          final isPhoto = _isPhotoType('$fileName $rawPath');
+          final isPhoto = type == 'photo' || type == 'gif';
 
           // img.pawchive.pw/thumbnail only generates thumbnails for images/gifs.
           // Non-image files (audio, video, archive) return 404 from thumbnail server.
@@ -626,55 +626,81 @@ class PawchiveProvider
     return '${message.substring(0, 160)}...';
   }
 
+  String _extractExtension(String value) {
+    if (value.isEmpty) return '';
+    final clean = value.split('?').first.split('#').first.trim();
+    final dot = clean.lastIndexOf('.');
+    if (dot != -1 && dot < clean.length - 1) {
+      final ext = clean.substring(dot).toLowerCase();
+      if (ext.length <= 6) return ext;
+    }
+    return '';
+  }
+
   String _fileType(String value) {
-    final lower = value.toLowerCase().split('?').first.trim();
+    final ext = _extractExtension(value);
-    if (lower.endsWith('.webm') ||
+    if (const {
-        lower.endsWith('.mp4') ||
+      '.webm',
-        lower.endsWith('.mov') ||
+      '.mp4',
-        lower.endsWith('.mkv') ||
+      '.mov',
-        lower.endsWith('.avi') ||
+      '.mkv',
-        lower.endsWith('.flv') ||
+      '.avi',
-        lower.endsWith('.wmv') ||
+      '.flv',
-        lower.endsWith('.m4v') ||
+      '.wmv',
-        lower.endsWith('.ts')) {
+      '.m4v',
+      '.ts',
+    }.contains(ext)) {
       return 'video';
     }
-    if (lower.endsWith('.mp3') ||
+    if (const {
-        lower.endsWith('.m4a') ||
+      '.mp3',
-        lower.endsWith('.wav') ||
+      '.m4a',
-        lower.endsWith('.ogg') ||
+      '.wav',
-        lower.endsWith('.flac') ||
+      '.ogg',
-        lower.endsWith('.aac') ||
+      '.flac',
-        lower.endsWith('.opus') ||
+      '.aac',
-        lower.endsWith('.wma')) {
+      '.opus',
+      '.wma',
+    }.contains(ext)) {
       return 'audio';
     }
-    if (lower.endsWith('.gif')) return 'gif';
+    if (ext == '.gif') return 'gif';
-    if (lower.endsWith('.swf')) return 'swf';
+    if (ext == '.swf') return 'swf';
-    if (lower.endsWith('.zip') ||
+    if (const {
-        lower.endsWith('.rar') ||
+      '.zip',
-        lower.endsWith('.7z') ||
+      '.rar',
-        lower.endsWith('.tar') ||
+      '.7z',
-        lower.endsWith('.gz') ||
+      '.tar',
-        lower.endsWith('.pdf') ||
+      '.gz',
-        lower.endsWith('.txt')) {
+      '.pdf',
+      '.txt',
+    }.contains(ext)) {
       return 'archive';
     }
-    if (lower.endsWith('.png') ||
+    if (const {
-        lower.endsWith('.jpg') ||
+      '.png',
-        lower.endsWith('.jpeg') ||
+      '.jpg',
-        lower.endsWith('.webp') ||
+      '.jpeg',
-        lower.endsWith('.avif') ||
+      '.webp',
-        lower.endsWith('.bmp') ||
+      '.avif',
-        lower.endsWith('.heic') ||
+      '.bmp',
-        lower.endsWith('.tiff')) {
+      '.heic',
+      '.tiff',
+    }.contains(ext)) {
       return 'photo';
     }
     return 'unknown';
   }
 
-  bool _isPhotoType(String value) {
+  String _fileTypeFor(String path, String fileName) {
-    final type = _fileType(value);
+    final extName = _extractExtension(fileName);
+    final extPath = _extractExtension(path);
+    final ext = extName.isNotEmpty ? extName : extPath;
+    return _fileType(ext);
+  }
+
+  bool _isPhotoType(String path, [String fileName = '']) {
+    final type = _fileTypeFor(path, fileName);
     return type == 'photo' || type == 'gif';
   }
 

lib/backend/providers/provider_factory.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import '../../core/http/dio_client.dart';
 import '../models/content_provider_config.dart';
 import 'content_provider.dart';
@@ -5,7 +7,6 @@ import 'custom_provider.dart';
 import 'danbooru_provider.dart';
 import 'e621_provider.dart';
 import 'gelbooru_provider.dart';
-import 'kemono_provider.dart';
 import 'moebooru_provider.dart';
 import 'pawchive_provider.dart';
 import 'realbooru_html_provider.dart';
@@ -21,6 +22,17 @@ class ProviderFactory {
         if (entry.key.startsWith('query.') && entry.value.trim().isNotEmpty)
           entry.key.substring('query.'.length): entry.value.trim(),
     };
+
+    if (config.apiType.toLowerCase() == 'e621') {
+      final login = queryParameters['login'] ?? headers['login'];
+      final apiKey = queryParameters['api_key'] ?? headers['api_key'];
+      if (login != null && apiKey != null && login.isNotEmpty && apiKey.isNotEmpty) {
+        final basicAuth = base64Encode(utf8.encode('$login:$apiKey'));
+        headers['Authorization'] = 'Basic $basicAuth';
+        headers['User-Agent'] = 'Prisma/3.6.6 (by $login on e621)';
+      }
+    }
+
     final client = DioClient(
       baseUrl: config.baseUrl,
       timeout: Duration(seconds: config.timeoutSeconds),
@@ -82,15 +94,6 @@ class ProviderFactory {
           dioClient: client,
           queryParameters: queryParameters,
         );
-      case 'kemono':
-      case 'coomer':
-        return KemonoProvider(
-          id: config.id,
-          name: config.name,
-          baseUrl: config.baseUrl,
-          dioClient: client,
-          queryParameters: queryParameters,
-        );
       case 'pawchive':
         return PawchiveProvider(
           id: config.id,

lib/backend/providers/provider_manager.dart

@@ -144,6 +144,14 @@ class ProviderManager {
     });
   }
 
+  Future<ContentProvider?> getProviderInstance(String id) async {
+    final result = await _repository.getProvider(id);
+    if (result is Success<ContentProviderConfig?> && result.data != null) {
+      return _factory.create(result.data!);
+    }
+    return null;
+  }
+
   Future<Result<List<ProviderHealth>>> checkAll({int concurrency = 3}) async {
     final providersResult = await activeProviders();
     if (providersResult is Error<List<ContentProvider>>) {
@@ -730,18 +738,23 @@ class ProviderManager {
 
   static bool _isArtistConfig(ContentProviderConfig config) {
     final type = config.apiType.toLowerCase();
-    return type == 'kemono' || type == 'coomer' || type == 'pawchive';
+    return type == 'pawchive';
   }
 
   static bool _isFeedConfig(ContentProviderConfig config) {
     final type = config.apiType.toLowerCase();
-    return type != 'kemono' && type != 'coomer';
+    return type != 'pawchive';
   }
 
   static bool _isLegacyRemovedConfig(ContentProviderConfig config) {
     final id = config.id.toLowerCase();
     final type = config.apiType.toLowerCase();
-    return id == 'cosbooru' || type == 'realbooru';
+    return id == 'cosbooru' ||
+        type == 'realbooru' ||
+        type == 'kemono' ||
+        type == 'coomer' ||
+        id == 'kemono' ||
+        id == 'coomer';
   }
 }
 

lib/backend/services/settings_service.dart

@@ -64,8 +64,10 @@ class AppSettings {
     this.downloadPathTemplate = '{Artist}/{ID}',
     this.searchHistoryLimit = 500,
     this.tagCacheLimit = 5000,
+    this.lastActiveLocation = '/',
   });
 
+  final String lastActiveLocation;
   final List<String> favoriteArtists;
   final List<String> pawchiveAccounts;
   final bool pawchiveBidirectionalSync;
@@ -165,6 +167,7 @@ class AppSettings {
     lastFeedRating: null,
     searchHistoryLimit: 500,
     tagCacheLimit: 5000,
+    lastActiveLocation: '/',
   );
 
   AppSettings copyWith({
@@ -220,8 +223,10 @@ class AppSettings {
     String? downloadPathTemplate,
     int? searchHistoryLimit,
     int? tagCacheLimit,
+    String? lastActiveLocation,
   }) {
     return AppSettings(
+      lastActiveLocation: lastActiveLocation ?? this.lastActiveLocation,
       favoriteArtists: favoriteArtists ?? this.favoriteArtists,
       pawchiveAccounts: pawchiveAccounts ?? this.pawchiveAccounts,
       pawchiveBidirectionalSync:
@@ -336,6 +341,7 @@ class AppSettings {
         'downloadPathTemplate': downloadPathTemplate,
         'searchHistoryLimit': searchHistoryLimit,
         'tagCacheLimit': tagCacheLimit,
+        'lastActiveLocation': lastActiveLocation,
       };
 
   factory AppSettings.fromJson(Map<String, dynamic> json) => AppSettings(
@@ -455,6 +461,8 @@ class AppSettings {
             defaults.searchHistoryLimit,
         tagCacheLimit: (json['tagCacheLimit'] as num?)?.toInt() ??
             defaults.tagCacheLimit,
+        lastActiveLocation: (json['lastActiveLocation'] as String?) ??
+            defaults.lastActiveLocation,
       );
 
   List<PawchiveAccount> get parsedPawchiveAccounts {
@@ -545,6 +553,14 @@ class SettingsService {
     return updateSettings(settings.copyWith(nsfwEnabled: enabled));
   }
 
+  Future<Result<void>> saveLastActiveLocation(String location) async {
+    final result = await getSettings();
+    if (result is Error<AppSettings>) return Error(result.failure);
+    final settings = (result as Success<AppSettings>).data;
+    if (settings.lastActiveLocation == location) return const Success(null);
+    return updateSettings(settings.copyWith(lastActiveLocation: location));
+  }
+
   Future<Result<void>> saveCacheSettings({
     required int ttlHours,
     required int maxItems,

lib/backend/utils/media_quality.dart

@@ -100,61 +100,115 @@ class MediaUrlSelector {
         .toList(growable: false);
   }
 
+  static const _videoExtensions = {
+    '.mp4',
+    '.webm',
+    '.mov',
+    '.mkv',
+    '.avi',
+    '.flv',
+    '.wmv',
+    '.m4v',
+    '.ts',
+  };
+
+  static const _audioExtensions = {
+    '.mp3',
+    '.m4a',
+    '.wav',
+    '.ogg',
+    '.flac',
+    '.aac',
+    '.opus',
+    '.wma',
+  };
+
+  static String _extractExtension(String url) {
+    if (url.isEmpty) return '';
+    try {
+      final uri = Uri.parse(url);
+      final filenameParam =
+          uri.queryParameters['f'] ?? uri.queryParameters['filename'];
+      if (filenameParam != null && filenameParam.isNotEmpty) {
+        final cleanParam = filenameParam.split('?').first.split('#').first;
+        final dot = cleanParam.lastIndexOf('.');
+        if (dot != -1 && dot < cleanParam.length - 1) {
+          final ext = cleanParam.substring(dot).toLowerCase();
+          if (ext.length <= 6) return ext;
+        }
+      }
+      final path = uri.path;
+      final dot = path.lastIndexOf('.');
+      if (dot != -1 && dot < path.length - 1) {
+        final ext = path.substring(dot).toLowerCase();
+        if (ext.length <= 6) return ext;
+      }
+    } catch (_) {
+      // Uri parsing failed, fallback below
+    }
+
+    final clean = url.split('?').first.split('#').first;
+    final dot = clean.lastIndexOf('.');
+    if (dot != -1 && dot < clean.length - 1) {
+      final ext = clean.substring(dot).toLowerCase();
+      if (ext.length <= 6) return ext;
+    }
+    return '';
+  }
+
   static bool _isAudio(Post post) {
-    final value = '${post.fileType} ${post.fileUrl}'.toLowerCase();
+    final type = post.fileType.toLowerCase().trim();
-    return value.contains('audio') ||
+    if (type == 'audio') return true;
-        value.contains('.mp3') ||
+    if (type == 'video' || type == 'photo' || type == 'archive' || type == 'gif') {
-        value.contains('.m4a') ||
+      return false;
-        value.contains('.wav') ||
+    }
-        value.contains('.ogg') ||
+
-        value.contains('.flac') ||
+    final fileExt = _extractExtension(post.fileUrl);
-        value.contains('.aac') ||
+    if (_audioExtensions.contains(fileExt)) return true;
-        value.contains('.opus') ||
+    if (_videoExtensions.contains(fileExt)) return false;
-        value.contains('.wma');
+
+    final sampleExt = _extractExtension(post.sampleUrl);
+    if (_audioExtensions.contains(sampleExt)) return true;
+    if (_videoExtensions.contains(sampleExt)) return false;
+
+    return false;
   }
 
   static bool _isVideo(Post post) {
-    if (_isAudio(post)) return false;
+    final type = post.fileType.toLowerCase().trim();
-    final value = '${post.fileType} ${post.fileUrl}'.toLowerCase();
+    if (type == 'video') return true;
-    return value.contains('video') ||
+    if (type == 'audio' || type == 'photo' || type == 'archive' || type == 'gif') {
-        value.contains('.webm') ||
+      return false;
-        value.contains('.mp4') ||
+    }
-        value.contains('.mov') ||
+
-        value.contains('.mkv') ||
+    final fileExt = _extractExtension(post.fileUrl);
-        value.contains('.avi') ||
+    if (_videoExtensions.contains(fileExt)) return true;
-        value.contains('.flv') ||
+    if (_audioExtensions.contains(fileExt)) return false;
-        value.contains('.wmv') ||
+
-        value.contains('.m4v') ||
+    final sampleExt = _extractExtension(post.sampleUrl);
-        value.contains('.ts');
+    if (_videoExtensions.contains(sampleExt)) return true;
+    if (_audioExtensions.contains(sampleExt)) return false;
+
+    return false;
   }
 
   static bool _isGif(Post post) {
-    final value = '${post.fileType} ${post.fileUrl}'.toLowerCase();
+    final type = post.fileType.toLowerCase().trim();
-    return value.contains('gif') || value.contains('.gif');
+    if (type == 'gif') return true;
+    final fileExt = _extractExtension(post.fileUrl);
+    if (fileExt == '.gif') return true;
+    final sampleExt = _extractExtension(post.sampleUrl);
+    return sampleExt == '.gif';
   }
 
   static bool _looksLikeVideoUrl(String url) {
-    final value = url.toLowerCase();
+    final ext = _extractExtension(url);
-    return value.contains('.webm') ||
+    return _videoExtensions.contains(ext);
-        value.contains('.mp4') ||
-        value.contains('.mov') ||
-        value.contains('.mkv') ||
-        value.contains('.avi') ||
-        value.contains('.flv') ||
-        value.contains('.wmv') ||
-        value.contains('.m4v') ||
-        value.contains('.ts');
   }
 
   static bool _looksLikeAudioUrl(String url) {
-    final value = url.toLowerCase();
+    final ext = _extractExtension(url);
-    return value.contains('.mp3') ||
+    return _audioExtensions.contains(ext);
-        value.contains('.m4a') ||
-        value.contains('.wav') ||
-        value.contains('.ogg') ||
-        value.contains('.flac') ||
-        value.contains('.aac') ||
-        value.contains('.opus') ||
-        value.contains('.wma');
   }
 }
+

lib/features/artists/presentation/artist_posts_screen.dart

@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -791,12 +791,10 @@ class _ArtistPostsScreenState extends ConsumerState<ArtistPostsScreen> {
                                       settings.mediaQualityMode),
                                   favoriteKeys: favoriteKeys,
                                   viewedKeys: viewedKeys,
-                                  onOpen: (post) => context.push(
+                                  onOpen: (post) => AppNavigator.openPost(
-                                    '/post/${post.providerId}/${post.id}',
+                                    context,
-                                    extra: PostNavigationContext(
+                                    post: post,
-                                      currentPost: post,
+                                    postsList: displayedPosts,
-                                      posts: displayedPosts,
-                                    ),
                                   ),
                                   onFavorite: (post) async {
                                     if (favoriteKeys.contains(post.cacheKey)) {

lib/features/artists/presentation/artists_screen.dart

@@ -2,11 +2,13 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:ui';
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -1327,7 +1329,7 @@ class _FavoriteArtistsModalState extends State<_FavoriteArtistsModal> {
   }
 }
 
-class _FavoriteArtistsSection extends ConsumerWidget {
+class _FavoriteArtistsSection extends StatefulWidget {
   const _FavoriteArtistsSection({
     required this.favorites,
     required this.selectedKey,
@@ -1343,8 +1345,23 @@ class _FavoriteArtistsSection extends ConsumerWidget {
   final ValueChanged<FavoriteArtistItem> onRemoveFavorite;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  State<_FavoriteArtistsSection> createState() =>
-    if (favorites.isEmpty) {
+      _FavoriteArtistsSectionState();
+}
+
+class _FavoriteArtistsSectionState extends State<_FavoriteArtistsSection> {
+  final ScrollController _scrollController = ScrollController();
+  bool _isHovered = false;
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.favorites.isEmpty) {
       return Padding(
         padding: const EdgeInsets.fromLTRB(16, 4, 16, 8),
         child: _ArtistsLiquidCard(
@@ -1367,9 +1384,9 @@ class _FavoriteArtistsSection extends ConsumerWidget {
       );
     }
 
-    final selected = favorites.firstWhere(
+    final selected = widget.favorites.firstWhere(
-      (f) => f.key == selectedKey,
+      (f) => f.key == widget.selectedKey,
-      orElse: () => favorites.first,
+      orElse: () => widget.favorites.first,
     );
 
     return Padding(
@@ -1384,14 +1401,14 @@ class _FavoriteArtistsSection extends ConsumerWidget {
                 const Icon(Icons.star_rounded, color: Colors.amber, size: 20),
                 const SizedBox(width: 6),
                 Text(
-                  'Любимые авторы (${favorites.length})',
+                  'Любимые авторы (${widget.favorites.length})',
                   style: Theme.of(context).textTheme.titleSmall?.copyWith(
                         fontWeight: FontWeight.bold,
                       ),
                 ),
                 const Spacer(),
                 TextButton(
-                  onPressed: () => onOpenArtist(selected),
+                  onPressed: () => widget.onOpenArtist(selected),
                   style: TextButton.styleFrom(
                     visualDensity: VisualDensity.compact,
                     padding: const EdgeInsets.symmetric(horizontal: 8),
@@ -1408,111 +1425,136 @@ class _FavoriteArtistsSection extends ConsumerWidget {
               ],
             ),
             const SizedBox(height: 8),
-            SizedBox(
+            MouseRegion(
-              height: 88,
+              onEnter: (_) => _isHovered = true,
-              child: ListView.separated(
+              onExit: (_) => _isHovered = false,
-                padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
+              child: Listener(
-                scrollDirection: Axis.horizontal,
+                onPointerSignal: (event) {
-                itemCount: favorites.length,
+                  if (!_isHovered ||
-                separatorBuilder: (_, __) => const SizedBox(width: 10),
+                      event is! PointerScrollEvent ||
-                itemBuilder: (context, index) {
+                      !_scrollController.hasClients) {
-                  final fav = favorites[index];
+                    return;
-                  final isSelected = fav.key == selected.key;
+                  }
-                  final sColor = _serviceColor(fav.service);
+                  final delta = event.scrollDelta.dy != 0
-
+                      ? event.scrollDelta.dy
-                  return InkWell(
+                      : event.scrollDelta.dx;
-                    borderRadius: BorderRadius.circular(16),
+                  if (delta == 0) return;
-                    onTap: () => onSelect(fav),
+                  final target = (_scrollController.offset + delta * 1.5).clamp(
-                    child: AnimatedContainer(
+                    0.0,
-                      duration: const Duration(milliseconds: 200),
+                    _scrollController.position.maxScrollExtent,
-                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
-                      decoration: BoxDecoration(
-                        color: isSelected
-                            ? Theme.of(context)
-                                .colorScheme
-                                .primaryContainer
-                                .withValues(alpha: 0.45)
-                            : Colors.transparent,
-                        borderRadius: BorderRadius.circular(16),
-                        border: Border.all(
-                          color: isSelected
-                              ? Theme.of(context).colorScheme.primary
-                              : Colors.transparent,
-                          width: 1.5,
-                        ),
-                        boxShadow: isSelected
-                            ? [
-                                BoxShadow(
-                                  color: Theme.of(context)
-                                      .colorScheme
-                                      .primary
-                                      .withValues(alpha: 0.25),
-                                  blurRadius: 8,
-                                ),
-                              ]
-                            : null,
-                      ),
-                      child: Column(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Container(
-                            width: 44,
-                            height: 44,
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.circular(14),
-                              border: Border.all(
-                                color: isSelected
-                                    ? Theme.of(context).colorScheme.primary
-                                    : sColor.withValues(alpha: 0.4),
-                                width: 1.2,
-                              ),
-                            ),
-                            child: ClipRRect(
-                              borderRadius: BorderRadius.circular(13),
-                              child: fav.avatarUrl != null &&
-                                      fav.avatarUrl!.isNotEmpty
-                                  ? CachedNetworkImage(
-                                      imageUrl: fav.avatarUrl!,
-                                      fit: BoxFit.cover,
-                                      placeholder: (_, __) => const Icon(
-                                          Icons.person_rounded,
-                                          size: 20),
-                                      errorWidget: (_, __, ___) => const Icon(
-                                          Icons.person_rounded,
-                                          size: 20),
-                                    )
-                                  : Center(
-                                      child: Text(
-                                        fav.name.isNotEmpty
-                                            ? fav.name[0].toUpperCase()
-                                            : '?',
-                                        style: const TextStyle(
-                                            fontWeight: FontWeight.bold),
-                                      ),
-                                    ),
-                            ),
-                          ),
-                          const SizedBox(height: 4),
-                          SizedBox(
-                            width: 68,
-                            child: Text(
-                              fav.name,
-                              maxLines: 1,
-                              overflow: TextOverflow.ellipsis,
-                              textAlign: TextAlign.center,
-                              style: TextStyle(
-                                fontSize: 11,
-                                fontWeight: isSelected
-                                    ? FontWeight.bold
-                                    : FontWeight.normal,
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
                   );
+                  _scrollController.jumpTo(target);
                 },
+                child: SizedBox(
+                  height: 88,
+                  child: ListView.separated(
+                    controller: _scrollController,
+                    padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
+                    scrollDirection: Axis.horizontal,
+                    itemCount: widget.favorites.length,
+                    separatorBuilder: (_, __) => const SizedBox(width: 10),
+                    itemBuilder: (context, index) {
+                      final fav = widget.favorites[index];
+                      final isSelected = fav.key == selected.key;
+                      final sColor = _serviceColor(fav.service);
+
+                      return InkWell(
+                        borderRadius: BorderRadius.circular(16),
+                        onTap: () => widget.onSelect(fav),
+                        child: AnimatedContainer(
+                          duration: const Duration(milliseconds: 200),
+                          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
+                          decoration: BoxDecoration(
+                            color: isSelected
+                                ? Theme.of(context)
+                                    .colorScheme
+                                    .primaryContainer
+                                    .withValues(alpha: 0.45)
+                                : Colors.transparent,
+                            borderRadius: BorderRadius.circular(16),
+                            border: Border.all(
+                              color: isSelected
+                                  ? Theme.of(context).colorScheme.primary
+                                  : Colors.transparent,
+                              width: 1.5,
+                            ),
+                            boxShadow: isSelected
+                                ? [
+                                    BoxShadow(
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .primary
+                                          .withValues(alpha: 0.25),
+                                      blurRadius: 8,
+                                    ),
+                                  ]
+                                : null,
+                          ),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Container(
+                                width: 44,
+                                height: 44,
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(14),
+                                  border: Border.all(
+                                    color: isSelected
+                                        ? Theme.of(context).colorScheme.primary
+                                        : sColor.withValues(alpha: 0.4),
+                                    width: 1.2,
+                                  ),
+                                ),
+                                child: ClipRRect(
+                                  borderRadius: BorderRadius.circular(13),
+                                  child: fav.avatarUrl != null &&
+                                          fav.avatarUrl!.isNotEmpty
+                                      ? CachedNetworkImage(
+                                          imageUrl: fav.avatarUrl!,
+                                          memCacheWidth: 120,
+                                          memCacheHeight: 120,
+                                          fit: BoxFit.cover,
+                                          placeholder: (_, __) => const Icon(
+                                              Icons.person_rounded,
+                                              size: 20),
+                                          errorWidget: (_, __, ___) => const Icon(
+                                              Icons.person_rounded,
+                                              size: 20),
+                                        )
+                                      : Center(
+                                          child: Text(
+                                            fav.name.isNotEmpty
+                                                ? fav.name[0].toUpperCase()
+                                                : '?',
+                                            style: const TextStyle(
+                                                fontWeight: FontWeight.bold),
+                                          ),
+                                        ),
+                                ),
+                              ),
+                              const SizedBox(height: 4),
+                              SizedBox(
+                                width: 68,
+                                child: Text(
+                                  fav.name,
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  textAlign: TextAlign.center,
+                                  style: TextStyle(
+                                    fontSize: 11,
+                                    fontWeight: isSelected
+                                        ? FontWeight.bold
+                                        : FontWeight.normal,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      );
+                    },
+                  ),
+                ),
               ),
             ),
             const SizedBox(height: 6),
@@ -1524,18 +1566,34 @@ class _FavoriteArtistsSection extends ConsumerWidget {
   }
 }
 
-class _FavoriteArtistMediaStrip extends ConsumerWidget {
+class _FavoriteArtistMediaStrip extends ConsumerStatefulWidget {
   const _FavoriteArtistMediaStrip({required this.artist});
 
   final FavoriteArtistItem artist;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<_FavoriteArtistMediaStrip> createState() =>
+      _FavoriteArtistMediaStripState();
+}
+
+class _FavoriteArtistMediaStripState
+    extends ConsumerState<_FavoriteArtistMediaStrip> {
+  final ScrollController _scrollController = ScrollController();
+  bool _isHovered = false;
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final query = ArtistWorkQuery(
-      providerId: artist.providerId,
+      providerId: widget.artist.providerId,
-      service: artist.service,
+      service: widget.artist.service,
-      artistId: artist.id,
+      artistId: widget.artist.id,
-      artistName: artist.name,
+      artistName: widget.artist.name,
     );
     final asyncPosts = ref.watch(artistPostsProvider(query));
 
@@ -1563,78 +1621,101 @@ class _FavoriteArtistMediaStrip extends ConsumerWidget {
               ),
             );
           }
-          return SizedBox(
+          return MouseRegion(
-            height: 96,
+            onEnter: (_) => _isHovered = true,
-            child: ListView.separated(
+            onExit: (_) => _isHovered = false,
-              scrollDirection: Axis.horizontal,
+            child: Listener(
-              itemCount: posts.length.clamp(0, 15),
+              onPointerSignal: (event) {
-              separatorBuilder: (_, __) => const SizedBox(width: 8),
+                if (!_isHovered ||
-              itemBuilder: (context, index) {
+                    event is! PointerScrollEvent ||
-                final post = posts[index];
+                    !_scrollController.hasClients) {
-                final isVideo = MediaUrlSelector.isVideo(post);
+                  return;
-                return InkWell(
+                }
-                  borderRadius: BorderRadius.circular(14),
+                final delta = event.scrollDelta.dy != 0
-                  onTap: () => context.push(
+                    ? event.scrollDelta.dy
-                    '/post/${post.providerId}/${post.id}',
+                    : event.scrollDelta.dx;
-                    extra: PostNavigationContext(
+                if (delta == 0) return;
-                      currentPost: post,
+                final target = (_scrollController.offset + delta * 1.5).clamp(
-                      posts: posts,
+                  0.0,
-                    ),
+                  _scrollController.position.maxScrollExtent,
-                  ),
-                  child: Container(
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(14),
-                      border: Border.all(
-                        color: Colors.white.withValues(alpha: 0.15),
-                        width: 1.0,
-                      ),
-                    ),
-                    child: ClipRRect(
-                      borderRadius: BorderRadius.circular(13),
-                      child: Stack(
-                        children: [
-                          SizedBox(
-                            width: 96,
-                            height: 96,
-                            child: CachedNetworkImage(
-                              imageUrl: post.previewUrl.isNotEmpty
-                                  ? post.previewUrl
-                                  : post.sampleUrl,
-                              fit: BoxFit.cover,
-                              placeholder: (_, __) => ColoredBox(
-                                color: Theme.of(context)
-                                    .colorScheme
-                                    .surfaceContainerHighest,
-                              ),
-                              errorWidget: (_, __, ___) => ColoredBox(
-                                color: Theme.of(context)
-                                    .colorScheme
-                                    .surfaceContainerHighest,
-                                child: const Icon(Icons.broken_image_rounded,
-                                    size: 24),
-                              ),
-                            ),
-                          ),
-                          if (isVideo)
-                            Positioned(
-                              bottom: 6,
-                              right: 6,
-                              child: Container(
-                                padding: const EdgeInsets.all(4),
-                                decoration: BoxDecoration(
-                                  color: Colors.black.withValues(alpha: 0.7),
-                                  shape: BoxShape.circle,
-                                ),
-                                child: const Icon(Icons.play_arrow_rounded,
-                                    color: Colors.white, size: 14),
-                              ),
-                            ),
-                        ],
-                      ),
-                    ),
-                  ),
                 );
+                _scrollController.jumpTo(target);
               },
+              child: SizedBox(
+                height: 96,
+                child: ListView.separated(
+                  controller: _scrollController,
+                  scrollDirection: Axis.horizontal,
+                  itemCount: posts.length.clamp(0, 15),
+                  separatorBuilder: (_, __) => const SizedBox(width: 8),
+                  itemBuilder: (context, index) {
+                    final post = posts[index];
+                    final isVideo = MediaUrlSelector.isVideo(post);
+                    return InkWell(
+                      borderRadius: BorderRadius.circular(14),
+                      onTap: () => AppNavigator.openPost(
+                        context,
+                        post: post,
+                        postsList: posts,
+                      ),
+                      child: Container(
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(14),
+                          border: Border.all(
+                            color: Colors.white.withValues(alpha: 0.15),
+                            width: 1.0,
+                          ),
+                        ),
+                        child: ClipRRect(
+                          borderRadius: BorderRadius.circular(13),
+                          child: Stack(
+                            children: [
+                              SizedBox(
+                                width: 96,
+                                height: 96,
+                                child: CachedNetworkImage(
+                                  imageUrl: post.previewUrl.isNotEmpty
+                                      ? post.previewUrl
+                                      : post.sampleUrl,
+                                  memCacheWidth: 200,
+                                  memCacheHeight: 200,
+                                  fit: BoxFit.cover,
+                                  placeholder: (_, __) => ColoredBox(
+                                    color: Theme.of(context)
+                                        .colorScheme
+                                        .surfaceContainerHighest,
+                                  ),
+                                  errorWidget: (_, __, ___) => ColoredBox(
+                                    color: Theme.of(context)
+                                        .colorScheme
+                                        .surfaceContainerHighest,
+                                    child: const Icon(Icons.broken_image_rounded,
+                                        size: 24),
+                                  ),
+                                ),
+                              ),
+                              if (isVideo)
+                                Positioned(
+                                  bottom: 6,
+                                  right: 6,
+                                  child: Container(
+                                    padding: const EdgeInsets.all(4),
+                                    decoration: BoxDecoration(
+                                      color: Colors.black.withValues(alpha: 0.7),
+                                      shape: BoxShape.circle,
+                                    ),
+                                    child: const Icon(Icons.play_arrow_rounded,
+                                        color: Colors.white, size: 14),
+                                  ),
+                                ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    );
+                  },
+                ),
+              ),
             ),
           );
         },
@@ -1707,6 +1788,8 @@ class _ArtistAvatar extends StatelessWidget {
             ? fallback
             : CachedNetworkImage(
                 imageUrl: artist.avatarUrl!,
+                memCacheWidth: 140,
+                memCacheHeight: 140,
                 fit: BoxFit.cover,
                 placeholder: (_, __) => fallback,
                 errorWidget: (_, __, ___) => fallback,

lib/features/collections/presentation/collection_details_screen.dart

@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -167,12 +168,10 @@ class CollectionDetailsScreen extends ConsumerWidget {
                   mediaQualityMode:
                       MediaQualityMode.fromName(settings.mediaQualityMode),
                   favoriteKeys: favoriteKeys,
-                  onOpen: (post) => context.push(
+                  onOpen: (post) => AppNavigator.openPost(
-                    '/post/${post.providerId}/${post.id}',
+                    context,
-                    extra: PostNavigationContext(
+                    post: post,
-                      currentPost: post,
+                    postsList: items,
-                      posts: items,
-                    ),
                   ),
                   onFavorite: (post) async {
                     if (favoriteKeys.contains(post.cacheKey)) {

lib/features/collections/presentation/collections_screen.dart

@@ -314,6 +314,8 @@ class _CollectionCard extends ConsumerWidget {
     if (urls.length == 1) {
       return CachedNetworkImage(
         imageUrl: urls[0],
+        memCacheWidth: 260,
+        memCacheHeight: 260,
         fit: BoxFit.cover,
         placeholder: (_, __) => Container(color: scheme.surfaceContainerHighest),
         errorWidget: (_, __, ___) => Container(
@@ -333,6 +335,8 @@ class _CollectionCard extends ConsumerWidget {
           if (i < urls.length)
             CachedNetworkImage(
               imageUrl: urls[i],
+              memCacheWidth: 200,
+              memCacheHeight: 200,
               fit: BoxFit.cover,
               placeholder: (_, __) =>
                   Container(color: scheme.surfaceContainerHighest),

lib/features/favorites/presentation/favorites_screen.dart

@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -970,12 +971,10 @@ class _FavoritesScreenState extends ConsumerState<FavoritesScreen> {
       mediaQualityMode: MediaQualityMode.fromName(settings.mediaQualityMode),
       favoriteKeys: posts.map((post) => post.cacheKey).toSet(),
       downloadedKeys: downloadedKeys,
-      onOpen: (post) => context.push(
+      onOpen: (post) => AppNavigator.openPost(
-        '/post/${post.providerId}/${post.id}',
+        context,
-        extra: PostNavigationContext(
+        post: post,
-          currentPost: post,
+        postsList: posts,
-          posts: posts,
-        ),
       ),
       onFavorite: (post) =>
           ref.read(favoritesControllerProvider.notifier).remove(post),
@@ -1226,6 +1225,8 @@ class _ArtistCard extends StatelessWidget {
                                   ),
                                   child: CachedNetworkImage(
                                     imageUrl: url,
+                                    memCacheWidth: 128,
+                                    memCacheHeight: 128,
                                     fit: BoxFit.cover,
                                     placeholder: (_, __) => Container(
                                       color: scheme.surfaceContainerHighest,

lib/features/feed/presentation/feed_screen.dart

@@ -8,6 +8,7 @@ import 'dart:async';
 import 'package:cached_network_image/cached_network_image.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -143,7 +144,11 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
 
     return Shortcuts(
       shortcuts: {
-        LogicalKeySet(LogicalKeyboardKey.keyR): const _RefreshIntent(),
+        LogicalKeySet(LogicalKeyboardKey.keyR): const _RandomPostIntent(),
+        LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyR):
+            const _RefreshIntent(),
+        LogicalKeySet(LogicalKeyboardKey.f5): const _RefreshIntent(),
+        LogicalKeySet(LogicalKeyboardKey.keyV): const _ToggleSelectionIntent(),
         LogicalKeySet(LogicalKeyboardKey.escape): const _ClearSelectionIntent(),
         LogicalKeySet(LogicalKeyboardKey.delete): const _ClearSelectionIntent(),
         LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyA):
@@ -157,6 +162,24 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
               return null;
             },
           ),
+          _RandomPostIntent: CallbackAction<_RandomPostIntent>(
+            onInvoke: (_) {
+              final posts = feed.value?.posts;
+              if (posts != null && posts.isNotEmpty) {
+                _openRandom(posts);
+              }
+              return null;
+            },
+          ),
+          _ToggleSelectionIntent: CallbackAction<_ToggleSelectionIntent>(
+            onInvoke: (_) {
+              setState(() {
+                _selectionMode = !_selectionMode;
+                if (!_selectionMode) _selectedKeys.clear();
+              });
+              return null;
+            },
+          ),
           _ClearSelectionIntent: CallbackAction<_ClearSelectionIntent>(
             onInvoke: (_) {
               _clearSelection();
@@ -331,12 +354,10 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
                             selectionMode: _selectionMode,
                             selectedKeys: _selectedKeys,
                             gridMode: settings.gridMode,
-                            onOpen: (post) => context.push(
+                            onOpen: (post) => AppNavigator.openPost(
-                              '/post/${post.providerId}/${post.id}',
+                              context,
-                              extra: PostNavigationContext(
+                              post: post,
-                                currentPost: post,
+                              postsList: state.posts,
-                                posts: state.posts,
-                              ),
                             ),
                             onPreview: (post) => _showPreview(context, post),
                             onToggleSelected: (post) => _toggleSelected(post),
@@ -392,7 +413,7 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
   void _openRandom(List<Post> posts) {
     if (posts.isEmpty) return;
     final post = posts[Random().nextInt(posts.length)];
-    context.push('/post/${post.providerId}/${post.id}', extra: post);
+    AppNavigator.openPost(context, post: post, postsList: posts);
   }
 
   Future<void> _applySearchQuery(String query) async {
@@ -683,6 +704,14 @@ class _SelectVisibleIntent extends Intent {
   const _SelectVisibleIntent();
 }
 
+class _RandomPostIntent extends Intent {
+  const _RandomPostIntent();
+}
+
+class _ToggleSelectionIntent extends Intent {
+  const _ToggleSelectionIntent();
+}
+
 class _BatchActionBar extends StatelessWidget {
   const _BatchActionBar({
     required this.count,

lib/features/feed/presentation/widgets/feed_toolbar.dart

@@ -110,7 +110,7 @@ class _FeedToolbarState extends State<FeedToolbar> {
               ),
               const SizedBox(width: 8),
               IconButton.filledTonal(
-                tooltip: widget.selectionMode ? 'Выйти из выбора' : 'Выбрать посты',
+                tooltip: widget.selectionMode ? 'Выйти из выбора (Esc)' : 'Выбрать посты (V)',
                 onPressed: widget.onToggleSelectionMode,
                 icon: Icon(widget.selectionMode
                     ? Icons.check_box_rounded
@@ -139,13 +139,13 @@ class _FeedToolbarState extends State<FeedToolbar> {
               ),
               const SizedBox(width: 4),
               IconButton(
-                tooltip: 'Обновить',
+                tooltip: 'Обновить (Ctrl+R / F5)',
                 onPressed: widget.onRefresh,
                 icon: const Icon(Icons.refresh_rounded),
               ),
               const SizedBox(width: 4),
               IconButton.filledTonal(
-                tooltip: 'Случайный пост',
+                tooltip: 'Случайный пост (R)',
                 onPressed: widget.onRandom,
                 icon: const Icon(Icons.casino_rounded),
               ),
@@ -163,41 +163,36 @@ class _FeedToolbarState extends State<FeedToolbar> {
             const SizedBox(height: 8),
           ],
           _HorizontalWheelScroller(
-            height: 36,
+            height: 38,
             builder: (controller) => ListView(
               controller: controller,
               scrollDirection: Axis.horizontal,
               primary: false,
               children: [
+                _LiquidPeriodTabs(
+                  selectedPeriod: widget.topPeriodFilter,
+                  onChanged: widget.onTopPeriodChanged,
+                ),
+                const SizedBox(width: 8),
+                const _ToolbarDivider(),
+                const SizedBox(width: 8),
                 if (widget.providers.isNotEmpty) ...[
-                  FilterChip(
+                  _LiquidProviderPill(
-                    selected: widget.selectedProviderIds.isEmpty,
+                    label: 'Все источники',
-                    label: const Text('Все источники'),
+                    isSelected: widget.selectedProviderIds.isEmpty,
-                    onSelected: (_) => widget.onQuickProviderToggle('__all__'),
+                    icon: Icons.all_inclusive_rounded,
+                    onTap: () => widget.onQuickProviderToggle('__all__'),
                   ),
-                  const SizedBox(width: 8),
+                  const SizedBox(width: 6),
                   for (final provider in widget.providers) ...[
-                    FilterChip(
+                    _LiquidProviderPill(
-                      selected:
+                      label: provider.name,
-                          widget.selectedProviderIds.contains(provider.id),
+                      isSelected: widget.selectedProviderIds.contains(provider.id),
-                      avatar: const Icon(Icons.hub_rounded, size: 15),
+                      icon: Icons.hub_rounded,
-                      label: Text(provider.name),
+                      onTap: () => widget.onQuickProviderToggle(provider.id),
-                      onSelected: (_) =>
-                          widget.onQuickProviderToggle(provider.id),
                     ),
-                    const SizedBox(width: 8),
+                    const SizedBox(width: 6),
                   ],
-                  const SizedBox(width: 4),
-                  const _ToolbarDivider(),
-                  const SizedBox(width: 10),
-                ],
-                for (final period in TopPeriodFilter.values) ...[
-                  ChoiceChip(
-                    selected: widget.topPeriodFilter == period,
-                    label: Text(period.label),
-                    onSelected: (_) => widget.onTopPeriodChanged(period),
-                  ),
-                  const SizedBox(width: 8),
                 ],
               ],
             ),
@@ -289,64 +284,56 @@ class _FeedToolbarState extends State<FeedToolbar> {
               primary: false,
               children: [
                 if (hasActiveFilters || widget.selectedTags.isNotEmpty) ...[
-                  ActionChip(
+                  _LiquidProviderPill(
-                    visualDensity: VisualDensity.compact,
+                    label: 'Сбросить',
-                    avatar: const Icon(Icons.filter_alt_off_rounded, size: 15),
+                    isSelected: false,
-                    label: const Text('Сбросить'),
+                    icon: Icons.filter_alt_off_rounded,
-                    onPressed: widget.onClearFilters,
+                    onTap: widget.onClearFilters,
                   ),
                   const SizedBox(width: 6),
                 ],
-                ActionChip(
+                _LiquidProviderPill(
-                  visualDensity: VisualDensity.compact,
+                  label: 'Обновить',
-                  avatar: const Icon(Icons.refresh_rounded, size: 15),
+                  isSelected: false,
-                  label: const Text('Обновить'),
+                  icon: Icons.refresh_rounded,
-                  onPressed: widget.onRefresh,
+                  onTap: widget.onRefresh,
                 ),
                 const SizedBox(width: 6),
                 const _ToolbarDivider(),
                 const SizedBox(width: 6),
-                FilterChip(
+                _LiquidProviderPill(
-                  visualDensity: VisualDensity.compact,
+                  label: widget.rating ?? 'Рейтинг',
-                  selected: widget.rating != null,
+                  isSelected: widget.rating != null,
-                  avatar: const Icon(Icons.shield_outlined, size: 15),
+                  icon: Icons.shield_outlined,
-                  label: Text(widget.rating ?? 'Рейтинг'),
+                  onTap: widget.onRatingFilter,
-                  onSelected: (_) => widget.onRatingFilter(),
                 ),
                 const SizedBox(width: 6),
                 const _ToolbarDivider(),
                 const SizedBox(width: 6),
+                _LiquidPeriodTabs(
+                  selectedPeriod: widget.topPeriodFilter,
+                  onChanged: widget.onTopPeriodChanged,
+                ),
                 if (widget.providers.isNotEmpty) ...[
-                  FilterChip(
+                  const SizedBox(width: 6),
-                    visualDensity: VisualDensity.compact,
+                  const _ToolbarDivider(),
-                    selected: widget.selectedProviderIds.isEmpty,
+                  const SizedBox(width: 6),
-                    label: const Text('Все'),
+                  _LiquidProviderPill(
-                    onSelected: (_) => widget.onQuickProviderToggle('__all__'),
+                    label: 'Все',
+                    isSelected: widget.selectedProviderIds.isEmpty,
+                    icon: Icons.all_inclusive_rounded,
+                    onTap: () => widget.onQuickProviderToggle('__all__'),
                   ),
                   const SizedBox(width: 6),
                   for (final provider in widget.providers) ...[
-                    FilterChip(
+                    _LiquidProviderPill(
-                      visualDensity: VisualDensity.compact,
+                      label: provider.name,
-                      selected:
+                      isSelected: widget.selectedProviderIds.contains(provider.id),
-                          widget.selectedProviderIds.contains(provider.id),
+                      icon: Icons.hub_rounded,
-                      label: Text(provider.name),
+                      onTap: () => widget.onQuickProviderToggle(provider.id),
-                      onSelected: (_) =>
-                          widget.onQuickProviderToggle(provider.id),
                     ),
                     const SizedBox(width: 6),
                   ],
-                  const SizedBox(width: 2),
-                  const _ToolbarDivider(),
-                  const SizedBox(width: 6),
-                ],
-                for (final period in TopPeriodFilter.values) ...[
-                  ChoiceChip(
-                    visualDensity: VisualDensity.compact,
-                    selected: widget.topPeriodFilter == period,
-                    label: Text(period.label),
-                    onSelected: (_) => widget.onTopPeriodChanged(period),
-                  ),
-                  const SizedBox(width: 6),
                 ],
               ],
             ),
@@ -371,6 +358,227 @@ class _ToolbarDivider extends StatelessWidget {
   }
 }
 
+class _LiquidPeriodTabs extends StatelessWidget {
+  const _LiquidPeriodTabs({
+    required this.selectedPeriod,
+    required this.onChanged,
+  });
+
+  final TopPeriodFilter selectedPeriod;
+  final ValueChanged<TopPeriodFilter> onChanged;
+
+  IconData _iconFor(TopPeriodFilter period) {
+    return switch (period) {
+      TopPeriodFilter.none => Icons.auto_awesome_rounded,
+      TopPeriodFilter.month => Icons.calendar_month_rounded,
+      TopPeriodFilter.year => Icons.calendar_today_rounded,
+      TopPeriodFilter.allTime => Icons.workspace_premium_rounded,
+    };
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+    final isDark = theme.brightness == Brightness.dark;
+
+    return Container(
+      padding: const EdgeInsets.all(2.5),
+      decoration: BoxDecoration(
+        color: isDark
+            ? scheme.surfaceContainerHigh.withValues(alpha: 0.55)
+            : scheme.surfaceContainerHighest.withValues(alpha: 0.45),
+        borderRadius: BorderRadius.circular(16),
+        border: Border.all(
+          color: isDark
+              ? Colors.white.withValues(alpha: 0.1)
+              : Colors.black.withValues(alpha: 0.06),
+          width: 1,
+        ),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          for (final period in TopPeriodFilter.values) ...[
+            _LiquidPeriodTabItem(
+              period: period,
+              icon: _iconFor(period),
+              isSelected: selectedPeriod == period,
+              onTap: () => onChanged(period),
+            ),
+            if (period != TopPeriodFilter.values.last) const SizedBox(width: 3),
+          ],
+        ],
+      ),
+    );
+  }
+}
+
+class _LiquidPeriodTabItem extends StatelessWidget {
+  const _LiquidPeriodTabItem({
+    required this.period,
+    required this.icon,
+    required this.isSelected,
+    required this.onTap,
+  });
+
+  final TopPeriodFilter period;
+  final IconData icon;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+    final isDark = theme.brightness == Brightness.dark;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(13),
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 200),
+          curve: Curves.easeOutCubic,
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+          decoration: BoxDecoration(
+            color: isSelected
+                ? (isDark
+                    ? scheme.primary.withValues(alpha: 0.28)
+                    : scheme.primaryContainer.withValues(alpha: 0.85))
+                : Colors.transparent,
+            borderRadius: BorderRadius.circular(13),
+            border: isSelected
+                ? Border.all(
+                    color: scheme.primary.withValues(alpha: isDark ? 0.45 : 0.3),
+                    width: 1,
+                  )
+                : null,
+            boxShadow: isSelected
+                ? [
+                    BoxShadow(
+                      color: scheme.primary.withValues(alpha: isDark ? 0.25 : 0.12),
+                      blurRadius: 8,
+                      offset: const Offset(0, 2),
+                    ),
+                  ]
+                : null,
+          ),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(
+                icon,
+                size: 14,
+                color: isSelected
+                    ? (isDark ? scheme.primary : scheme.onPrimaryContainer)
+                    : scheme.onSurfaceVariant.withValues(alpha: 0.85),
+              ),
+              const SizedBox(width: 6),
+              Text(
+                period.label,
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: isSelected ? FontWeight.w700 : FontWeight.w500,
+                  color: isSelected
+                      ? (isDark ? scheme.primary : scheme.onPrimaryContainer)
+                      : scheme.onSurfaceVariant,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _LiquidProviderPill extends StatelessWidget {
+  const _LiquidProviderPill({
+    required this.label,
+    required this.isSelected,
+    required this.onTap,
+    this.icon,
+  });
+
+  final String label;
+  final bool isSelected;
+  final VoidCallback onTap;
+  final IconData? icon;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+    final isDark = theme.brightness == Brightness.dark;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(14),
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 200),
+          curve: Curves.easeOutCubic,
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+          decoration: BoxDecoration(
+            color: isSelected
+                ? (isDark
+                    ? scheme.secondaryContainer.withValues(alpha: 0.35)
+                    : scheme.secondaryContainer.withValues(alpha: 0.7))
+                : (isDark
+                    ? scheme.surfaceContainerHigh.withValues(alpha: 0.4)
+                    : scheme.surfaceContainerHighest.withValues(alpha: 0.35)),
+            borderRadius: BorderRadius.circular(14),
+            border: Border.all(
+              color: isSelected
+                  ? scheme.secondary.withValues(alpha: isDark ? 0.6 : 0.4)
+                  : (isDark
+                      ? Colors.white.withValues(alpha: 0.08)
+                      : Colors.black.withValues(alpha: 0.05)),
+              width: 1,
+            ),
+            boxShadow: isSelected
+                ? [
+                    BoxShadow(
+                      color: scheme.secondary.withValues(alpha: isDark ? 0.2 : 0.08),
+                      blurRadius: 6,
+                    ),
+                  ]
+                : null,
+          ),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              if (icon != null) ...[
+                Icon(
+                  icon,
+                  size: 14,
+                  color: isSelected
+                      ? (isDark ? scheme.secondary : scheme.onSecondaryContainer)
+                      : scheme.onSurfaceVariant.withValues(alpha: 0.8),
+                ),
+                const SizedBox(width: 5),
+              ],
+              Text(
+                label,
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: isSelected ? FontWeight.w700 : FontWeight.w500,
+                  color: isSelected
+                      ? (isDark ? scheme.secondary : scheme.onSecondaryContainer)
+                      : scheme.onSurfaceVariant,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
 class _HorizontalWheelScroller extends StatefulWidget {
   const _HorizontalWheelScroller({
     required this.builder,

lib/features/post/presentation/post_details_screen.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -8,6 +9,7 @@ import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/app_strings.dart';
 import '../../../app/motion.dart';
 import '../../../app/responsive.dart';
@@ -27,7 +29,10 @@ import 'post_details_controller.dart';
 import 'widgets/cloud_mirrors_card.dart';
 import 'widgets/post_action_bar.dart';
 import 'widgets/post_media_viewer.dart';
+import 'widgets/post_pools_card.dart';
+import 'widgets/post_relations_card.dart';
 import 'widgets/post_tags_panel.dart';
+import '../../../backend/providers/e621_provider.dart';
 
 final postCommentsProvider =
     FutureProvider.family<List<PostComment>, PostDetailsArgs>(
@@ -38,6 +43,11 @@ final postCommentsProvider =
   return result is Success<List<PostComment>> ? result.data : const [];
 });
 
+final postProviderInstanceProvider =
+    FutureProvider.family<ContentProvider?, String>((ref, providerId) async {
+  return ref.watch(providerManagerProvider).getProviderInstance(providerId);
+});
+
 class PostDetailsScreen extends ConsumerWidget {
   const PostDetailsScreen({
     required this.providerId,
@@ -122,6 +132,11 @@ class PostDetailsScreen extends ConsumerWidget {
                   (post.commentary != null &&
                       post.commentary!.trim().isNotEmpty));
 
+          final providerInstance =
+              ref.watch(postProviderInstanceProvider(post.providerId)).value;
+          final e621Provider =
+              providerInstance is E621Provider ? providerInstance : null;
+
           if (Responsive.isMobile(context)) {
             if (currentIndex >= 0 && feedPosts.length > 1) {
               return _MobilePostPager(
@@ -171,6 +186,8 @@ class PostDetailsScreen extends ConsumerWidget {
               LogicalKeySet(LogicalKeyboardKey.keyC):
                   const _AddCollectionIntent(),
               LogicalKeySet(LogicalKeyboardKey.keyS): const _DownloadIntent(),
+              LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyS):
+                  const _DownloadIntent(),
               LogicalKeySet(LogicalKeyboardKey.escape): const _CloseIntent(),
             },
             child: Actions(
@@ -358,7 +375,25 @@ class PostDetailsScreen extends ConsumerWidget {
                       strings: strings,
                       localMedia: localMedia,
                       fileSizeBytes: fileSizeBytes,
+                      e621Provider: e621Provider,
                     ),
+                    if (post.hasRelations) ...[
+                      const SizedBox(height: 16),
+                      PostRelationsCard(
+                        post: post,
+                        onOpenPostId: (targetId) =>
+                            _openPostById(context, post.providerId, targetId),
+                      ),
+                    ],
+                    if (post.hasPools && e621Provider != null) ...[
+                      const SizedBox(height: 16),
+                      PostPoolsCard(
+                        post: post,
+                        provider: e621Provider,
+                        onOpenPostId: (targetId) =>
+                            _openPostById(context, post.providerId, targetId),
+                      ),
+                    ],
                     if (shouldShowCloudCard) ...[
                       const SizedBox(height: 16),
                       CloudMirrorsCard(
@@ -467,6 +502,11 @@ class PostDetailsScreen extends ConsumerWidget {
             (post.commentary != null &&
                 post.commentary!.trim().isNotEmpty));
 
+    final providerInstance =
+        ref.watch(postProviderInstanceProvider(post.providerId)).value;
+    final e621Provider =
+        providerInstance is E621Provider ? providerInstance : null;
+
     return GestureDetector(
       behavior: HitTestBehavior.translucent,
       onVerticalDragEnd: (details) {
@@ -593,7 +633,25 @@ class PostDetailsScreen extends ConsumerWidget {
             strings: strings,
             localMedia: localMedia,
             fileSizeBytes: fileSizeBytes,
+            e621Provider: e621Provider,
           ),
+          if (post.hasRelations) ...[
+            const SizedBox(height: 12),
+            PostRelationsCard(
+              post: post,
+              onOpenPostId: (targetId) =>
+                  _openPostById(context, post.providerId, targetId),
+            ),
+          ],
+          if (post.hasPools && e621Provider != null) ...[
+            const SizedBox(height: 12),
+            PostPoolsCard(
+              post: post,
+              provider: e621Provider,
+              onOpenPostId: (targetId) =>
+                  _openPostById(context, post.providerId, targetId),
+            ),
+          ],
           if (shouldShowCloudCard) ...[
             const SizedBox(height: 12),
             CloudMirrorsCard(
@@ -802,18 +860,43 @@ class PostDetailsScreen extends ConsumerWidget {
     Post post,
     Set<String> favoriteKeys,
   ) async {
-    if (favoriteKeys.contains(post.cacheKey)) {
+    final isFav = favoriteKeys.contains(post.cacheKey);
+    if (isFav) {
       await ref
           .read(favoriteServiceProvider)
           .removeFavorite(post.id, post.providerId);
+      final provider = await ref
+          .read(providerManagerProvider)
+          .getProviderInstance(post.providerId);
+      if (provider is E621Provider && provider.isAuthorized) {
+        unawaited(provider.removeFavorite(post.id));
+      }
     } else {
       await ref.read(favoriteServiceProvider).addFavorite(post);
       await _maybeAutoDownloadFavorite(ref, post);
+      final provider = await ref
+          .read(providerManagerProvider)
+          .getProviderInstance(post.providerId);
+      if (provider is E621Provider && provider.isAuthorized) {
+        unawaited(provider.addFavorite(post.id));
+      }
     }
     ref.invalidate(favoriteKeysProvider);
     ref.invalidate(favoritesControllerProvider);
   }
 
+  void _openPostById(
+      BuildContext context, String providerId, String targetId) {
+    Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (ctx) => PostDetailsScreen(
+          providerId: providerId,
+          postId: targetId,
+        ),
+      ),
+    );
+  }
+
   Future<void> _maybeAutoDownloadFavorite(WidgetRef ref, Post post) async {
     final settings =
         ref.read(appSettingsProvider).value ?? AppSettings.defaults;
@@ -872,7 +955,7 @@ class PostDetailsScreen extends ConsumerWidget {
   }
 
   void _openSimilar(BuildContext context, WidgetRef ref, Post post) {
-    context.push('/post/${post.providerId}/${post.id}/similar', extra: post);
+    AppNavigator.openSimilarPosts(context, post: post);
   }
 
   Future<void> _openSourcePage(WidgetRef ref, Post post) async {
@@ -888,7 +971,16 @@ class PostDetailsScreen extends ConsumerWidget {
   }
 
   void _replacePost(BuildContext context, Post post) {
-    context.replace('/post/${post.providerId}/${post.id}', extra: post);
+    Navigator.of(context).pushReplacement(
+      MaterialPageRoute<void>(
+        builder: (ctx) => PostDetailsScreen(
+          providerId: post.providerId,
+          postId: post.id,
+          initialPost: post,
+          postsList: postsList,
+        ),
+      ),
+    );
   }
 
   void _close(BuildContext context) {
@@ -1143,6 +1235,8 @@ class _NeighborStrip extends StatelessWidget {
                 imageUrl: post.previewUrl.isNotEmpty
                     ? post.previewUrl
                     : post.sampleUrl,
+                memCacheWidth: 160,
+                memCacheHeight: 160,
                 fit: BoxFit.cover,
                 errorWidget: (_, __, ___) =>
                     const Center(child: Icon(Icons.broken_image_rounded)),
@@ -1326,12 +1420,14 @@ class _PostInfoCard extends StatefulWidget {
     required this.strings,
     this.localMedia,
     this.fileSizeBytes,
+    this.e621Provider,
   });
 
   final Post post;
   final AppStrings strings;
   final DownloadedMedia? localMedia;
   final int? fileSizeBytes;
+  final E621Provider? e621Provider;
 
   @override
   State<_PostInfoCard> createState() => _PostInfoCardState();
@@ -1342,6 +1438,8 @@ class _PostInfoCardState extends State<_PostInfoCard> {
   int? _resolvedWidth;
   int? _resolvedHeight;
   bool _resolvingDimensions = false;
+  int? _votedScore;
+  bool _isVoting = false;
 
   static final _dimensionCache = <String, (int, int)>{};
 
@@ -1350,6 +1448,43 @@ class _PostInfoCardState extends State<_PostInfoCard> {
     return imageTypes.contains(fileType.toLowerCase());
   }
 
+  Future<void> _handleVote(int score) async {
+    final provider = widget.e621Provider;
+    if (provider == null) return;
+    if (!provider.isAuthorized) {
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        const SnackBar(
+          content: Text('Для голосования на e621 настройте API-ключ в Источниках'),
+          duration: Duration(seconds: 3),
+        ),
+      );
+      return;
+    }
+    if (_isVoting) return;
+    setState(() => _isVoting = true);
+    final success = await provider.votePost(widget.post.id, score);
+    if (mounted) {
+      setState(() {
+        _isVoting = false;
+        if (success) {
+          _votedScore = (_votedScore == score) ? 0 : score;
+        }
+      });
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        SnackBar(
+          content: Text(
+            success
+                ? (score > 0
+                    ? 'Голос ЗА (+1) отправлен на e621!'
+                    : 'Голос ПРОТИВ (-1) отправлен на e621!')
+                : 'Не удалось отправить голос',
+          ),
+          duration: const Duration(seconds: 2),
+        ),
+      );
+    }
+  }
+
   @override
   void initState() {
     super.initState();
@@ -1577,11 +1712,59 @@ class _PostInfoCardState extends State<_PostInfoCard> {
                   label: post.fileType.toUpperCase(),
                 ),
               RatingBadge(rating: post.rating),
-              if (post.score != 0)
+              if (post.score != 0 || widget.e621Provider != null)
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    _SpecBadge(
+                      icon: Icons.star_rounded,
+                      label: '${post.score + (_votedScore ?? 0)}',
+                      iconColor: Colors.amber,
+                    ),
+                    if (widget.e621Provider != null) ...[
+                      const SizedBox(width: 4),
+                      IconButton(
+                        visualDensity: VisualDensity.compact,
+                        padding: EdgeInsets.zero,
+                        constraints:
+                            const BoxConstraints(minWidth: 28, minHeight: 28),
+                        icon: Icon(
+                          _votedScore == 1
+                              ? Icons.thumb_up_rounded
+                              : Icons.thumb_up_alt_outlined,
+                          size: 15,
+                          color: _votedScore == 1
+                              ? const Color(0xFF10B981)
+                              : scheme.onSurfaceVariant,
+                        ),
+                        onPressed: _isVoting ? null : () => _handleVote(1),
+                        tooltip: 'Голос ЗА (+1)',
+                      ),
+                      IconButton(
+                        visualDensity: VisualDensity.compact,
+                        padding: EdgeInsets.zero,
+                        constraints:
+                            const BoxConstraints(minWidth: 28, minHeight: 28),
+                        icon: Icon(
+                          _votedScore == -1
+                              ? Icons.thumb_down_rounded
+                              : Icons.thumb_down_alt_outlined,
+                          size: 15,
+                          color: _votedScore == -1
+                              ? const Color(0xFFEF4444)
+                              : scheme.onSurfaceVariant,
+                        ),
+                        onPressed: _isVoting ? null : () => _handleVote(-1),
+                        tooltip: 'Голос ПРОТИВ (-1)',
+                      ),
+                    ],
+                  ],
+                ),
+              if (post.favCount != null && post.favCount! > 0)
                 _SpecBadge(
-                  icon: Icons.star_rounded,
+                  icon: Icons.favorite_rounded,
-                  label: '${post.score}',
+                  label: '${post.favCount}',
-                  iconColor: Colors.amber,
+                  iconColor: const Color(0xFFEF4444),
                 ),
               if (post.source != null && post.source!.isNotEmpty)
                 InkWell(

lib/features/post/presentation/similar_posts_screen.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
@@ -98,9 +98,9 @@ class SimilarPostsScreen extends ConsumerWidget {
                           MediaQualityMode.fromName(settings.mediaQualityMode),
                       favoriteKeys: favorites,
                       viewedKeys: viewed,
-                      onOpen: (post) => context.push(
+                      onOpen: (post) => AppNavigator.openPost(
-                        '/post/${post.providerId}/${post.id}',
+                        context,
-                        extra: post,
+                        post: post,
                       ),
                       onFavorite: (post) =>
                           _toggleFavorite(ref, post, favorites),

lib/features/post/presentation/widgets/e621_pool_sheet.dart

@@ -0,0 +1,472 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import '../../../../backend/models/e621_pool.dart';
+import '../../../../backend/models/post.dart';
+import '../../../../backend/providers/e621_provider.dart';
+
+class E621PoolSheet extends StatefulWidget {
+  const E621PoolSheet({
+    required this.currentPost,
+    required this.poolId,
+    required this.provider,
+    required this.onSelectPostId,
+    super.key,
+  });
+
+  final Post currentPost;
+  final String poolId;
+  final E621Provider provider;
+  final ValueChanged<String> onSelectPostId;
+
+  static Future<void> show(
+    BuildContext context, {
+    required Post currentPost,
+    required String poolId,
+    required E621Provider provider,
+    required ValueChanged<String> onSelectPostId,
+  }) {
+    return showModalBottomSheet(
+      context: context,
+      backgroundColor: Colors.transparent,
+      isScrollControlled: true,
+      builder: (context) => E621PoolSheet(
+        currentPost: currentPost,
+        poolId: poolId,
+        provider: provider,
+        onSelectPostId: onSelectPostId,
+      ),
+    );
+  }
+
+  @override
+  State<E621PoolSheet> createState() => _E621PoolSheetState();
+}
+
+class _E621PoolSheetState extends State<E621PoolSheet> {
+  E621Pool? _pool;
+  bool _isLoading = true;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadPool();
+  }
+
+  Future<void> _loadPool() async {
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      final pool = await widget.provider.getPool(widget.poolId);
+      if (mounted) {
+        setState(() {
+          _pool = pool;
+          _isLoading = false;
+          if (pool == null) {
+            _error = 'Не удалось загрузить информацию о серии';
+          }
+        });
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _error = 'Ошибка: $e';
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
+    final pool = _pool;
+
+    final currentPage = pool?.pageOf(widget.currentPost.id) ?? 0;
+    final prevId = pool?.previousPostId(widget.currentPost.id);
+    final nextId = pool?.nextPostId(widget.currentPost.id);
+
+    return DraggableScrollableSheet(
+      initialChildSize: 0.55,
+      minChildSize: 0.35,
+      maxChildSize: 0.88,
+      builder: (context, scrollController) {
+        return ClipRRect(
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),
+          child: BackdropFilter(
+            filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
+            child: Container(
+              decoration: BoxDecoration(
+                color: isDark
+                    ? const Color(0xFF161B22).withValues(alpha: 0.92)
+                    : Colors.white.withValues(alpha: 0.94),
+                borderRadius:
+                    const BorderRadius.vertical(top: Radius.circular(28)),
+                border: Border.all(
+                  color: isDark
+                      ? Colors.white.withValues(alpha: 0.12)
+                      : Colors.black.withValues(alpha: 0.08),
+                  width: 1.1,
+                ),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.black.withValues(alpha: 0.35),
+                    blurRadius: 28,
+                    offset: const Offset(0, -6),
+                  ),
+                ],
+              ),
+              child: ListView(
+                controller: scrollController,
+                padding: const EdgeInsets.fromLTRB(20, 12, 20, 32),
+                children: [
+                  // Drag handle
+                  Center(
+                    child: Container(
+                      width: 44,
+                      height: 5,
+                      decoration: BoxDecoration(
+                        color: isDark
+                            ? Colors.white.withValues(alpha: 0.25)
+                            : Colors.black.withValues(alpha: 0.20),
+                        borderRadius: BorderRadius.circular(3),
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+
+                  if (_isLoading)
+                    const Center(
+                      child: Padding(
+                        padding: EdgeInsets.all(40),
+                        child: CircularProgressIndicator(),
+                      ),
+                    )
+                  else if (_error != null)
+                    Center(
+                      child: Padding(
+                        padding: const EdgeInsets.all(32),
+                        child: Column(
+                          children: [
+                            const Icon(Icons.error_outline_rounded,
+                                size: 40, color: Color(0xFFEF4444)),
+                            const SizedBox(height: 12),
+                            Text(_error!),
+                            const SizedBox(height: 12),
+                            FilledButton.tonal(
+                              onPressed: _loadPool,
+                              child: const Text('Повторить'),
+                            ),
+                          ],
+                        ),
+                      ),
+                    )
+                  else if (pool != null) ...[
+                    // Pool header
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Container(
+                          width: 48,
+                          height: 48,
+                          decoration: BoxDecoration(
+                            gradient: const LinearGradient(
+                              colors: [Color(0xFF0055AA), Color(0xFF0088FF)],
+                              begin: Alignment.topLeft,
+                              end: Alignment.bottomRight,
+                            ),
+                            borderRadius: BorderRadius.circular(16),
+                            boxShadow: [
+                              BoxShadow(
+                                color: const Color(0xFF0055AA)
+                                    .withValues(alpha: 0.35),
+                                blurRadius: 10,
+                                offset: const Offset(0, 4),
+                              ),
+                            ],
+                          ),
+                          child: const Icon(
+                            Icons.menu_book_rounded,
+                            color: Colors.white,
+                            size: 24,
+                          ),
+                        ),
+                        const SizedBox(width: 14),
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                pool.cleanTitle,
+                                style: theme.textTheme.titleMedium?.copyWith(
+                                  fontWeight: FontWeight.bold,
+                                  letterSpacing: -0.2,
+                                ),
+                              ),
+                              const SizedBox(height: 4),
+                              Wrap(
+                                spacing: 6,
+                                runSpacing: 4,
+                                children: [
+                                  Container(
+                                    padding: const EdgeInsets.symmetric(
+                                        horizontal: 8, vertical: 3),
+                                    decoration: BoxDecoration(
+                                      color: const Color(0xFF0055AA)
+                                          .withValues(alpha: 0.15),
+                                      borderRadius: BorderRadius.circular(8),
+                                      border: Border.all(
+                                        color: const Color(0xFF0055AA)
+                                            .withValues(alpha: 0.30),
+                                        width: 0.8,
+                                      ),
+                                    ),
+                                    child: Text(
+                                      pool.category == 'series'
+                                          ? (isRu ? 'Комикс / Серия' : 'Series')
+                                          : (isRu
+                                              ? 'Коллекция'
+                                              : 'Collection'),
+                                      style: const TextStyle(
+                                        fontSize: 11,
+                                        fontWeight: FontWeight.w600,
+                                        color: Color(0xFF0077EE),
+                                      ),
+                                    ),
+                                  ),
+                                  Container(
+                                    padding: const EdgeInsets.symmetric(
+                                        horizontal: 8, vertical: 3),
+                                    decoration: BoxDecoration(
+                                      color: isDark
+                                          ? Colors.white.withValues(alpha: 0.08)
+                                          : Colors.black.withValues(alpha: 0.05),
+                                      borderRadius: BorderRadius.circular(8),
+                                    ),
+                                    child: Text(
+                                      '${pool.postCount} ${isRu ? 'страниц' : 'pages'}',
+                                      style: TextStyle(
+                                        fontSize: 11,
+                                        fontWeight: FontWeight.w500,
+                                        color: theme
+                                            .colorScheme.onSurfaceVariant,
+                                      ),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
+
+                    if (pool.description.trim().isNotEmpty) ...[
+                      const SizedBox(height: 12),
+                      Text(
+                        pool.description.trim(),
+                        style: theme.textTheme.bodySmall?.copyWith(
+                          color: theme.colorScheme.onSurfaceVariant,
+                        ),
+                        maxLines: 4,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ],
+
+                    const SizedBox(height: 18),
+
+                    // Quick Page Navigator Banner
+                    Container(
+                      padding: const EdgeInsets.all(12),
+                      decoration: BoxDecoration(
+                        color: isDark
+                            ? Colors.black.withValues(alpha: 0.25)
+                            : theme.colorScheme.surfaceContainerHighest
+                                .withValues(alpha: 0.5),
+                        borderRadius: BorderRadius.circular(16),
+                        border: Border.all(
+                          color: isDark
+                              ? Colors.white.withValues(alpha: 0.08)
+                              : Colors.black.withValues(alpha: 0.06),
+                        ),
+                      ),
+                      child: Row(
+                        children: [
+                          IconButton.filledTonal(
+                            tooltip: isRu ? 'Предыдущая' : 'Previous',
+                            onPressed: prevId == null
+                                ? null
+                                : () {
+                                    HapticFeedback.lightImpact();
+                                    Navigator.of(context).pop();
+                                    widget.onSelectPostId(prevId);
+                                  },
+                            icon: const Icon(Icons.arrow_back_rounded, size: 18),
+                          ),
+                          Expanded(
+                            child: Column(
+                              children: [
+                                Text(
+                                  currentPage > 0
+                                      ? (isRu
+                                          ? 'Страница $currentPage из ${pool.postCount}'
+                                          : 'Page $currentPage of ${pool.postCount}')
+                                      : (isRu
+                                          ? 'Страниц в пуле: ${pool.postCount}'
+                                          : '${pool.postCount} pages in pool'),
+                                  style: const TextStyle(
+                                    fontWeight: FontWeight.bold,
+                                    fontSize: 13,
+                                  ),
+                                ),
+                                if (currentPage > 0)
+                                  Padding(
+                                    padding: const EdgeInsets.only(top: 6),
+                                    child: LinearProgressIndicator(
+                                      value: (currentPage / pool.postCount)
+                                          .clamp(0.0, 1.0),
+                                      borderRadius: BorderRadius.circular(4),
+                                      minHeight: 4,
+                                      backgroundColor: isDark
+                                          ? Colors.white.withValues(alpha: 0.1)
+                                          : Colors.black.withValues(alpha: 0.08),
+                                    ),
+                                  ),
+                              ],
+                            ),
+                          ),
+                          IconButton.filledTonal(
+                            tooltip: isRu ? 'Следующая' : 'Next',
+                            onPressed: nextId == null
+                                ? null
+                                : () {
+                                    HapticFeedback.lightImpact();
+                                    Navigator.of(context).pop();
+                                    widget.onSelectPostId(nextId);
+                                  },
+                            icon: const Icon(Icons.arrow_forward_rounded,
+                                size: 18),
+                          ),
+                        ],
+                      ),
+                    ),
+
+                    const SizedBox(height: 18),
+
+                    Text(
+                      isRu ? 'Все страницы серии:' : 'All pages in pool:',
+                      style: theme.textTheme.bodyMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    const SizedBox(height: 10),
+
+                    // Grid of page buttons
+                    Wrap(
+                      spacing: 8,
+                      runSpacing: 8,
+                      children: [
+                        for (int i = 0; i < pool.postIds.length; i++) ...[
+                          _PageButton(
+                            pageNumber: i + 1,
+                            postId: pool.postIds[i],
+                            isCurrent: pool.postIds[i] == widget.currentPost.id,
+                            onTap: () {
+                              if (pool.postIds[i] == widget.currentPost.id) {
+                                return;
+                              }
+                              HapticFeedback.lightImpact();
+                              Navigator.of(context).pop();
+                              widget.onSelectPostId(pool.postIds[i]);
+                            },
+                          ),
+                        ],
+                      ],
+                    ),
+                  ],
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _PageButton extends StatelessWidget {
+  const _PageButton({
+    required this.pageNumber,
+    required this.postId,
+    required this.isCurrent,
+    required this.onTap,
+  });
+
+  final int pageNumber;
+  final String postId;
+  final bool isCurrent;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(12),
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 200),
+          constraints: const BoxConstraints(minWidth: 42, minHeight: 40),
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+          decoration: BoxDecoration(
+            color: isCurrent
+                ? const Color(0xFF0055AA)
+                : (isDark
+                    ? Colors.white.withValues(alpha: 0.08)
+                    : Colors.black.withValues(alpha: 0.05)),
+            borderRadius: BorderRadius.circular(12),
+            border: Border.all(
+              color: isCurrent
+                  ? const Color(0xFF0077EE)
+                  : (isDark
+                      ? Colors.white.withValues(alpha: 0.12)
+                      : Colors.black.withValues(alpha: 0.08)),
+              width: isCurrent ? 1.4 : 0.8,
+            ),
+            boxShadow: isCurrent
+                ? [
+                    BoxShadow(
+                      color: const Color(0xFF0055AA).withValues(alpha: 0.40),
+                      blurRadius: 8,
+                      offset: const Offset(0, 2),
+                    ),
+                  ]
+                : null,
+          ),
+          child: Center(
+            child: Text(
+              '$pageNumber',
+              style: TextStyle(
+                fontSize: 13,
+                fontWeight: isCurrent ? FontWeight.bold : FontWeight.w600,
+                color: isCurrent
+                    ? Colors.white
+                    : theme.colorScheme.onSurface,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/post/presentation/widgets/post_media_viewer.dart

@@ -78,6 +78,8 @@ class _PostMediaViewerState extends State<PostMediaViewer>
   String? _videoError;
   bool _retriedFormatError = false;
   bool _softwareDecodingFallback = false;
+  late bool _useSoftwareDecoding =
+      Platform.isLinux || Platform.isWindows || Platform.isMacOS;
   Timer? _hideTimer;
   StreamSubscription<String>? _errorSubscription;
   StreamSubscription<Duration>? _positionSubscription;
@@ -109,6 +111,8 @@ class _PostMediaViewerState extends State<PostMediaViewer>
       _videoError = null;
       _retriedFormatError = false;
       _softwareDecodingFallback = false;
+      _useSoftwareDecoding =
+          Platform.isLinux || Platform.isWindows || Platform.isMacOS;
       _imageUrls = _buildImageUrls(widget.post);
       _videoUrls = _buildVideoUrls(widget.post);
       if (_isPlayableMedia(widget.post) && _videoUrls.isNotEmpty) {
@@ -226,6 +230,8 @@ class _PostMediaViewerState extends State<PostMediaViewer>
               aspectRatio: widget.post.width > 0 && widget.post.height > 0
                   ? widget.post.width / widget.post.height
                   : 16 / 9,
+              isSoftwareDecoding: _useSoftwareDecoding,
+              onToggleDecoder: _toggleDecoderMode,
               controlsVisible: _controlsVisible,
               coverVideo: _coverVideo,
               muted: _muted,
@@ -317,10 +323,16 @@ class _PostMediaViewerState extends State<PostMediaViewer>
         ),
       );
     } else {
+      final mq = MediaQuery.maybeOf(context);
+      final dpr = mq?.devicePixelRatio ?? 1.5;
+      final screenWidth = mq?.size.width ?? 1280;
+      final maxCacheWidth =
+          (screenWidth * dpr * 1.5).round().clamp(1080, 2560);
       image = CachedNetworkImage(
         key: ValueKey(url),
         imageUrl: url,
         httpHeaders: headers,
+        memCacheWidth: maxCacheWidth,
         fit: BoxFit.contain,
         placeholder: (context, url) =>
             const Center(child: CircularProgressIndicator()),
@@ -383,16 +395,54 @@ class _PostMediaViewerState extends State<PostMediaViewer>
           ),
       ],
     );
+
+    final interactiveChild = _imageUrls.length > 1
+        ? Shortcuts(
+            shortcuts: {
+              LogicalKeySet(LogicalKeyboardKey.arrowLeft):
+                  const _PrevImageIntent(),
+              LogicalKeySet(LogicalKeyboardKey.keyA): const _PrevImageIntent(),
+              LogicalKeySet(LogicalKeyboardKey.arrowRight):
+                  const _NextImageIntent(),
+              LogicalKeySet(LogicalKeyboardKey.keyD): const _NextImageIntent(),
+            },
+            child: Actions(
+              actions: {
+                _PrevImageIntent: CallbackAction<_PrevImageIntent>(
+                  onInvoke: (_) {
+                    if (_imageIndex > 0) {
+                      setState(() => _imageIndex--);
+                    }
+                    return null;
+                  },
+                ),
+                _NextImageIntent: CallbackAction<_NextImageIntent>(
+                  onInvoke: (_) {
+                    if (_imageIndex < _imageUrls.length - 1) {
+                      setState(() => _imageIndex++);
+                    }
+                    return null;
+                  },
+                ),
+              },
+              child: Focus(
+                autofocus: true,
+                child: child,
+              ),
+            ),
+          )
+        : child;
+
     return LayoutBuilder(
       builder: (context, constraints) {
         if (constraints.hasBoundedWidth && constraints.hasBoundedHeight) {
           return SizedBox(
             width: constraints.maxWidth,
             height: constraints.maxHeight,
-            child: child,
+            child: interactiveChild,
           );
         }
-        return child;
+        return interactiveChild;
       },
     );
   }
@@ -400,11 +450,12 @@ class _PostMediaViewerState extends State<PostMediaViewer>
   void _initializeVideo() {
     MediaKit.ensureInitialized();
     _player = Player();
+    final bool enableHw = !_useSoftwareDecoding && !_softwareDecodingFallback;
     _controller = VideoController(
       _player!,
       configuration: VideoControllerConfiguration(
-        enableHardwareAcceleration: !_softwareDecodingFallback,
+        enableHardwareAcceleration: enableHw,
-        hwdec: _softwareDecodingFallback ? 'no' : 'auto-safe',
+        hwdec: enableHw ? (Platform.isAndroid ? 'auto-safe' : 'auto') : 'no',
       ),
     );
     _applyVolume();
@@ -479,6 +530,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
             lower.contains('failed to recognize file format'))) {
       _retriedFormatError = true;
       _softwareDecodingFallback = true;
+      _useSoftwareDecoding = true;
       _disposeVideo();
       await Future<void>.delayed(const Duration(milliseconds: 250));
       if (mounted) {
@@ -496,6 +548,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
     _videoIndex = 0;
     _retriedFormatError = false;
     _softwareDecodingFallback = true;
+    _useSoftwareDecoding = true;
     _disposeVideo();
     await Future<void>.delayed(const Duration(milliseconds: 150));
     if (mounted) {
@@ -503,6 +556,26 @@ class _PostMediaViewerState extends State<PostMediaViewer>
     }
   }
 
+  void _toggleDecoderMode() {
+    setState(() {
+      _useSoftwareDecoding = !_useSoftwareDecoding;
+      _softwareDecodingFallback = false;
+      _retriedFormatError = false;
+    });
+    _disposeVideo();
+    _initializeVideo();
+    ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+      SnackBar(
+        content: Text(
+          _useSoftwareDecoding
+              ? 'Включено программное декодирование (S/W)'
+              : 'Включено аппаратное декодирование (H/W)',
+        ),
+        duration: const Duration(seconds: 2),
+      ),
+    );
+  }
+
   void _disposeVideo() {
     _hideTimer?.cancel();
     _errorSubscription?.cancel();
@@ -644,6 +717,8 @@ class _PostMediaViewerState extends State<PostMediaViewer>
           halfVolume: _halfVolume,
           coverVideo: _coverVideo,
           initialVolume: _currentVolume,
+          isSoftwareDecoding: _useSoftwareDecoding,
+          onToggleDecoder: _toggleDecoderMode,
           errorMessage: _videoError,
           onRetry: _retryVideo,
           onChanged: (snapshot) {
@@ -739,6 +814,48 @@ class _TogglePlayIntent extends Intent {
   const _TogglePlayIntent();
 }
 
+class _SeekVideoIntent extends Intent {
+  const _SeekVideoIntent(this.seconds);
+  final int seconds;
+}
+
+class _VolumeVideoIntent extends Intent {
+  const _VolumeVideoIntent(this.deltaY);
+  final double deltaY;
+}
+
+class _MuteVideoIntent extends Intent {
+  const _MuteVideoIntent();
+}
+
+class _FullscreenVideoIntent extends Intent {
+  const _FullscreenVideoIntent();
+}
+
+class _LoopVideoIntent extends Intent {
+  const _LoopVideoIntent();
+}
+
+class _ZoomInIntent extends Intent {
+  const _ZoomInIntent();
+}
+
+class _ZoomOutIntent extends Intent {
+  const _ZoomOutIntent();
+}
+
+class _ResetZoomIntent extends Intent {
+  const _ResetZoomIntent();
+}
+
+class _PrevImageIntent extends Intent {
+  const _PrevImageIntent();
+}
+
+class _NextImageIntent extends Intent {
+  const _NextImageIntent();
+}
+
 class _UnsupportedSwfPanel extends StatelessWidget {
   const _UnsupportedSwfPanel();
 
@@ -798,6 +915,8 @@ class _FullscreenVideoPage extends StatefulWidget {
     required this.halfVolume,
     required this.coverVideo,
     this.initialVolume = 100.0,
+    required this.isSoftwareDecoding,
+    required this.onToggleDecoder,
     required this.errorMessage,
     required this.onRetry,
     required this.onChanged,
@@ -812,6 +931,8 @@ class _FullscreenVideoPage extends StatefulWidget {
   final bool halfVolume;
   final bool coverVideo;
   final double initialVolume;
+  final bool isSoftwareDecoding;
+  final VoidCallback onToggleDecoder;
   final String? errorMessage;
   final VoidCallback onRetry;
   final ValueChanged<VideoPlaybackSnapshot> onChanged;
@@ -911,6 +1032,8 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
           shortcuts: {
             LogicalKeySet(LogicalKeyboardKey.escape): const _CloseVideoIntent(),
             LogicalKeySet(LogicalKeyboardKey.space): const _TogglePlayIntent(),
+            LogicalKeySet(LogicalKeyboardKey.keyK): const _TogglePlayIntent(),
+            LogicalKeySet(LogicalKeyboardKey.keyF): const _CloseVideoIntent(),
           },
           child: Actions(
             actions: {
@@ -934,6 +1057,8 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
                 player: widget.player,
                 controller: widget.controller,
                 aspectRatio: widget.aspectRatio,
+                isSoftwareDecoding: widget.isSoftwareDecoding,
+                onToggleDecoder: widget.onToggleDecoder,
                 controlsVisible: _controlsVisible,
                 coverVideo: _coverVideo,
                 muted: _muted,
@@ -1485,6 +1610,8 @@ class _VideoSurface extends StatefulWidget {
     required this.player,
     required this.controller,
     required this.aspectRatio,
+    required this.isSoftwareDecoding,
+    required this.onToggleDecoder,
     required this.controlsVisible,
     required this.coverVideo,
     required this.muted,
@@ -1509,6 +1636,8 @@ class _VideoSurface extends StatefulWidget {
   final Player player;
   final VideoController controller;
   final double aspectRatio;
+  final bool isSoftwareDecoding;
+  final VoidCallback onToggleDecoder;
   final bool controlsVisible;
   final bool coverVideo;
   final bool muted;
@@ -1754,6 +1883,8 @@ class _VideoSurfaceState extends State<_VideoSurface> {
                   fullscreen: widget.fullscreen,
                   isLocked: _isLocked,
                   isLandscape: widget.isLandscape,
+                  isSoftwareDecoding: widget.isSoftwareDecoding,
+                  onToggleDecoder: widget.onToggleDecoder,
                   onToggleOrientation: widget.onToggleOrientation,
                   onToggleLock: () => setState(() => _isLocked = !_isLocked),
                   onToggleFit: widget.onToggleFit,
@@ -1771,16 +1902,87 @@ class _VideoSurfaceState extends State<_VideoSurface> {
       },
     );
 
-    return MouseRegion(
+    return Shortcuts(
-      onHover: (_) => widget.onInteract(),
+      shortcuts: {
-      child: ClipRRect(
+        LogicalKeySet(LogicalKeyboardKey.space): const _TogglePlayIntent(),
-        borderRadius: BorderRadius.circular(widget.fullscreen ? 0 : 10),
+        LogicalKeySet(LogicalKeyboardKey.keyK): const _TogglePlayIntent(),
-        child: widget.fullscreen
+        LogicalKeySet(LogicalKeyboardKey.arrowLeft): const _SeekVideoIntent(-5),
-            ? SizedBox.expand(child: child)
+        LogicalKeySet(LogicalKeyboardKey.keyJ): const _SeekVideoIntent(-5),
-            : AspectRatio(
+        LogicalKeySet(LogicalKeyboardKey.arrowRight): const _SeekVideoIntent(5),
-                aspectRatio: widget.aspectRatio.clamp(0.35, 2.4),
+        LogicalKeySet(LogicalKeyboardKey.keyL): const _SeekVideoIntent(5),
-                child: child,
+        LogicalKeySet(LogicalKeyboardKey.shift, LogicalKeyboardKey.arrowLeft):
-              ),
+            const _SeekVideoIntent(-15),
+        LogicalKeySet(LogicalKeyboardKey.shift, LogicalKeyboardKey.arrowRight):
+            const _SeekVideoIntent(15),
+        LogicalKeySet(LogicalKeyboardKey.arrowUp): const _VolumeVideoIntent(-10),
+        LogicalKeySet(LogicalKeyboardKey.arrowDown): const _VolumeVideoIntent(10),
+        LogicalKeySet(LogicalKeyboardKey.keyM): const _MuteVideoIntent(),
+        LogicalKeySet(LogicalKeyboardKey.keyF): const _FullscreenVideoIntent(),
+        LogicalKeySet(LogicalKeyboardKey.control, LogicalKeyboardKey.keyL):
+            const _LoopVideoIntent(),
+      },
+      child: Actions(
+        actions: {
+          _TogglePlayIntent: CallbackAction<_TogglePlayIntent>(
+            onInvoke: (_) {
+              if (widget.player.state.playing) {
+                widget.player.pause();
+              } else {
+                if (widget.player.state.completed) {
+                  widget.player.seek(Duration.zero);
+                }
+                widget.player.play();
+              }
+              widget.onInteract();
+              return null;
+            },
+          ),
+          _SeekVideoIntent: CallbackAction<_SeekVideoIntent>(
+            onInvoke: (intent) {
+              _seekBy(Duration(seconds: intent.seconds));
+              return null;
+            },
+          ),
+          _VolumeVideoIntent: CallbackAction<_VolumeVideoIntent>(
+            onInvoke: (intent) {
+              _adjustVolume(intent.deltaY);
+              return null;
+            },
+          ),
+          _MuteVideoIntent: CallbackAction<_MuteVideoIntent>(
+            onInvoke: (_) {
+              widget.onToggleMute();
+              return null;
+            },
+          ),
+          _FullscreenVideoIntent: CallbackAction<_FullscreenVideoIntent>(
+            onInvoke: (_) {
+              widget.onFullscreen();
+              return null;
+            },
+          ),
+          _LoopVideoIntent: CallbackAction<_LoopVideoIntent>(
+            onInvoke: (_) {
+              widget.onToggleLoop();
+              return null;
+            },
+          ),
+        },
+        child: Focus(
+          autofocus: true,
+          child: MouseRegion(
+            onHover: (_) => widget.onInteract(),
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(widget.fullscreen ? 0 : 10),
+              child: widget.fullscreen
+                  ? SizedBox.expand(child: child)
+                  : AspectRatio(
+                      aspectRatio: widget.aspectRatio.clamp(0.35, 2.4),
+                      child: child,
+                    ),
+            ),
+          ),
+        ),
       ),
     );
   }
@@ -1959,80 +2161,133 @@ class _ZoomableImageState extends State<_ZoomableImage> {
     super.dispose();
   }
 
+  void _zoomIn() {
+    final currentScale = _controller.value.getMaxScaleOnAxis();
+    final newScale = (currentScale * 1.35).clamp(1.0, 6.0);
+    _controller.value = Matrix4.identity()..scaleByDouble(newScale, newScale, 1, 1);
+    if (mounted) setState(() => _zoomed = newScale > 1.02);
+    _setLocked(_zoomed);
+  }
+
+  void _zoomOut() {
+    final currentScale = _controller.value.getMaxScaleOnAxis();
+    final newScale = (currentScale / 1.35).clamp(1.0, 6.0);
+    if (newScale <= 1.02) {
+      _controller.value = Matrix4.identity();
+      if (mounted) setState(() => _zoomed = false);
+      _setLocked(false);
+    } else {
+      _controller.value = Matrix4.identity()..scaleByDouble(newScale, newScale, 1, 1);
+      if (mounted) setState(() => _zoomed = true);
+      _setLocked(true);
+    }
+  }
+
+  void _resetZoom() {
+    _controller.value = Matrix4.identity();
+    if (mounted) setState(() => _zoomed = false);
+    _setLocked(false);
+  }
+
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(
+    return Shortcuts(
-      builder: (context, constraints) {
+      shortcuts: {
-        final hasFrame =
+        LogicalKeySet(LogicalKeyboardKey.equal): const _ZoomInIntent(),
-            constraints.hasBoundedWidth && constraints.hasBoundedHeight;
+        LogicalKeySet(LogicalKeyboardKey.add): const _ZoomInIntent(),
-        final child = hasFrame
+        LogicalKeySet(LogicalKeyboardKey.numpadAdd): const _ZoomInIntent(),
-            ? SizedBox(
+        LogicalKeySet(LogicalKeyboardKey.minus): const _ZoomOutIntent(),
-                width: constraints.maxWidth,
+        LogicalKeySet(LogicalKeyboardKey.numpadSubtract): const _ZoomOutIntent(),
-                height: constraints.maxHeight,
+        LogicalKeySet(LogicalKeyboardKey.digit0): const _ResetZoomIntent(),
-                child: widget.child,
+        LogicalKeySet(LogicalKeyboardKey.numpad0): const _ResetZoomIntent(),
-              )
+        LogicalKeySet(LogicalKeyboardKey.escape): const _ResetZoomIntent(),
-            : widget.child;
-        return Listener(
-          onPointerSignal: (signal) {
-            if (signal is PointerScrollEvent) {
-              final scaleDelta = signal.scrollDelta.dy < 0 ? 1.15 : 0.85;
-              final currentScale = _controller.value.getMaxScaleOnAxis();
-              final newScale = (currentScale * scaleDelta).clamp(1.0, 6.0);
-              if (newScale <= 1.02) {
-                _controller.value = Matrix4.identity();
-                if (mounted) setState(() => _zoomed = false);
-                _setLocked(false);
-              } else {
-                final focalPoint = signal.localPosition;
-                _controller.value = Matrix4.identity()
-                  ..translateByDouble(
-                      -focalPoint.dx * (newScale - 1),
-                      -focalPoint.dy * (newScale - 1),
-                      0,
-                      1)
-                  ..scaleByDouble(newScale, newScale, 1, 1);
-                if (mounted) setState(() => _zoomed = true);
-                _setLocked(true);
-              }
-            }
-          },
-          onPointerDown: (_) {
-            _pointerCount++;
-            if (_pointerCount >= 2 || _zoomed) {
-              _setLocked(true);
-            }
-          },
-          onPointerUp: (_) => _releasePointer(),
-          onPointerCancel: (_) => _releasePointer(),
-          child: GestureDetector(
-            behavior: HitTestBehavior.opaque,
-            onDoubleTapDown: (details) => _doubleTapDetails = details,
-            onDoubleTap: _toggleZoom,
-            child: InteractiveViewer(
-              transformationController: _controller,
-              minScale: 1,
-              maxScale: 6,
-              boundaryMargin: const EdgeInsets.all(160),
-              panEnabled: _zoomed,
-              scaleEnabled: true,
-              clipBehavior: Clip.none,
-              onInteractionStart: (_) {
-                if (_pointerCount >= 2 || _zoomed) _setLocked(true);
-              },
-              onInteractionEnd: (_) {
-                final scale = _controller.value.getMaxScaleOnAxis();
-                final nextZoomed = scale > 1.03;
-                if (!nextZoomed) {
-                  _controller.value = Matrix4.identity();
-                }
-                if (mounted) setState(() => _zoomed = nextZoomed);
-                _setLocked(nextZoomed || _pointerCount >= 2);
-              },
-              child: child,
-            ),
-          ),
-        );
       },
+      child: Actions(
+        actions: {
+          _ZoomInIntent: CallbackAction<_ZoomInIntent>(
+            onInvoke: (_) {
+              _zoomIn();
+              return null;
+            },
+          ),
+          _ZoomOutIntent: CallbackAction<_ZoomOutIntent>(
+            onInvoke: (_) {
+              _zoomOut();
+              return null;
+            },
+          ),
+          _ResetZoomIntent: CallbackAction<_ResetZoomIntent>(
+            onInvoke: (_) {
+              if (_zoomed) {
+                _resetZoom();
+              }
+              return null;
+            },
+          ),
+        },
+        child: Focus(
+          autofocus: true,
+          child: LayoutBuilder(
+            builder: (context, constraints) {
+              final hasFrame =
+                  constraints.hasBoundedWidth && constraints.hasBoundedHeight;
+              final child = hasFrame
+                  ? SizedBox(
+                      width: constraints.maxWidth,
+                      height: constraints.maxHeight,
+                      child: widget.child,
+                    )
+                  : widget.child;
+              return Listener(
+                onPointerDown: (_) {
+                  _pointerCount++;
+                  if (_pointerCount >= 2 || _zoomed) {
+                    _setLocked(true);
+                  }
+                },
+                onPointerUp: (_) => _releasePointer(),
+                onPointerCancel: (_) => _releasePointer(),
+                child: GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  onDoubleTapDown: (details) => _doubleTapDetails = details,
+                  onDoubleTap: _toggleZoom,
+                  child: InteractiveViewer(
+                    transformationController: _controller,
+                    minScale: 1,
+                    maxScale: 6,
+                    scaleFactor: 1000000.0,
+                    boundaryMargin: const EdgeInsets.all(160),
+                    panEnabled: _zoomed,
+                    scaleEnabled: true,
+                    clipBehavior: Clip.none,
+                    onInteractionStart: (_) {
+                      if (_pointerCount >= 2 || _zoomed) _setLocked(true);
+                    },
+                    onInteractionEnd: (_) {
+                      final scale = _controller.value.getMaxScaleOnAxis();
+                      final nextZoomed = scale > 1.03;
+                      if (!nextZoomed) {
+                        _controller.value = Matrix4.identity();
+                      }
+                      if (mounted) setState(() => _zoomed = nextZoomed);
+                      _setLocked(nextZoomed || _pointerCount >= 2);
+                    },
+                    child: Listener(
+                      onPointerSignal: (event) {
+                        if (event is PointerScrollEvent) {
+                          GestureBinding.instance.pointerSignalResolver
+                              .register(event, (_) {});
+                        }
+                      },
+                      child: child,
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+        ),
+      ),
     );
   }
 
@@ -2441,6 +2696,8 @@ class _VideoControls extends StatefulWidget {
     required this.fullscreen,
     required this.isLocked,
     this.isLandscape,
+    required this.isSoftwareDecoding,
+    required this.onToggleDecoder,
     this.onToggleOrientation,
     required this.onToggleLock,
     required this.onToggleFit,
@@ -2460,6 +2717,8 @@ class _VideoControls extends StatefulWidget {
   final bool fullscreen;
   final bool isLocked;
   final bool? isLandscape;
+  final bool isSoftwareDecoding;
+  final VoidCallback onToggleDecoder;
   final VoidCallback? onToggleOrientation;
   final VoidCallback onToggleLock;
   final VoidCallback onToggleFit;
@@ -2559,6 +2818,17 @@ class _VideoControlsState extends State<_VideoControls> {
                         onPressed: widget.onToggleLock,
                       ),
                       const Spacer(),
+                      _RoundControlButton(
+                        tooltip: widget.isSoftwareDecoding
+                            ? 'Декодер: S/W (программный). Нажмите для переключения на H/W'
+                            : 'Декодер: H/W (аппаратный). Нажмите для переключения на S/W',
+                        selected: !widget.isSoftwareDecoding,
+                        icon: widget.isSoftwareDecoding
+                            ? Icons.memory_rounded
+                            : Icons.speed_rounded,
+                        onPressed: widget.onToggleDecoder,
+                      ),
+                      const SizedBox(width: 8),
                       _SpeedBadgeButton(
                         currentRate: currentRate,
                         onSelected: (newRate) => widget.player.setRate(newRate),

lib/features/post/presentation/widgets/post_pools_card.dart

@@ -0,0 +1,149 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import '../../../../backend/models/post.dart';
+import '../../../../backend/providers/e621_provider.dart';
+import 'e621_pool_sheet.dart';
+
+class PostPoolsCard extends StatelessWidget {
+  const PostPoolsCard({
+    required this.post,
+    required this.provider,
+    required this.onOpenPostId,
+    super.key,
+  });
+
+  final Post post;
+  final E621Provider provider;
+  final ValueChanged<String> onOpenPostId;
+
+  @override
+  Widget build(BuildContext context) {
+    if (!post.hasPools) return const SizedBox.shrink();
+
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
+    final pools = post.poolIds;
+
+    return Container(
+      margin: const EdgeInsets.only(bottom: 16),
+      decoration: BoxDecoration(
+        color: isDark
+            ? theme.colorScheme.surfaceContainerHigh.withValues(alpha: 0.70)
+            : theme.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(20),
+        border: Border.all(
+          color: isDark
+              ? Colors.white.withValues(alpha: 0.12)
+              : theme.colorScheme.outlineVariant.withValues(alpha: 0.40),
+          width: 1.1,
+        ),
+      ),
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              const Icon(
+                Icons.menu_book_rounded,
+                size: 20,
+                color: Color(0xFF0077EE),
+              ),
+              const SizedBox(width: 8),
+              Text(
+                isRu ? 'Входит в комикс / серию' : 'Part of Series / Pool',
+                style: theme.textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const Spacer(),
+              Container(
+                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+                decoration: BoxDecoration(
+                  color: const Color(0xFF0055AA).withValues(alpha: 0.12),
+                  borderRadius: BorderRadius.circular(8),
+                ),
+                child: Text(
+                  '${pools.length}',
+                  style: const TextStyle(
+                    fontSize: 11,
+                    fontWeight: FontWeight.bold,
+                    color: Color(0xFF0077EE),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 12),
+
+          Wrap(
+            spacing: 8,
+            runSpacing: 8,
+            children: [
+              for (final poolId in pools)
+                Material(
+                  color: Colors.transparent,
+                  child: InkWell(
+                    onTap: () {
+                      HapticFeedback.lightImpact();
+                      E621PoolSheet.show(
+                        context,
+                        currentPost: post,
+                        poolId: poolId,
+                        provider: provider,
+                        onSelectPostId: onOpenPostId,
+                      );
+                    },
+                    borderRadius: BorderRadius.circular(12),
+                    child: Container(
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 12, vertical: 8),
+                      decoration: BoxDecoration(
+                        gradient: const LinearGradient(
+                          colors: [Color(0xFF0055AA), Color(0xFF0077EE)],
+                          begin: Alignment.topLeft,
+                          end: Alignment.bottomRight,
+                        ),
+                        borderRadius: BorderRadius.circular(12),
+                        boxShadow: [
+                          BoxShadow(
+                            color:
+                                const Color(0xFF0055AA).withValues(alpha: 0.25),
+                            blurRadius: 8,
+                            offset: const Offset(0, 3),
+                          ),
+                        ],
+                      ),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          const Icon(Icons.auto_stories_rounded,
+                              size: 15, color: Colors.white),
+                          const SizedBox(width: 6),
+                          Text(
+                            isRu
+                                ? 'Открыть комикс (Пул #$poolId)'
+                                : 'Open Pool #$poolId',
+                            style: const TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.w600,
+                              color: Colors.white,
+                            ),
+                          ),
+                          const SizedBox(width: 4),
+                          const Icon(Icons.arrow_forward_ios_rounded,
+                              size: 10, color: Colors.white),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/features/post/presentation/widgets/post_relations_card.dart

@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import '../../../../backend/models/post.dart';
+
+class PostRelationsCard extends StatelessWidget {
+  const PostRelationsCard({
+    required this.post,
+    required this.onOpenPostId,
+    super.key,
+  });
+
+  final Post post;
+  final ValueChanged<String> onOpenPostId;
+
+  @override
+  Widget build(BuildContext context) {
+    if (!post.hasRelations) return const SizedBox.shrink();
+
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final isRu = Localizations.maybeLocaleOf(context)?.languageCode == 'ru';
+
+    final parentId = post.parentId;
+    final children = post.childrenIds;
+
+    return Container(
+      margin: const EdgeInsets.only(bottom: 16),
+      decoration: BoxDecoration(
+        color: isDark
+            ? theme.colorScheme.surfaceContainerHigh.withValues(alpha: 0.70)
+            : theme.colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(20),
+        border: Border.all(
+          color: isDark
+              ? Colors.white.withValues(alpha: 0.12)
+              : theme.colorScheme.outlineVariant.withValues(alpha: 0.40),
+          width: 1.1,
+        ),
+      ),
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Icon(
+                Icons.copy_all_rounded,
+                size: 20,
+                color: theme.colorScheme.primary,
+              ),
+              const SizedBox(width: 8),
+              Text(
+                isRu ? 'Связанные посты и версии' : 'Variations & Relations',
+                style: theme.textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const Spacer(),
+              Container(
+                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+                decoration: BoxDecoration(
+                  color: theme.colorScheme.primary.withValues(alpha: 0.12),
+                  borderRadius: BorderRadius.circular(8),
+                ),
+                child: Text(
+                  '${(parentId != null ? 1 : 0) + children.length}',
+                  style: TextStyle(
+                    fontSize: 11,
+                    fontWeight: FontWeight.bold,
+                    color: theme.colorScheme.primary,
+                  ),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 12),
+
+          Wrap(
+            spacing: 8,
+            runSpacing: 8,
+            children: [
+              if (parentId != null)
+                _RelationPill(
+                  icon: Icons.north_west_rounded,
+                  label: isRu ? 'Родительский арт #$parentId' : 'Parent #$parentId',
+                  color: const Color(0xFF0077EE),
+                  onTap: () {
+                    HapticFeedback.lightImpact();
+                    onOpenPostId(parentId);
+                  },
+                ),
+              for (final childId in children)
+                _RelationPill(
+                  icon: Icons.style_rounded,
+                  label: isRu ? 'Версия #$childId' : 'Variant #$childId',
+                  color: const Color(0xFF10B981),
+                  onTap: () {
+                    HapticFeedback.lightImpact();
+                    onOpenPostId(childId);
+                  },
+                ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _RelationPill extends StatelessWidget {
+  const _RelationPill({
+    required this.icon,
+    required this.label,
+    required this.color,
+    required this.onTap,
+  });
+
+  final IconData icon;
+  final String label;
+  final Color color;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(12),
+        child: Container(
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 7),
+          decoration: BoxDecoration(
+            color: color.withValues(alpha: isDark ? 0.15 : 0.10),
+            borderRadius: BorderRadius.circular(12),
+            border: Border.all(
+              color: color.withValues(alpha: isDark ? 0.35 : 0.25),
+              width: 0.9,
+            ),
+          ),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(icon, size: 14, color: color),
+              const SizedBox(width: 6),
+              Text(
+                label,
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w600,
+                  color: color,
+                ),
+              ),
+              const SizedBox(width: 4),
+              Icon(Icons.arrow_forward_ios_rounded, size: 10, color: color),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/providers/presentation/provider_form_screen.dart

@@ -288,14 +288,6 @@ class _ProviderFormScreenState extends ConsumerState<ProviderFormScreen> {
                           value: 'realbooru_html',
                           child: Text('Realbooru HTML'),
                         ),
-                        DropdownMenuItem(
-                          value: 'kemono',
-                          child: Text('Kemono Party artists'),
-                        ),
-                        DropdownMenuItem(
-                          value: 'coomer',
-                          child: Text('Coomer Party artists'),
-                        ),
                         DropdownMenuItem(
                           value: 'custom',
                           child: Text('Custom REST API'),

lib/features/providers/presentation/providers_screen.dart

@@ -358,6 +358,9 @@ class ProvidersScreen extends ConsumerWidget {
                           '/providers/new',
                           extra: item,
                         ),
+                        onSaveConfig: (updated) => ref
+                            .read(providersControllerProvider.notifier)
+                            .save(updated),
                         onDelete: () async {
                           final ok = await showConfirmDialog(
                             context,

lib/features/providers/presentation/widgets/e621_auth_dialog.dart

@@ -0,0 +1,490 @@
+import 'dart:convert';
+import 'dart:ui';
+
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../../../../backend/models/content_provider_config.dart';
+
+class E621AuthDialog extends StatefulWidget {
+  const E621AuthDialog({
+    required this.config,
+    required this.onSaved,
+    super.key,
+  });
+
+  final ContentProviderConfig config;
+  final ValueChanged<ContentProviderConfig> onSaved;
+
+  static Future<void> show(
+    BuildContext context, {
+    required ContentProviderConfig config,
+    required ValueChanged<ContentProviderConfig> onSaved,
+  }) {
+    return showDialog(
+      context: context,
+      barrierColor: Colors.black54,
+      builder: (context) => E621AuthDialog(
+        config: config,
+        onSaved: onSaved,
+      ),
+    );
+  }
+
+  @override
+  State<E621AuthDialog> createState() => _E621AuthDialogState();
+}
+
+class _E621AuthDialogState extends State<E621AuthDialog> {
+  late final TextEditingController _loginController;
+  late final TextEditingController _apiKeyController;
+  bool _obscureKey = true;
+  bool _isLoading = false;
+  String? _statusMessage;
+  bool _isSuccess = false;
+
+  @override
+  void initState() {
+    super.initState();
+    final login = widget.config.customHeaders['query.login'] ?? '';
+    final apiKey = widget.config.customHeaders['query.api_key'] ?? '';
+    _loginController = TextEditingController(text: login);
+    _apiKeyController = TextEditingController(text: apiKey);
+  }
+
+  @override
+  void dispose() {
+    _loginController.dispose();
+    _apiKeyController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _testAndSave() async {
+    final login = _loginController.text.trim();
+    final apiKey = _apiKeyController.text.trim();
+
+    if (login.isEmpty || apiKey.isEmpty) {
+      setState(() {
+        _statusMessage = 'Укажите логин и API ключ';
+        _isSuccess = false;
+      });
+      return;
+    }
+
+    setState(() {
+      _isLoading = true;
+      _statusMessage = null;
+    });
+
+    try {
+      final dio = Dio(
+        BaseOptions(
+          baseUrl: widget.config.baseUrl,
+          connectTimeout: const Duration(seconds: 10),
+          receiveTimeout: const Duration(seconds: 10),
+          headers: {
+            'Authorization':
+                'Basic ${base64Encode(utf8.encode('$login:$apiKey'))}',
+            'User-Agent': 'Prisma/3.6.6 (by $login on e621)',
+            'Accept': 'application/json',
+          },
+        ),
+      );
+
+      final response = await dio.get<dynamic>('/posts.json', queryParameters: {
+        'limit': 1,
+      });
+
+      if (response.statusCode == 200) {
+        final updatedHeaders =
+            Map<String, String>.from(widget.config.customHeaders)
+              ..['query.login'] = login
+              ..['query.api_key'] = apiKey;
+
+        final updatedConfig = widget.config.copyWith(
+          customHeaders: updatedHeaders,
+          updatedAt: DateTime.now(),
+        );
+
+        widget.onSaved(updatedConfig);
+
+        setState(() {
+          _isLoading = false;
+          _isSuccess = true;
+          _statusMessage = 'Успешно авторизован! Лимит тегов снят.';
+        });
+
+        await Future<void>.delayed(const Duration(milliseconds: 650));
+        if (mounted) Navigator.of(context).pop();
+      } else {
+        setState(() {
+          _isLoading = false;
+          _isSuccess = false;
+          _statusMessage =
+              'Ошибка проверки (код ${response.statusCode}). Проверьте логин и ключ.';
+        });
+      }
+    } on DioException catch (e) {
+      setState(() {
+        _isLoading = false;
+        _isSuccess = false;
+        if (e.response?.statusCode == 401) {
+          _statusMessage = 'Неверный логин или API-ключ (401 Unauthorized)';
+        } else if (e.response?.statusCode == 403) {
+          _statusMessage = 'Доступ запрещен (403 Forbidden). Проверьте API access в профиле e621.';
+        } else {
+          _statusMessage = 'Ошибка подключения: ${e.message ?? e.toString()}';
+        }
+      });
+    } catch (e) {
+      setState(() {
+        _isLoading = false;
+        _isSuccess = false;
+        _statusMessage = 'Ошибка: $e';
+      });
+    }
+  }
+
+  void _clearAuth() {
+    final updatedHeaders =
+        Map<String, String>.from(widget.config.customHeaders)
+          ..remove('query.login')
+          ..remove('query.api_key');
+
+    final updatedConfig = widget.config.copyWith(
+      customHeaders: updatedHeaders,
+      updatedAt: DateTime.now(),
+    );
+
+    widget.onSaved(updatedConfig);
+    Navigator.of(context).pop();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final currentLogin = widget.config.customHeaders['query.login'];
+    final isAlreadyAuthorized =
+        currentLogin != null && currentLogin.trim().isNotEmpty;
+
+    return Dialog(
+      backgroundColor: Colors.transparent,
+      insetPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
+      child: ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: 480),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(28),
+          child: BackdropFilter(
+            filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
+            child: Container(
+              padding: const EdgeInsets.all(24),
+              decoration: BoxDecoration(
+                color: isDark
+                    ? const Color(0xFF1E2430).withValues(alpha: 0.90)
+                    : Colors.white.withValues(alpha: 0.94),
+                borderRadius: BorderRadius.circular(28),
+                border: Border.all(
+                  color: isDark
+                      ? const Color(0xFF0055AA).withValues(alpha: 0.40)
+                      : const Color(0xFF0055AA).withValues(alpha: 0.20),
+                  width: 1.2,
+                ),
+                boxShadow: [
+                  BoxShadow(
+                    color: const Color(0xFF0055AA).withValues(alpha: 0.15),
+                    blurRadius: 30,
+                    offset: const Offset(0, 10),
+                  ),
+                ],
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  // Title row
+                  Row(
+                    children: [
+                      Container(
+                        width: 44,
+                        height: 44,
+                        decoration: BoxDecoration(
+                          gradient: const LinearGradient(
+                            colors: [Color(0xFF0055AA), Color(0xFF0077EE)],
+                            begin: Alignment.topLeft,
+                            end: Alignment.bottomRight,
+                          ),
+                          borderRadius: BorderRadius.circular(14),
+                          boxShadow: [
+                            BoxShadow(
+                              color: const Color(0xFF0055AA).withValues(alpha: 0.35),
+                              blurRadius: 10,
+                              offset: const Offset(0, 4),
+                            ),
+                          ],
+                        ),
+                        child: const Icon(
+                          Icons.vpn_key_rounded,
+                          color: Colors.white,
+                          size: 22,
+                        ),
+                      ),
+                      const SizedBox(width: 14),
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              'Авторизация e621',
+                              style: theme.textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.bold,
+                                letterSpacing: -0.2,
+                              ),
+                            ),
+                            Text(
+                              isAlreadyAuthorized
+                                  ? 'Вход выполнен как $currentLogin'
+                                  : 'Снятие ограничений поиска и функций',
+                              style: theme.textTheme.bodySmall?.copyWith(
+                                color: isAlreadyAuthorized
+                                    ? const Color(0xFF10B981)
+                                    : theme.colorScheme.onSurfaceVariant,
+                                fontWeight: isAlreadyAuthorized
+                                    ? FontWeight.w600
+                                    : FontWeight.normal,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      IconButton(
+                        icon: const Icon(Icons.close_rounded),
+                        onPressed: () => Navigator.of(context).pop(),
+                        visualDensity: VisualDensity.compact,
+                      ),
+                    ],
+                  ),
+
+                  const SizedBox(height: 18),
+
+                  // Benefits badge
+                  Container(
+                    padding: const EdgeInsets.all(12),
+                    decoration: BoxDecoration(
+                      color: const Color(0xFF0055AA).withValues(alpha: isDark ? 0.15 : 0.08),
+                      borderRadius: BorderRadius.circular(16),
+                      border: Border.all(
+                        color: const Color(0xFF0055AA).withValues(alpha: 0.25),
+                      ),
+                    ),
+                    child: const Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        _BenefitRow(
+                          icon: Icons.check_circle_outline_rounded,
+                          text: 'Снятие лимита в 2 тега (поиск по 4–6+ тегам)',
+                        ),
+                        SizedBox(height: 6),
+                        _BenefitRow(
+                          icon: Icons.favorite_border_rounded,
+                          text: 'Серверная синхронизация Избранного (Favorites)',
+                        ),
+                        SizedBox(height: 6),
+                        _BenefitRow(
+                          icon: Icons.thumb_up_alt_outlined,
+                          text: 'Голосование за посты (Upvote / Downvote)',
+                        ),
+                      ],
+                    ),
+                  ),
+
+                  const SizedBox(height: 16),
+
+                  // Username field
+                  TextField(
+                    controller: _loginController,
+                    decoration: InputDecoration(
+                      labelText: 'Имя пользователя (Username на e621)',
+                      prefixIcon: const Icon(Icons.person_outline_rounded),
+                      filled: true,
+                      fillColor: isDark
+                          ? Colors.black.withValues(alpha: 0.25)
+                          : Colors.grey.shade100,
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(16),
+                        borderSide: BorderSide.none,
+                      ),
+                    ),
+                  ),
+
+                  const SizedBox(height: 12),
+
+                  // API Key field
+                  TextField(
+                    controller: _apiKeyController,
+                    obscureText: _obscureKey,
+                    decoration: InputDecoration(
+                      labelText: 'API Ключ (API Key)',
+                      prefixIcon: const Icon(Icons.key_rounded),
+                      suffixIcon: IconButton(
+                        icon: Icon(
+                          _obscureKey
+                              ? Icons.visibility_off_rounded
+                              : Icons.visibility_rounded,
+                        ),
+                        onPressed: () =>
+                            setState(() => _obscureKey = !_obscureKey),
+                      ),
+                      filled: true,
+                      fillColor: isDark
+                          ? Colors.black.withValues(alpha: 0.25)
+                          : Colors.grey.shade100,
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(16),
+                        borderSide: BorderSide.none,
+                      ),
+                    ),
+                  ),
+
+                  const SizedBox(height: 10),
+
+                  // How to get API key link
+                  Align(
+                    alignment: Alignment.centerLeft,
+                    child: TextButton.icon(
+                      onPressed: () {
+                        launchUrl(
+                          Uri.parse('https://e621.net/users/home'),
+                          mode: LaunchMode.externalApplication,
+                        );
+                      },
+                      icon: const Icon(Icons.open_in_new_rounded, size: 14),
+                      label: const Text(
+                        'Как получить ключ (e621 -> Manage API Access)',
+                        style: TextStyle(fontSize: 12),
+                      ),
+                      style: TextButton.styleFrom(
+                        padding: EdgeInsets.zero,
+                        visualDensity: VisualDensity.compact,
+                      ),
+                    ),
+                  ),
+
+                  if (_statusMessage != null) ...[
+                    const SizedBox(height: 8),
+                    Container(
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 12, vertical: 8),
+                      decoration: BoxDecoration(
+                        color: _isSuccess
+                            ? const Color(0xFF10B981).withValues(alpha: 0.15)
+                            : const Color(0xFFEF4444).withValues(alpha: 0.15),
+                        borderRadius: BorderRadius.circular(12),
+                        border: Border.all(
+                          color: _isSuccess
+                              ? const Color(0xFF10B981).withValues(alpha: 0.40)
+                              : const Color(0xFFEF4444).withValues(alpha: 0.40),
+                        ),
+                      ),
+                      child: Row(
+                        children: [
+                          Icon(
+                            _isSuccess
+                                ? Icons.check_circle_rounded
+                                : Icons.error_outline_rounded,
+                            size: 16,
+                            color: _isSuccess
+                                ? const Color(0xFF10B981)
+                                : const Color(0xFFEF4444),
+                          ),
+                          const SizedBox(width: 8),
+                          Expanded(
+                            child: Text(
+                              _statusMessage!,
+                              style: TextStyle(
+                                fontSize: 12,
+                                color: _isSuccess
+                                    ? const Color(0xFF10B981)
+                                    : const Color(0xFFEF4444),
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+
+                  const SizedBox(height: 20),
+
+                  // Action buttons
+                  Row(
+                    children: [
+                      if (isAlreadyAuthorized) ...[
+                        TextButton.icon(
+                          onPressed: _isLoading ? null : _clearAuth,
+                          icon: const Icon(Icons.logout_rounded,
+                              size: 16, color: Color(0xFFEF4444)),
+                          label: const Text('Выйти',
+                              style: TextStyle(color: Color(0xFFEF4444))),
+                        ),
+                        const Spacer(),
+                      ] else
+                        const Spacer(),
+                      FilledButton.icon(
+                        onPressed: _isLoading ? null : _testAndSave,
+                        icon: _isLoading
+                            ? const SizedBox(
+                                width: 16,
+                                height: 16,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                  color: Colors.white,
+                                ),
+                              )
+                            : const Icon(Icons.check_rounded, size: 18),
+                        label: Text(_isLoading ? 'Проверка...' : 'Сохранить'),
+                        style: FilledButton.styleFrom(
+                          backgroundColor: const Color(0xFF0055AA),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(14),
+                          ),
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 20, vertical: 12),
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _BenefitRow extends StatelessWidget {
+  const _BenefitRow({required this.icon, required this.text});
+
+  final IconData icon;
+  final String text;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Icon(icon, size: 14, color: const Color(0xFF0077EE)),
+        const SizedBox(width: 8),
+        Expanded(
+          child: Text(
+            text,
+            style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/features/providers/presentation/widgets/provider_card.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import '../../../../backend/backend.dart';
+import 'e621_auth_dialog.dart';
 
 class ProviderCard extends StatelessWidget {
   const ProviderCard({
@@ -9,6 +10,7 @@ class ProviderCard extends StatelessWidget {
     required this.onToggle,
     required this.onEdit,
     required this.onDelete,
+    this.onSaveConfig,
     super.key,
   });
 
@@ -16,6 +18,7 @@ class ProviderCard extends StatelessWidget {
   final ValueChanged<bool> onToggle;
   final VoidCallback onEdit;
   final VoidCallback onDelete;
+  final ValueChanged<ContentProviderConfig>? onSaveConfig;
 
   @override
   Widget build(BuildContext context) {
@@ -164,6 +167,16 @@ class ProviderCard extends StatelessWidget {
                               color: theme.colorScheme.primary,
                               isDark: isDark,
                             ),
+                            if (config.apiType.toLowerCase() == 'e621')
+                              _GlassPill(
+                                label: (config.customHeaders['query.login']?.isNotEmpty ?? false)
+                                    ? 'e621: ${config.customHeaders['query.login']}'
+                                    : (isRu ? 'e621: Гость (макс 2 тега)' : 'e621: Guest (max 2 tags)'),
+                                color: (config.customHeaders['query.login']?.isNotEmpty ?? false)
+                                    ? const Color(0xFF10B981)
+                                    : Colors.amber,
+                                isDark: isDark,
+                              ),
                           ],
                         ),
                       ],
@@ -231,10 +244,30 @@ class ProviderCard extends StatelessWidget {
 
               const SizedBox(height: 12),
 
-              // Row 3: Action Buttons (Edit & Delete)
+              // Row 3: Action Buttons (Edit & Delete & e621 Auth)
               Row(
                 mainAxisAlignment: MainAxisAlignment.end,
                 children: [
+                  if (config.apiType.toLowerCase() == 'e621' && onSaveConfig != null) ...[
+                    _GlassActionButton(
+                      icon: Icons.vpn_key_rounded,
+                      label: (config.customHeaders['query.login']?.isNotEmpty ?? false)
+                          ? (isRu ? 'Аккаунт' : 'Account')
+                          : (isRu ? 'API Ключ' : 'API Key'),
+                      color: const Color(0xFF0077EE),
+                      isDark: isDark,
+                      onTap: () {
+                        HapticFeedback.lightImpact();
+                        E621AuthDialog.show(
+                          context,
+                          config: config,
+                          onSaved: onSaveConfig!,
+                        );
+                      },
+                    ),
+                    const SizedBox(width: 8),
+                  ],
+
                   // Edit Action Button
                   _GlassActionButton(
                     icon: Icons.edit_rounded,
@@ -305,16 +338,6 @@ class ProviderCard extends StatelessWidget {
           Icons.pets_rounded,
           'e621 / e926',
         ),
-      'kemono' => (
-          const Color(0xFFEC4899),
-          Icons.palette_rounded,
-          'Kemono',
-        ),
-      'coomer' => (
-          const Color(0xFF06B6D4),
-          Icons.collections_rounded,
-          'Coomer',
-        ),
       _ => (
           const Color(0xFF6366F1),
           Icons.hub_rounded,

lib/features/settings/presentation/hidden_posts_screen.dart

@@ -1,9 +1,9 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../backend/backend.dart';
 import '../../../core/utils/result.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -62,9 +62,9 @@ class HiddenPostsScreen extends ConsumerWidget {
                     item: item,
                     onOpen: item.post == null
                         ? null
-                        : () => context.push(
+                        : () => AppNavigator.openPost(
-                              '/post/${item.post!.providerId}/${item.post!.id}',
+                              context,
-                              extra: item.post,
+                              post: item.post!,
                             ),
                     onRestore: () async {
                       await ref

lib/features/settings/presentation/settings_screen.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'dart:ui';
 
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' hide appBuildNumber;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -1439,7 +1440,7 @@ class _SettingsIconBadge extends StatelessWidget {
   }
 }
 
-class _CategoryQuickNav extends StatelessWidget {
+class _CategoryQuickNav extends StatefulWidget {
   const _CategoryQuickNav({
     required this.categories,
     required this.onSelect,
@@ -1449,103 +1450,143 @@ class _CategoryQuickNav extends StatelessWidget {
       categories;
   final ValueChanged<GlobalKey> onSelect;
 
+  @override
+  State<_CategoryQuickNav> createState() => _CategoryQuickNavState();
+}
+
+class _CategoryQuickNavState extends State<_CategoryQuickNav> {
+  final ScrollController _scrollController = ScrollController();
+  bool _isHovered = false;
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final isDark = theme.brightness == Brightness.dark;
 
-    return SizedBox(
+    return MouseRegion(
-      height: 44,
+      onEnter: (_) => _isHovered = true,
-      child: ListView.separated(
+      onExit: (_) => _isHovered = false,
-        padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Listener(
-        scrollDirection: Axis.horizontal,
+        onPointerSignal: (event) {
-        itemCount: categories.length,
+          if (!_isHovered ||
-        separatorBuilder: (_, __) => const SizedBox(width: 8),
+              event is! PointerScrollEvent ||
-        itemBuilder: (context, index) {
+              !_scrollController.hasClients) {
-          final cat = categories[index];
+            return;
-          return Container(
+          }
-            decoration: BoxDecoration(
+          final delta = event.scrollDelta.dy != 0
-              borderRadius: BorderRadius.circular(22),
+              ? event.scrollDelta.dy
-              boxShadow: [
+              : event.scrollDelta.dx;
-                BoxShadow(
+          if (delta == 0) return;
-                  color: isDark
+          final target = (_scrollController.offset + delta * 1.5).clamp(
-                      ? Colors.black.withValues(alpha: 0.25)
+            0.0,
-                      : cat.color.withValues(alpha: 0.12),
+            _scrollController.position.maxScrollExtent,
-                  blurRadius: 8,
+          );
-                  offset: const Offset(0, 2.5),
+          _scrollController.jumpTo(target);
+        },
+        child: SizedBox(
+          height: 44,
+          child: ListView.separated(
+            controller: _scrollController,
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            scrollDirection: Axis.horizontal,
+            itemCount: widget.categories.length,
+            separatorBuilder: (_, __) => const SizedBox(width: 8),
+            itemBuilder: (context, index) {
+              final cat = widget.categories[index];
+              return Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(22),
+                  boxShadow: [
+                    BoxShadow(
+                      color: isDark
+                          ? Colors.black.withValues(alpha: 0.25)
+                          : cat.color.withValues(alpha: 0.12),
+                      blurRadius: 8,
+                      offset: const Offset(0, 2.5),
+                    ),
+                  ],
                 ),
-              ],
+                child: ClipRRect(
-            ),
+                  borderRadius: BorderRadius.circular(22),
-            child: ClipRRect(
+                  child: BackdropFilter(
-              borderRadius: BorderRadius.circular(22),
+                    filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
-              child: BackdropFilter(
+                    child: Material(
-                filter: ImageFilter.blur(sigmaX: 16, sigmaY: 16),
+                      color: isDark
-                child: Material(
+                          ? theme.colorScheme.surfaceContainerHigh
-                  color: isDark
+                              .withValues(alpha: 0.60)
-                      ? theme.colorScheme.surfaceContainerHigh.withValues(alpha: 0.60)
+                          : Colors.white.withValues(alpha: 0.82),
-                      : Colors.white.withValues(alpha: 0.82),
+                      child: InkWell(
-                  child: InkWell(
-                    borderRadius: BorderRadius.circular(22),
-                    onTap: () {
-                      HapticFeedback.selectionClick();
-                      onSelect(cat.key);
-                    },
-                    child: Container(
-                      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 7),
-                      decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(22),
-                        border: Border.all(
+                        onTap: () {
-                          color: isDark
+                          HapticFeedback.selectionClick();
-                              ? Colors.white.withValues(alpha: 0.18)
+                          widget.onSelect(cat.key);
-                              : Colors.white.withValues(alpha: 0.85),
+                        },
-                          width: 1.1,
+                        child: Container(
-                        ),
+                          padding: const EdgeInsets.symmetric(
-                      ),
+                              horizontal: 12, vertical: 7),
-                      child: Row(
+                          decoration: BoxDecoration(
-                        mainAxisSize: MainAxisSize.min,
+                            borderRadius: BorderRadius.circular(22),
-                        children: [
+                            border: Border.all(
-                          Container(
+                              color: isDark
-                            width: 24,
+                                  ? Colors.white.withValues(alpha: 0.18)
-                            height: 24,
+                                  : Colors.white.withValues(alpha: 0.85),
-                            decoration: BoxDecoration(
+                              width: 1.1,
-                              gradient: LinearGradient(
+                            ),
-                                begin: Alignment.topLeft,
+                          ),
-                                end: Alignment.bottomRight,
+                          child: Row(
-                                colors: [
+                            mainAxisSize: MainAxisSize.min,
-                                  cat.color,
+                            children: [
-                                  cat.color.withValues(alpha: 0.82),
+                              Container(
-                                ],
+                                width: 24,
-                              ),
+                                height: 24,
-                              borderRadius: BorderRadius.circular(7),
+                                decoration: BoxDecoration(
-                              boxShadow: [
+                                  gradient: LinearGradient(
-                                BoxShadow(
+                                    begin: Alignment.topLeft,
-                                  color: cat.color.withValues(alpha: 0.35),
+                                    end: Alignment.bottomRight,
-                                  blurRadius: 5,
+                                    colors: [
-                                  offset: const Offset(0, 1.5),
+                                      cat.color,
+                                      cat.color.withValues(alpha: 0.82),
+                                    ],
+                                  ),
+                                  borderRadius: BorderRadius.circular(7),
+                                  boxShadow: [
+                                    BoxShadow(
+                                      color: cat.color.withValues(alpha: 0.35),
+                                      blurRadius: 5,
+                                      offset: const Offset(0, 1.5),
+                                    ),
+                                  ],
                                 ),
-                              ],
+                                child: Center(
-                            ),
+                                  child: Icon(cat.icon,
-                            child: Center(
+                                      size: 14, color: Colors.white),
-                              child: Icon(cat.icon, size: 14, color: Colors.white),
+                                ),
-                            ),
+                              ),
+                              const SizedBox(width: 8),
+                              Text(
+                                cat.label,
+                                style: theme.textTheme.labelLarge?.copyWith(
+                                  fontWeight: FontWeight.w600,
+                                  letterSpacing: -0.2,
+                                ),
+                              ),
+                            ],
                           ),
-                          const SizedBox(width: 8),
+                        ),
-                          Text(
-                            cat.label,
-                            style: theme.textTheme.labelLarge?.copyWith(
-                              fontWeight: FontWeight.w600,
-                              letterSpacing: -0.2,
-                            ),
-                          ),
-                        ],
                       ),
                     ),
                   ),
                 ),
-              ),
+              );
-            ),
+            },
-          );
+          ),
-        },
+        ),
       ),
     );
   }

lib/features/viewed/presentation/viewed_screen.dart

@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../../app/app.dart';
+import '../../../app/app_navigator.dart';
 import '../../../app/responsive.dart';
 import '../../../backend/backend.dart';
 import '../../../shared/widgets/adaptive_scaffold.dart';
@@ -142,12 +143,10 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
                 mediaQualityMode:
                     MediaQualityMode.fromName(settings.mediaQualityMode),
                 favoriteKeys: favoriteKeys,
-                onOpen: (post) => context.push(
+                onOpen: (post) => AppNavigator.openPost(
-                  '/post/${post.providerId}/${post.id}',
+                  context,
-                  extra: PostNavigationContext(
+                  post: post,
-                    currentPost: post,
+                  postsList: allPosts,
-                    posts: allPosts,
-                  ),
                 ),
                 onFavorite: (post) => _toggleFavorite(
                   ref,
@@ -260,12 +259,10 @@ class _ViewedScreenState extends ConsumerState<ViewedScreen> {
                       isFavorite: favoriteKeys.contains(item.post.cacheKey),
                       isRu: isRu,
                       onOpen: () {
-                        context.push(
+                        AppNavigator.openPost(
-                          '/post/${item.post.providerId}/${item.post.id}',
+                          context,
-                          extra: PostNavigationContext(
+                          post: item.post,
-                            currentPost: item.post,
+                          postsList: allPosts,
-                            posts: allPosts,
-                          ),
                         );
                       },
                       onFavorite: () => _toggleFavorite(
@@ -430,6 +427,8 @@ class _ViewedPostTile extends StatelessWidget {
                                   )
                                 : CachedNetworkImage(
                                     imageUrl: image,
+                                    memCacheWidth: 320,
+                                    memCacheHeight: 320,
                                     fit: BoxFit.cover,
                                     placeholder: (_, __) => Container(
                                       color: scheme.surfaceContainerHighest,

lib/main.dart

@@ -1,9 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:media_kit/media_kit.dart';
 
 import 'app/app.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
+  MediaKit.ensureInitialized();
+  // Optimize image cache to prevent memory bloat and OOM crashes
+  PaintingBinding.instance.imageCache.maximumSizeBytes = 180 * 1024 * 1024; // 180 MB
+  PaintingBinding.instance.imageCache.maximumSize = 120; // 120 images
   runApp(const ProviderScope(child: GelRuleApp()));
 }

lib/shared/widgets/desktop_shortcuts_dialog.dart

@@ -0,0 +1,321 @@
+import 'dart:ui';
+import 'package:flutter/material.dart';
+
+class DesktopShortcutsDialog extends StatelessWidget {
+  const DesktopShortcutsDialog({super.key});
+
+  static Future<void> show(BuildContext context) {
+    return showDialog(
+      context: context,
+      barrierColor: Colors.black54,
+      builder: (_) => const DesktopShortcutsDialog(),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+    final isDark = theme.brightness == Brightness.dark;
+
+    return Dialog(
+      backgroundColor: Colors.transparent,
+      insetPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 32),
+      child: ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: 720, maxHeight: 680),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(24),
+          child: BackdropFilter(
+            filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
+            child: Container(
+              decoration: BoxDecoration(
+                color: isDark
+                    ? scheme.surfaceContainerHigh.withValues(alpha: 0.88)
+                    : Colors.white.withValues(alpha: 0.94),
+                borderRadius: BorderRadius.circular(24),
+                border: Border.all(
+                  color: isDark
+                      ? Colors.white.withValues(alpha: 0.16)
+                      : scheme.outlineVariant.withValues(alpha: 0.4),
+                  width: 1.2,
+                ),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.black.withValues(alpha: isDark ? 0.45 : 0.12),
+                    blurRadius: 32,
+                    offset: const Offset(0, 12),
+                  ),
+                ],
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  // Header
+                  Padding(
+                    padding: const EdgeInsets.fromLTRB(24, 20, 16, 16),
+                    child: Row(
+                      children: [
+                        Container(
+                          padding: const EdgeInsets.all(10),
+                          decoration: BoxDecoration(
+                            color: scheme.primaryContainer.withValues(alpha: 0.7),
+                            borderRadius: BorderRadius.circular(14),
+                          ),
+                          child: Icon(
+                            Icons.keyboard_rounded,
+                            color: scheme.primary,
+                            size: 24,
+                          ),
+                        ),
+                        const SizedBox(width: 16),
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                'Горячие клавиши',
+                                style: theme.textTheme.titleLarge?.copyWith(
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                              const SizedBox(height: 2),
+                              Text(
+                                'Быстрое управление с клавиатуры для ПК',
+                                style: theme.textTheme.bodyMedium?.copyWith(
+                                  color: scheme.onSurfaceVariant,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        IconButton(
+                          onPressed: () => Navigator.of(context).pop(),
+                          icon: const Icon(Icons.close_rounded),
+                          tooltip: 'Закрыть (Esc)',
+                        ),
+                      ],
+                    ),
+                  ),
+                  const Divider(height: 1),
+
+                  // Shortcuts list
+                  Flexible(
+                    child: ListView(
+                      padding: const EdgeInsets.fromLTRB(24, 16, 24, 24),
+                      children: const [
+                        _ShortcutSection(
+                          icon: Icons.navigation_rounded,
+                          title: 'Общие и навигация',
+                          items: [
+                            _ShortcutRow(['Ctrl', '1…8'], 'Переключение между вкладками'),
+                            _ShortcutRow(['Ctrl', 'Tab'], 'Следующая вкладка'),
+                            _ShortcutRow(['Ctrl', 'Shift', 'Tab'], 'Предыдущая вкладка'),
+                            _ShortcutRow(['Ctrl', 'F'], 'Перейти к поиску / строка поиска'),
+                            _ShortcutRow(['Ctrl', 'R'], 'Обновить ленту / страницу'),
+                            _ShortcutRow(['F5'], 'Обновить страницу'),
+                            _ShortcutRow(['Esc'], 'Закрыть окно / назад / сбросить выбор'),
+                            _ShortcutRow(['?'], 'Открыть это окно горячих клавиш'),
+                          ],
+                        ),
+                        SizedBox(height: 20),
+                        _ShortcutSection(
+                          icon: Icons.smart_display_rounded,
+                          title: 'Видеоплеер',
+                          items: [
+                            _ShortcutRow(['Пробел'], 'Воспроизведение / Пауза'),
+                            _ShortcutRow(['←', '→'], 'Перемотка на 5 секунд назад / вперед'),
+                            _ShortcutRow(['Shift', '← / →'], 'Перемотка на 15 секунд'),
+                            _ShortcutRow(['↑', '↓'], 'Регулировка громкости (±5%)'),
+                            _ShortcutRow(['M'], 'Включить / выключить звук'),
+                            _ShortcutRow(['F'], 'Полноэкранный режим (Full Screen)'),
+                            _ShortcutRow(['L'], 'Повтор видео (Loop on/off)'),
+                            _ShortcutRow(['Esc'], 'Выйти из полноэкранного режима'),
+                          ],
+                        ),
+                        SizedBox(height: 20),
+                        _ShortcutSection(
+                          icon: Icons.photo_library_rounded,
+                          title: 'Фото и просмотр постов',
+                          items: [
+                            _ShortcutRow(['←', '→'], 'Предыдущее / следующее фото или пост'),
+                            _ShortcutRow(['+'], 'Увеличить масштаб (Zoom In)'),
+                            _ShortcutRow(['-'], 'Уменьшить масштаб (Zoom Out)'),
+                            _ShortcutRow(['0'], 'Сбросить масштаб (100%)'),
+                            _ShortcutRow(['F'], 'Подгонка по экрану / на весь экран'),
+                            _ShortcutRow(['D'], 'Скачать текущее изображение'),
+                            _ShortcutRow(['Ctrl', 'S'], 'Сохранить / Скачать файл'),
+                            _ShortcutRow(['Esc'], 'Сброс зума / назад'),
+                          ],
+                        ),
+                        SizedBox(height: 20),
+                        _ShortcutSection(
+                          icon: Icons.grid_view_rounded,
+                          title: 'Лента и посты',
+                          items: [
+                            _ShortcutRow(['R'], 'Открыть случайный пост'),
+                            _ShortcutRow(['V'], 'Включить/выключить режим выбора постов'),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ShortcutSection extends StatelessWidget {
+  const _ShortcutSection({
+    required this.icon,
+    required this.title,
+    required this.items,
+  });
+
+  final IconData icon;
+  final String title;
+  final List<_ShortcutRow> items;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+    final isDark = theme.brightness == Brightness.dark;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Icon(icon, size: 18, color: scheme.primary),
+            const SizedBox(width: 8),
+            Text(
+              title,
+              style: theme.textTheme.titleSmall?.copyWith(
+                fontWeight: FontWeight.bold,
+                color: scheme.primary,
+                letterSpacing: 0.3,
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: 8),
+        Container(
+          decoration: BoxDecoration(
+            color: isDark
+                ? scheme.surface.withValues(alpha: 0.6)
+                : scheme.surfaceContainerHighest.withValues(alpha: 0.4),
+            borderRadius: BorderRadius.circular(16),
+            border: Border.all(
+              color: isDark
+                  ? Colors.white.withValues(alpha: 0.08)
+                  : Colors.black.withValues(alpha: 0.04),
+            ),
+          ),
+          child: Column(
+            children: [
+              for (var i = 0; i < items.length; i++) ...[
+                if (i > 0)
+                  Divider(
+                    height: 1,
+                    thickness: 1,
+                    color: isDark
+                        ? Colors.white.withValues(alpha: 0.05)
+                        : Colors.black.withValues(alpha: 0.04),
+                  ),
+                items[i],
+              ],
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _ShortcutRow extends StatelessWidget {
+  const _ShortcutRow(this.keys, this.description);
+
+  final List<String> keys;
+  final String description;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final scheme = theme.colorScheme;
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
+      child: Row(
+        children: [
+          Expanded(
+            child: Text(
+              description,
+              style: theme.textTheme.bodyMedium?.copyWith(
+                color: scheme.onSurface,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          const SizedBox(width: 12),
+          Wrap(
+            spacing: 4,
+            runSpacing: 4,
+            children: keys.map((key) => _KeyCap(key)).toList(growable: false),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _KeyCap extends StatelessWidget {
+  const _KeyCap(this.text);
+
+  final String text;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final isDark = theme.brightness == Brightness.dark;
+    final scheme = theme.colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: isDark
+            ? scheme.surfaceContainerHighest.withValues(alpha: 0.9)
+            : Colors.white,
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(
+          color: isDark
+              ? Colors.white.withValues(alpha: 0.2)
+              : Colors.black.withValues(alpha: 0.15),
+          width: 1,
+        ),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withValues(alpha: isDark ? 0.4 : 0.08),
+            offset: const Offset(0, 1.5),
+            blurRadius: 1,
+          ),
+        ],
+      ),
+      child: Text(
+        text,
+        style: TextStyle(
+          fontFamily: 'monospace',
+          fontSize: 12,
+          fontWeight: FontWeight.bold,
+          color: scheme.onSurface,
+          letterSpacing: 0.2,
+        ),
+      ),
+    );
+  }
+}

lib/shared/widgets/post_card.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:collection';
+import 'dart:io';
 
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
@@ -232,7 +233,7 @@ class _PostCardState extends ConsumerState<PostCard>
                         }
                         final dpr = MediaQuery.devicePixelRatioOf(context);
                         final cacheWidth =
-                            (constraints.maxWidth * dpr).round().clamp(320, 1800);
+                            (constraints.maxWidth * dpr).round().clamp(280, 960);
                         final headers = _headersFor(post);
                         final videoUrls = MediaUrlSelector.video(post);
                         if (!mobile &&
@@ -590,7 +591,15 @@ class _FeedVideoPreviewState extends State<_FeedVideoPreview> {
     super.initState();
     MediaKit.ensureInitialized();
     _player = Player();
-    _controller = VideoController(_player);
+    final isDesktop =
+        Platform.isLinux || Platform.isWindows || Platform.isMacOS;
+    _controller = VideoController(
+      _player,
+      configuration: VideoControllerConfiguration(
+        enableHardwareAcceleration: !isDesktop,
+        hwdec: isDesktop ? 'no' : 'auto-safe',
+      ),
+    );
     _player.stream.error.listen((_) {
       if (mounted) setState(() => _failed = true);
     });

lib/shared/widgets/post_masonry_grid.dart

@@ -68,24 +68,26 @@ class PostMasonryGrid extends StatelessWidget {
     final spacing = mobile ? 8.0 : 12.0;
 
     Widget buildCard(Post post) {
-      return PostCard(
+      return RepaintBoundary(
-        post: post,
+        child: PostCard(
-        blurExplicit: blurExplicit && !nsfwEnabled,
+          post: post,
-        showBadges: showBadges,
+          blurExplicit: blurExplicit && !nsfwEnabled,
-        isFavorite: favoriteKeys.contains(post.cacheKey),
+          showBadges: showBadges,
-        isViewed: viewedKeys.contains(post.cacheKey),
+          isFavorite: favoriteKeys.contains(post.cacheKey),
-        isDownloaded: downloadedKeys.contains(post.cacheKey),
+          isViewed: viewedKeys.contains(post.cacheKey),
-        mediaQualityMode: mediaQualityMode,
+          isDownloaded: downloadedKeys.contains(post.cacheKey),
-        onOpen: () => onOpen(post),
+          mediaQualityMode: mediaQualityMode,
-        onFavorite: () => onFavorite(post),
+          onOpen: () => onOpen(post),
-        onPreview: onPreview == null ? null : () => onPreview!(post),
+          onFavorite: () => onFavorite(post),
-        onHide: onHide == null ? null : () => onHide!(post),
+          onPreview: onPreview == null ? null : () => onPreview!(post),
-        selectionMode: selectionMode,
+          onHide: onHide == null ? null : () => onHide!(post),
-        selected: selectedKeys.contains(post.cacheKey),
+          selectionMode: selectionMode,
-        onToggleSelected:
+          selected: selectedKeys.contains(post.cacheKey),
-            onToggleSelected == null ? null : () => onToggleSelected!(post),
+          onToggleSelected:
-        onAddToCollection:
+              onToggleSelected == null ? null : () => onToggleSelected!(post),
-            onAddToCollection == null ? null : () => onAddToCollection!(post),
+          onAddToCollection:
+              onAddToCollection == null ? null : () => onAddToCollection!(post),
+        ),
       );
     }
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: gel_rule_app
 description: Local backend/core layer for a Flutter booru browser app.
 publish_to: "none"
-version: 3.5.3+79
+version: 3.7.0+88
 
 environment:
   sdk: ">=3.3.0 <4.0.0"

test/backend/pawchive_provider_test.dart

@@ -111,5 +111,28 @@ void main() {
     expect(MediaUrlSelector.isAudio(photoPost), isFalse);
     expect(MediaUrlSelector.isVideo(photoPost), isFalse);
   });
+
+  test('MediaUrlSelector classifies mp4 containing "audio" in query parameter as video and not audio', () {
+    final trickyVideoPost = Post(
+      id: 'patreon:123:456:3',
+      providerId: 'pawchive',
+      providerName: 'Pawchive',
+      previewUrl: '',
+      sampleUrl: '',
+      fileUrl:
+          'https://file.pawchive.pw/data/b4/65/b465cb03ab7b26c0a677db3ae43500d1ef71e3e25151f160cda244c1fb40cfae.mp4?f=nsfw%202%20-%20audio%20spicy.mp4',
+      tags: const ['patreon', 'artist', 'nsfw 2 - audio spicy'],
+      rating: 'unknown',
+      width: 1920,
+      height: 1080,
+      createdAt: DateTime.now(),
+      fileType: 'video',
+      score: 0,
+    );
+
+    expect(MediaUrlSelector.isVideo(trickyVideoPost), isTrue);
+    expect(MediaUrlSelector.isAudio(trickyVideoPost), isFalse);
+    expect(MediaUrlSelector.video(trickyVideoPost), contains(trickyVideoPost.fileUrl));
+  });
 }
 

test/backend/provider_parser_test.dart

@@ -6,7 +6,6 @@ import 'package:gel_rule_app/backend/mappers/moebooru_mapper.dart';
 import 'package:gel_rule_app/backend/mappers/rule34_mapper.dart';
 import 'package:gel_rule_app/backend/models/content_provider_config.dart';
 import 'package:gel_rule_app/backend/providers/custom_provider.dart';
-import 'package:gel_rule_app/backend/providers/kemono_provider.dart';
 import 'package:gel_rule_app/backend/providers/provider_factory.dart';
 import 'package:gel_rule_app/backend/providers/realbooru_html_provider.dart';
 import 'package:gel_rule_app/backend/repositories/provider_repository.dart';
@@ -307,7 +306,7 @@ void main() {
     expect(provider, isA<RealbooruHtmlProvider>());
   });
 
-  test('provider factory creates Kemono and Coomer artist providers', () {
+  test('provider factory treats removed Kemono and Coomer as unsupported', () {
     final now = DateTime(2026);
     for (final apiType in ['kemono', 'coomer']) {
       final provider = ProviderFactory().create(ContentProviderConfig(
@@ -323,7 +322,7 @@ void main() {
         updatedAt: now,
       ));
 
-      expect(provider, isA<KemonoProvider>());
+      expect(provider, isA<UnsupportedCustomProvider>());
     }
   });
 }

test/features/tab_navigation_preservation_test.dart

@@ -0,0 +1,47 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gel_rule_app/backend/backend.dart';
+import 'package:gel_rule_app/shared/widgets/app_shell.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('Tab Navigation & State Preservation Tests', () {
+    test('AppShell branchIndexForLocation and locationForBranchIndex map correctly', () {
+      expect(AppShell.branchIndexForLocation('/'), 0);
+      expect(AppShell.branchIndexForLocation('/?q=test'), 0);
+      expect(AppShell.branchIndexForLocation('/search'), 1);
+      expect(AppShell.branchIndexForLocation('/favorites'), 2);
+      expect(AppShell.branchIndexForLocation('/viewed'), 3);
+      expect(AppShell.branchIndexForLocation('/collections'), 4);
+      expect(AppShell.branchIndexForLocation('/collections/123'), 4);
+      expect(AppShell.branchIndexForLocation('/artists'), 5);
+      expect(AppShell.branchIndexForLocation('/artists/pawchive/patreon/99'), 5);
+      expect(AppShell.branchIndexForLocation('/providers'), 6);
+      expect(AppShell.branchIndexForLocation('/settings'), 7);
+      expect(AppShell.branchIndexForLocation('/settings/hidden'), 7);
+
+      expect(AppShell.locationForBranchIndex(0), '/');
+      expect(AppShell.locationForBranchIndex(1), '/search');
+      expect(AppShell.locationForBranchIndex(2), '/favorites');
+      expect(AppShell.locationForBranchIndex(3), '/viewed');
+      expect(AppShell.locationForBranchIndex(4), '/collections');
+      expect(AppShell.locationForBranchIndex(5), '/artists');
+      expect(AppShell.locationForBranchIndex(6), '/providers');
+      expect(AppShell.locationForBranchIndex(7), '/settings');
+    });
+
+    test('AppSettings preserves lastActiveLocation in JSON serialization', () {
+      const defaults = AppSettings.defaults;
+      expect(defaults.lastActiveLocation, '/');
+
+      final updated = defaults.copyWith(lastActiveLocation: '/artists/pawchive/patreon/12345');
+      expect(updated.lastActiveLocation, '/artists/pawchive/patreon/12345');
+
+      final json = updated.toJson();
+      expect(json['lastActiveLocation'], '/artists/pawchive/patreon/12345');
+
+      final restored = AppSettings.fromJson(json);
+      expect(restored.lastActiveLocation, '/artists/pawchive/patreon/12345');
+    });
+  });
+}