Merge branch 'dev' into happi/dev/database-update

# Conflicts:
#	apps/im_app/lib/data/models/user_dto.dart
#	apps/im_app/lib/data/remote/login_request.dart
#	apps/im_app/lib/features/chat/presentation/chat_db_test_view_model.dart
#	apps/im_app/lib/features/chat/view/chat_db_test_page.dart
#	apps/im_app/lib/features/login/presentation/login_view_model.dart
This commit is contained in:
Happi (哈比)
2026-03-09 15:08:45 +08:00
163 changed files with 4341 additions and 1785 deletions

View File

@@ -119,4 +119,4 @@ class CallLogDto {
deletedAt: Value(deletedAt),
isRead: Value(isRead),
);
}
}

View File

@@ -176,4 +176,4 @@ class ChatBotDto {
isAllowForward: Value(isAllowForward),
tips: Value(tips),
);
}
}

View File

@@ -87,4 +87,4 @@ class ChatCategoryDto {
updatedAt: Value(updatedAt),
deletedAt: Value(deletedAt),
);
}
}

View File

@@ -197,4 +197,4 @@ class Chat {
localPermission: localPermission ?? this.localPermission,
);
}
}
}

View File

@@ -109,4 +109,4 @@ class DiscoverMiniApp {
screen: screen ?? this.screen,
);
}
}
}

View File

@@ -143,34 +143,33 @@ class ExploreMiniAppDto {
screen: screen,
);
factory ExploreMiniAppDto.fromEntity(ExploreMiniApp app) =>
ExploreMiniAppDto(
id: app.id,
name: app.name,
openuid: app.openuid,
devId: app.devId,
icon: app.icon,
iconGaussian: app.iconGaussian,
downloadUrl: app.downloadUrl,
description: app.description,
version: app.version,
typ: app.typ,
flag: app.flag,
reviewStatus: app.reviewStatus,
favoriteAt: app.favoriteAt,
isActive: app.isActive,
createdAt: app.createdAt,
updatedAt: app.updatedAt,
deletedAt: app.deletedAt,
score: app.score,
channels: app.channels,
devName: app.devName,
pictureGaussian: app.pictureGaussian,
picture: app.picture,
commentNum: app.commentNum,
lastLoginAt: app.lastLoginAt,
screen: app.screen,
);
factory ExploreMiniAppDto.fromEntity(ExploreMiniApp app) => ExploreMiniAppDto(
id: app.id,
name: app.name,
openuid: app.openuid,
devId: app.devId,
icon: app.icon,
iconGaussian: app.iconGaussian,
downloadUrl: app.downloadUrl,
description: app.description,
version: app.version,
typ: app.typ,
flag: app.flag,
reviewStatus: app.reviewStatus,
favoriteAt: app.favoriteAt,
isActive: app.isActive,
createdAt: app.createdAt,
updatedAt: app.updatedAt,
deletedAt: app.deletedAt,
score: app.score,
channels: app.channels,
devName: app.devName,
pictureGaussian: app.pictureGaussian,
picture: app.picture,
commentNum: app.commentNum,
lastLoginAt: app.lastLoginAt,
screen: app.screen,
);
ExploreMiniAppsCompanion toCompanion() => ExploreMiniAppsCompanion(
id: Value(id),
@@ -199,4 +198,4 @@ class ExploreMiniAppDto {
lastLoginAt: Value(lastLoginAt),
screen: Value(screen),
);
}
}

View File

@@ -199,4 +199,4 @@ class FavoriteMiniAppDto {
lastLoginAt: Value(lastLoginAt),
screen: Value(screen),
);
}
}

View File

@@ -80,4 +80,4 @@ class FavouriteDetailDto {
chatId: Value(chatId),
sendTime: Value(sendTime),
);
}
}

View File

@@ -127,4 +127,4 @@ class FavouriteDto {
isUploaded: Value(isUploaded),
urls: Value(urls),
);
}
}

View File

@@ -218,4 +218,4 @@ class GroupDto {
topic: Value(topic),
rp: Value(rp),
);
}
}

View File

@@ -134,4 +134,4 @@ class MessageDto {
flag: Value(flag),
cmid: Value(cmid),
);
}
}

View File

@@ -31,33 +31,33 @@ class PendingFriendRequestHistoryDto {
);
Map<String, dynamic> toJson() => {
'id': id,
'uid': uid,
'request_time': requestTime,
'remarks': remarks,
'source': source,
'rs': rs,
};
'id': id,
'uid': uid,
'request_time': requestTime,
'remarks': remarks,
'source': source,
'rs': rs,
};
PendingFriendRequestHistory toEntity() => PendingFriendRequestHistory(
id: id,
uid: uid,
requestTime: requestTime,
remarks: remarks,
source: source,
rs: rs,
);
id: id,
uid: uid,
requestTime: requestTime,
remarks: remarks,
source: source,
rs: rs,
);
factory PendingFriendRequestHistoryDto.fromEntity(
PendingFriendRequestHistory history) =>
PendingFriendRequestHistoryDto(
id: history.id,
uid: history.uid,
requestTime: history.requestTime,
remarks: history.remarks,
source: history.source,
rs: history.rs,
);
PendingFriendRequestHistory history,
) => PendingFriendRequestHistoryDto(
id: history.id,
uid: history.uid,
requestTime: history.requestTime,
remarks: history.remarks,
source: history.source,
rs: history.rs,
);
PendingFriendRequestHistoriesCompanion toCompanion() =>
PendingFriendRequestHistoriesCompanion(
@@ -68,4 +68,4 @@ class PendingFriendRequestHistoryDto {
source: Value(source),
rs: Value(rs),
);
}
}

View File

@@ -198,4 +198,4 @@ class RecentMiniAppDto {
lastLoginAt: Value(lastLoginAt),
screen: Value(screen),
);
}
}

View File

@@ -106,4 +106,4 @@ class RetryDto {
createTime: Value(createTime),
addIndex: Value(addIndex),
);
}
}

View File

@@ -85,4 +85,4 @@ class SoundDto {
channelGroupId: Value(channelGroupId),
isDefault: Value(isDefault),
);
}
}

View File

@@ -71,4 +71,4 @@ class TagDto {
updatedAt: Value(updatedAt),
addIndex: Value(addIndex),
);
}
}

View File

@@ -8,11 +8,7 @@ class UserRequestHistoryDto {
final int? status;
final int? createdAt;
const UserRequestHistoryDto({
required this.id,
this.status,
this.createdAt,
});
const UserRequestHistoryDto({required this.id, this.status, this.createdAt});
factory UserRequestHistoryDto.fromJson(Map<String, dynamic> json) =>
UserRequestHistoryDto(
@@ -27,11 +23,8 @@ class UserRequestHistoryDto {
'created_at': createdAt,
};
UserRequestHistory toEntity() => UserRequestHistory(
id: id,
status: status,
createdAt: createdAt,
);
UserRequestHistory toEntity() =>
UserRequestHistory(id: id, status: status, createdAt: createdAt);
factory UserRequestHistoryDto.fromEntity(UserRequestHistory history) =>
UserRequestHistoryDto(
@@ -40,10 +33,9 @@ class UserRequestHistoryDto {
createdAt: history.createdAt,
);
UserRequestHistoriesCompanion toCompanion() =>
UserRequestHistoriesCompanion(
id: Value(id),
status: Value(status),
createdAt: Value(createdAt),
);
}
UserRequestHistoriesCompanion toCompanion() => UserRequestHistoriesCompanion(
id: Value(id),
status: Value(status),
createdAt: Value(createdAt),
);
}

View File

@@ -113,4 +113,4 @@ class WorkspaceDto {
deletedAt: Value(deletedAt),
channelGroupId: Value(channelGroupId),
);
}
}