sevenhill/Qlyra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: папки

Browse Source
This commit is contained in:
Jganenokk
2026-08-10 15:08:06 +07:00
parent 8c8c87daaf
commit b57be4c661
12 changed files with 1842 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/folder_action_sheet_test.dart
+68
View File
@@ -0,0 +1,68 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:komet/backend/models/chat_folder.dart';
import 'package:komet/backend/modules/folders.dart';
import 'package:komet/frontend/screens/chats/folder_action_sheet.dart';
Future<void> _openSheet(WidgetTester tester, ChatFolder folder) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: Builder(
builder: (context) => TextButton(
onPressed: () => showFolderActionSheet(context, folder: folder),
child: const Text('open'),
),
),
),
),
);
await tester.tap(find.text('open'));
await tester.pumpAndSettle();
}
void main() {
testWidgets('a user folder offers edit, create and delete', (tester) async {
await _openSheet(
tester,
const ChatFolder(id: 'synthetic-folder', title: 'Работа'),
);
expect(find.text('Работа'), findsOneWidget);
expect(find.text('Изменить'), findsOneWidget);
expect(find.text('Новая папка'), findsOneWidget);
expect(find.text('Удалить'), findsOneWidget);
});
testWidgets('the all-chats folder can only spawn a new folder', (
tester,
) async {
await _openSheet(
tester,
const ChatFolder(id: FoldersModule.allChatsFolderId, title: 'Все чаты'),
);
expect(find.text('Изменить'), findsNothing);
expect(find.text('Удалить'), findsNothing);
expect(find.text('Новая папка'), findsOneWidget);
});
testWidgets('server options hide the forbidden actions', (tester) async {
await _openSheet(
tester,
const ChatFolder(
id: 'synthetic-system-folder',
title: 'Каналы',
options: [
FolderOption.noDelete,
FolderOption.noTitleEdit,
FolderOption.noFiltersEdit,
],
),
);
expect(find.text('Изменить'), findsNothing);
expect(find.text('Удалить'), findsNothing);
expect(find.text('Новая папка'), findsOneWidget);
});
}
test/folder_edit_sheet_test.dart
+114
View File
@@ -0,0 +1,114 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:komet/backend/models/chat_folder.dart';
import 'package:komet/frontend/screens/chats/folder_edit_sheet.dart';
import 'package:komet/frontend/widgets/sheet_helpers.dart';
Future<void> _openSheet(WidgetTester tester, {ChatFolder? folder}) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: Builder(
builder: (context) => TextButton(
onPressed: () => showFolderEditSheet(context, folder: folder),
child: const Text('open'),
),
),
),
),
);
await tester.tap(find.text('open'));
await tester.pump();
await tester.pump(const Duration(milliseconds: 400));
}
Future<void> _scrollToBottom(WidgetTester tester) async {
await tester.drag(find.byType(ListView), const Offset(0, -600));
await tester.pump(const Duration(milliseconds: 300));
}
SheetButton _button(WidgetTester tester, String label) =>
tester.widget<SheetButton>(
find.byWidgetPredicate((w) => w is SheetButton && w.label == label),
);
void main() {
testWidgets('the create layout shows every picker section', (tester) async {
await _openSheet(tester);
expect(find.text('Новая папка'), findsOneWidget);
expect(find.text('Название папки'), findsOneWidget);
expect(find.text('0/20'), findsOneWidget);
expect(find.text('ТИПЫ ЧАТОВ'), findsOneWidget);
expect(find.text('Контакты'), findsOneWidget);
expect(find.text('Не в контактах'), findsOneWidget);
expect(find.text('Группы'), findsOneWidget);
expect(find.text('Каналы'), findsOneWidget);
expect(find.text('Боты'), findsOneWidget);
await _scrollToBottom(tester);
expect(find.text('ПОКАЗЫВАТЬ ТОЛЬКО'), findsOneWidget);
expect(find.text('Чаты с уведомлениями'), findsOneWidget);
expect(find.text('Непрочитанные чаты'), findsOneWidget);
expect(find.text('Очистить выбор'), findsOneWidget);
expect(find.text('Создать папку'), findsOneWidget);
});
testWidgets('creating needs both a name and a selection', (tester) async {
await _openSheet(tester);
expect(_button(tester, 'Создать папку').onTap, isNull);
expect(_button(tester, 'Очистить выбор').onTap, isNull);
await tester.enterText(find.byType(TextField).first, 'Работа');
await tester.pump();
expect(_button(tester, 'Создать папку').onTap, isNull);
expect(find.text('6/20'), findsOneWidget);
await tester.tap(find.text('Каналы'));
await tester.pump(const Duration(milliseconds: 300));
expect(_button(tester, 'Создать папку').onTap, isNotNull);
expect(_button(tester, 'Очистить выбор').onTap, isNotNull);
await tester.tap(find.text('Очистить выбор'));
await tester.pump(const Duration(milliseconds: 300));
expect(_button(tester, 'Создать папку').onTap, isNull);
});
testWidgets('the edit layout preloads the folder and offers delete', (
tester,
) async {
await _openSheet(
tester,
folder: const ChatFolder(
id: 'synthetic-folder',
title: 'Каналы',
filters: [FolderFilter.channel, FolderFilter.unread],
),
);
expect(find.text('Изменение папки'), findsOneWidget);
expect(find.text('6/20'), findsOneWidget);
expect(find.text('Удалить папку'), findsOneWidget);
expect(find.text('Сохранить'), findsOneWidget);
expect(_button(tester, 'Сохранить').onTap, isNotNull);
expect(_button(tester, 'Удалить папку').onTap, isNotNull);
await _scrollToBottom(tester);
final unreadSwitch = tester.widget<Switch>(find.byType(Switch).last);
expect(unreadSwitch.value, isTrue);
});
testWidgets('a folder the server locks cannot be deleted', (tester) async {
await _openSheet(
tester,
folder: const ChatFolder(
id: 'synthetic-system-folder',
title: 'Каналы',
options: [FolderOption.noDelete],
),
);
expect(_button(tester, 'Удалить папку').onTap, isNull);
});
}
test/folders_module_test.dart
+214
View File
@@ -0,0 +1,214 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:komet/backend/models/chat_folder.dart';
import 'package:komet/backend/modules/chats.dart';
import 'package:komet/backend/modules/folders.dart';
const int _me = 4242;
const int _contactId = 777;
CachedChat _chat({
required int id,
required String type,
int unreadCount = 0,
int dontDisturbUntil = 0,
Set<String> options = const {},
int? owner,
}) => CachedChat(
id: id,
accountId: _me,
type: type,
title: 'chat $id',
unreadCount: unreadCount,
lastEventTime: 1700000000000,
cachedAt: 0,
dontDisturbUntil: dontDisturbUntil,
isOnline: false,
seenTime: 0,
participants: {_me: 1700000000000},
options: options,
owner: owner,
);
bool _matches(CachedChat chat, ChatFolder folder) =>
FoldersModule.chatMatchesFolder(
chat,
folder,
myId: _me,
contactIds: const {_contactId},
);
void main() {
group('ChatFolder.fromJson', () {
test('reads the server payload of FOLDERS_UPDATE', () {
final folder = ChatFolder.fromJson(const {
'id': '6fd177c5-ba2e-4360-9593-3ae798326806',
'title': 'Каналы',
'include': [111, -222],
'filters': [0, 11, 2],
'favorites': [111],
'options': [1, 2],
'updateTime': 1700000000000,
'sourceId': 1,
});
expect(folder.id, '6fd177c5-ba2e-4360-9593-3ae798326806');
expect(folder.include, [111, -222]);
expect(folder.filters, [
FolderFilter.unread,
FolderFilter.notMuted,
FolderFilter.channel,
]);
expect(folder.favorites, [111]);
expect(folder.updateTime, 1700000000000);
expect(folder.sourceId, 1);
expect(folder.canDelete, isFalse);
expect(folder.canEditTitle, isFalse);
expect(folder.canEditFilters, isTrue);
});
test('normalizes legacy string filters and the hideEmpty flag', () {
final folder = ChatFolder.fromJson(const {
'id': 'legacy',
'title': 'legacy',
'filters': ['CHANNEL', 'GROUP'],
'hideEmpty': true,
});
expect(folder.filters, [FolderFilter.channel, FolderFilter.chat]);
expect(folder.options, [FolderOption.hideEmpty]);
expect(folder.hideEmpty, isTrue);
});
});
group('chatMatchesFolder', () {
const channelsFolder = ChatFolder(
id: 'f1',
title: 'Каналы',
filters: [FolderFilter.channel],
);
test('type filters are combined with OR', () {
const folder = ChatFolder(
id: 'f2',
title: 'Каналы и боты',
filters: [FolderFilter.channel, FolderFilter.bot],
);
expect(_matches(_chat(id: 1, type: 'CHANNEL'), folder), isTrue);
expect(
_matches(_chat(id: 2, type: 'DIALOG', options: {'BOT'}), folder),
isTrue,
);
expect(_matches(_chat(id: 3, type: 'CHAT'), folder), isFalse);
});
test('a folder without filters only holds its included chats', () {
const folder = ChatFolder(id: 'f3', title: 'Свои', include: [10]);
expect(_matches(_chat(id: 10, type: 'CHAT'), folder), isTrue);
expect(_matches(_chat(id: 11, type: 'CHAT'), folder), isFalse);
});
test('show-only filters narrow both types and included chats', () {
const folder = ChatFolder(
id: 'f4',
title: 'Непрочитанные каналы',
include: [10],
filters: [FolderFilter.channel, FolderFilter.unread],
);
expect(
_matches(_chat(id: 1, type: 'CHANNEL', unreadCount: 3), folder),
isTrue,
);
expect(_matches(_chat(id: 2, type: 'CHANNEL'), folder), isFalse);
expect(
_matches(_chat(id: 10, type: 'CHAT', unreadCount: 1), folder),
isTrue,
);
expect(_matches(_chat(id: 10, type: 'CHAT'), folder), isFalse);
});
test('show-only filters are combined with AND', () {
const folder = ChatFolder(
id: 'f5',
title: 'Непрочитанные с уведомлениями',
filters: [
FolderFilter.channel,
FolderFilter.unread,
FolderFilter.notMuted,
],
);
expect(
_matches(_chat(id: 1, type: 'CHANNEL', unreadCount: 1), folder),
isTrue,
);
expect(
_matches(
_chat(id: 2, type: 'CHANNEL', unreadCount: 1, dontDisturbUntil: -1),
folder,
),
isFalse,
);
});
test('an expired mute counts as not muted', () {
const folder = ChatFolder(
id: 'f6',
title: 'С уведомлениями',
filters: [FolderFilter.channel, FolderFilter.notMuted],
);
expect(
_matches(
_chat(id: 1, type: 'CHANNEL', dontDisturbUntil: 1700000000000),
folder,
),
isTrue,
);
});
test('unknown filters do not empty a folder', () {
const folder = ChatFolder(
id: 'f7',
title: 'Каналы',
filters: [FolderFilter.channel, FolderFilter.markedUnread],
);
expect(_matches(_chat(id: 1, type: 'CHANNEL'), folder), isTrue);
});
test('role filters keep only chats with that role', () {
const folder = ChatFolder(
id: 'f8',
title: 'Мои группы',
filters: [FolderFilter.chat, FolderFilter.owner],
);
expect(_matches(_chat(id: 1, type: 'CHAT', owner: _me), folder), isTrue);
expect(_matches(_chat(id: 2, type: 'CHAT', owner: 5), folder), isFalse);
});
test('channels folder ignores groups and dialogs', () {
expect(_matches(_chat(id: 1, type: 'CHANNEL'), channelsFolder), isTrue);
expect(_matches(_chat(id: 2, type: 'CHAT'), channelsFolder), isFalse);
expect(_matches(_chat(id: 3, type: 'DIALOG'), channelsFolder), isFalse);
});
});
group('newFolderId', () {
test('generates distinct uuid v4 ids', () {
final a = FoldersModule.newFolderId();
final b = FoldersModule.newFolderId();
expect(a, isNot(b));
expect(
RegExp(
r'^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$',
).hasMatch(a),
isTrue,
);
});
});
}