Signed-off-by: dom <githubaccount56556@proton.me>
This commit is contained in:
dom
2026-05-06 14:14:19 +08:00
parent 1a8c348af1
commit 07843a5e77
239 changed files with 3175 additions and 13237 deletions

View File

@@ -1,6 +1,5 @@
import 'dart:convert';
import 'package:PiliPlus/common/widgets/pendant_avatar.dart';
import 'package:PiliPlus/models/common/dynamic/dynamics_type.dart';
import 'package:PiliPlus/models/dynamics/article_content_model.dart';
import 'package:PiliPlus/models/model_avatar.dart';
@@ -44,8 +43,6 @@ class DynamicsDataModel {
);
static bool enableFilter = banWordForDyn.pattern.isNotEmpty;
static bool antiGoodsDyn = Pref.antiGoodsDyn;
DynamicsDataModel.fromJson(
Map<String, dynamic> json, {
DynamicsTabType type = DynamicsTabType.all,
@@ -60,11 +57,10 @@ class DynamicsDataModel {
type != DynamicsTabType.up && tempBannedList?.isNotEmpty == true;
for (final e in list) {
DynamicItemModel item = DynamicItemModel.fromJson(e);
if (antiGoodsDyn &&
(item.orig?.modules.moduleDynamic?.additional?.type ==
'ADDITIONAL_TYPE_GOODS' ||
item.modules.moduleDynamic?.additional?.type ==
'ADDITIONAL_TYPE_GOODS')) {
if ((item.orig?.modules.moduleDynamic?.additional?.type ==
'ADDITIONAL_TYPE_GOODS' ||
item.modules.moduleDynamic?.additional?.type ==
'ADDITIONAL_TYPE_GOODS')) {
continue;
}
if (enableFilter) {
@@ -163,7 +159,6 @@ class ItemModulesModel {
ModuleDynamicModel? moduleDynamic;
// ModuleInterModel? moduleInter;
ModuleInteraction? moduleInteraction;
ModuleDispute? moduleDispute;
// 专栏
ModuleTop? moduleTop;
@@ -173,9 +168,6 @@ class ItemModulesModel {
ModuleBlocked? moduleBlocked;
ModuleFold? moduleFold;
static bool showDynDispute = Pref.showDynDispute;
static bool showDynInteraction = Pref.showDynInteraction;
ItemModulesModel.fromJson(Map<String, dynamic> json) {
moduleAuthor = json['module_author'] != null
? ModuleAuthorModel.fromJson(json['module_author'])
@@ -192,16 +184,9 @@ class ItemModulesModel {
moduleFold = json['module_fold'] != null
? ModuleFold.fromJson(json['module_fold'])
: null;
if (showDynInteraction) {
moduleInteraction = json['module_interaction'] != null
? ModuleInteraction.fromJson(json['module_interaction'])
: null;
}
if (showDynDispute) {
moduleDispute = json['module_dispute'] != null
? ModuleDispute.fromJson(json['module_dispute'])
: null;
}
moduleInteraction = json['module_interaction'] != null
? ModuleInteraction.fromJson(json['module_interaction'])
: null;
}
ItemModulesModel.fromOpusJson(List json) {
@@ -252,18 +237,6 @@ class ItemModulesModel {
}
}
class ModuleDispute {
String? title;
String? desc;
String? jumpUrl;
ModuleDispute.fromJson(Map<String, dynamic> json) {
title = json['title'];
desc = json['desc'];
jumpUrl = json['jump_url'];
}
}
class ModuleInteraction {
List<ModuleInteractionItem>? items;
@@ -424,13 +397,9 @@ class ModuleAuthorModel extends Avatar {
pubTime = json['pub_time'];
pubTs = json['pub_ts'] == 0 ? null : safeToInt(json['pub_ts']);
type = json['type'];
if (PendantAvatar.showDecorate) {
decorate = json['decorate'] == null
? null
: Decorate.fromJson(json['decorate']);
} else {
pendant = null;
}
decorate = json['decorate'] == null
? null
: Decorate.fromJson(json['decorate']);
isTop = json['is_top'];
badgeText = nonNullOrEmptyString(json['icon_badge']?['text']);
}