From 1cec1bf82e9ef8d19b03d2b797037c9a9baae2a2 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Tue, 1 Apr 2025 00:46:46 +0800 Subject: [PATCH] :bug: Fix bugs --- api/Passport/Give Punishment.bru | 19 +++++ ios/Podfile.lock | 94 +++++++++++----------- lib/controllers/post_write_controller.dart | 6 +- lib/providers/keypair.dart | 2 +- lib/screens/post/post_editor.dart | 12 ++- 5 files changed, 80 insertions(+), 53 deletions(-) create mode 100644 api/Passport/Give Punishment.bru diff --git a/api/Passport/Give Punishment.bru b/api/Passport/Give Punishment.bru new file mode 100644 index 0000000..8814f97 --- /dev/null +++ b/api/Passport/Give Punishment.bru @@ -0,0 +1,19 @@ +meta { + name: Give Punishment + type: http + seq: 4 +} + +post { + url: {{endpoint}}/cgi/id/punishments + body: json + auth: inherit +} + +body:json { + { + "reason": "侮辱 Solar Network 商标，煽动颠覆中华羊国政权，制造不实信息，传播谣言，制造恐慌，寻衅滋事。", + "type": 0, + "account_id": 5 + } +} diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ecdf995..b97b491 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -46,58 +46,58 @@ PODS: - Flutter - file_saver (0.0.1): - Flutter - - Firebase/Analytics (11.8.0): + - Firebase/Analytics (11.10.0): - Firebase/Core - - Firebase/Core (11.8.0): + - Firebase/Core (11.10.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 11.8.0) - - Firebase/CoreOnly (11.8.0): - - FirebaseCore (~> 11.8.0) - - Firebase/Messaging (11.8.0): + - FirebaseAnalytics (~> 11.10.0) + - Firebase/CoreOnly (11.10.0): + - FirebaseCore (~> 11.10.0) + - Firebase/Messaging (11.10.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.8.0) - - firebase_analytics (11.4.4): - - Firebase/Analytics (= 11.8.0) + - FirebaseMessaging (~> 11.10.0) + - firebase_analytics (11.4.5): + - Firebase/Analytics (= 11.10.0) - firebase_core - Flutter - - firebase_core (3.12.1): - - Firebase/CoreOnly (= 11.8.0) + - firebase_core (3.13.0): + - Firebase/CoreOnly (= 11.10.0) - Flutter - - firebase_messaging (15.2.4): - - Firebase/Messaging (= 11.8.0) + - firebase_messaging (15.2.5): + - Firebase/Messaging (= 11.10.0) - firebase_core - Flutter - - FirebaseAnalytics (11.8.0): - - FirebaseAnalytics/AdIdSupport (= 11.8.0) - - FirebaseCore (~> 11.8.0) + - FirebaseAnalytics (11.10.0): + - FirebaseAnalytics/AdIdSupport (= 11.10.0) + - FirebaseCore (~> 11.10.0) - FirebaseInstallations (~> 11.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseAnalytics/AdIdSupport (11.8.0): - - FirebaseCore (~> 11.8.0) + - FirebaseAnalytics/AdIdSupport (11.10.0): + - FirebaseCore (~> 11.10.0) - FirebaseInstallations (~> 11.0) - - GoogleAppMeasurement (= 11.8.0) + - GoogleAppMeasurement (= 11.10.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - FirebaseCore (11.8.1): - - FirebaseCoreInternal (~> 11.8.0) + - FirebaseCore (11.10.0): + - FirebaseCoreInternal (~> 11.10.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.8.0): + - FirebaseCoreInternal (11.10.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.8.0): - - FirebaseCore (~> 11.8.0) + - FirebaseInstallations (11.10.0): + - FirebaseCore (~> 11.10.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.8.0): - - FirebaseCore (~> 11.8.0) + - FirebaseMessaging (11.10.0): + - FirebaseCore (~> 11.10.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) @@ -128,21 +128,21 @@ PODS: - gal (1.0.0): - Flutter - FlutterMacOS - - GoogleAppMeasurement (11.8.0): - - GoogleAppMeasurement/AdIdSupport (= 11.8.0) + - GoogleAppMeasurement (11.10.0): + - GoogleAppMeasurement/AdIdSupport (= 11.10.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/AdIdSupport (11.8.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0) + - GoogleAppMeasurement/AdIdSupport (11.10.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0) - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) - "GoogleUtilities/NSData+zlib (~> 8.0)" - nanopb (~> 3.30910.0) - - GoogleAppMeasurement/WithoutAdIdSupport (11.8.0): + - GoogleAppMeasurement/WithoutAdIdSupport (11.10.0): - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - GoogleUtilities/MethodSwizzler (~> 8.0) - GoogleUtilities/Network (~> 8.0) @@ -184,7 +184,7 @@ PODS: - Flutter - in_app_review (2.0.0): - Flutter - - Kingfisher (8.2.0) + - Kingfisher (8.3.1) - livekit_client (2.4.1): - Flutter - flutter_webrtc @@ -217,9 +217,9 @@ PODS: - receive_sharing_intent (1.8.1): - Flutter - SAMKeychain (1.5.3) - - SDWebImage (5.20.1): - - SDWebImage/Core (= 5.20.1) - - SDWebImage/Core (5.20.1) + - SDWebImage (5.21.0): + - SDWebImage/Core (= 5.21.0) + - SDWebImage/Core (5.21.0) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): @@ -422,15 +422,15 @@ SPEC CHECKSUMS: fast_rsa: d99f8e1809a4a312fa9216d830186869b2e9eb65 file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6 - Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf - firebase_analytics: 4e93dbe66872104d28ae9750fec1800e1fd66858 - firebase_core: 8d552814f6c01ccde5d88939fced4ec26f2f5510 - firebase_messaging: 8b96a4f09841c15a16b96973ef5c3dcfc1a064e4 - FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b - FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d - FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629 - FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917 - FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8 + Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2 + firebase_analytics: 1998960b8fa16fd0cd9e77a6f9fd35a2009ad65e + firebase_core: 2d4534e7b489907dcede540c835b48981d890943 + firebase_messaging: 75bc93a4df25faccad67f6662ae872ac9ae69b64 + FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef + FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7 + FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679 + FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3 + FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9 flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99 @@ -439,13 +439,13 @@ SPEC CHECKSUMS: flutter_udid: f7c3884e6ec2951efe4f9de082257fc77c4d15e9 flutter_webrtc: 57f32415b8744e806f9c2a96ccdb60c6a627ba33 gal: baecd024ebfd13c441269ca7404792a7152fde89 - GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896 + GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457 - Kingfisher: 323e5c4ec7983aaace12af655a7b51a7f88a599d + Kingfisher: 3204d23de16b5ea53541c44ca5a8efb55741dec3 livekit_client: 08755cabfa4da4ed455642f460cfbb39bc518070 livekit_noise_filter: a26aeb1c1eae6db0a023fd2f6ea3ff108c3ecbb0 LiveKitKrispNoiseFilter: efe418ceca28163ace0ff222bd2cc02384645d84 @@ -460,7 +460,7 @@ SPEC CHECKSUMS: PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00 SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c - SDWebImage: 33d0f23bddeb5d209ae959153883247be6703713 + SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868 share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 diff --git a/lib/controllers/post_write_controller.dart b/lib/controllers/post_write_controller.dart index e4b950e..fe0c04b 100644 --- a/lib/controllers/post_write_controller.dart +++ b/lib/controllers/post_write_controller.dart @@ -241,7 +241,9 @@ class PostWriteController extends ChangeNotifier { contentController.text = post.body['content'] ?? ''; aliasController.text = post.alias ?? ''; rewardController.text = post.body['reward']?.toString() ?? ''; - videoAttachment = SnAttachment.fromJson(post.body['video']); + videoAttachment = post.body['video'] != null + ? SnAttachment.fromJson(post.body['video']) + : null; publishedAt = post.publishedAt; publishedUntil = post.publishedUntil; visibleUsers = List.from(post.visibleUsersList ?? [], growable: true); @@ -253,7 +255,7 @@ class PostWriteController extends ChangeNotifier { List.from(post.categories.map((ele) => ele.alias), growable: true); attachments.addAll( post.body['attachments'] - .where(SnAttachment.fromJson) + ?.where((ele) => SnAttachment.fromJson(ele)) ?.map(PostWriteMedia) ?? [], ); diff --git a/lib/providers/keypair.dart b/lib/providers/keypair.dart index ce51709..9d12148 100644 --- a/lib/providers/keypair.dart +++ b/lib/providers/keypair.dart @@ -152,7 +152,7 @@ class KeyPairProvider { Future reloadActive({bool autoEnroll = true}) async { final kp = await (_dt.db.snLocalKeyPair.select() - ..where((e) => e.accountId.equals(_ua.user!.id)) + ..where((e) => e.accountId.equals(_ua.user?.id ?? 0)) ..where((e) => e.privateKey.isNotNull()) ..where((e) => e.isActive.equals(true)) ..limit(1)) diff --git a/lib/screens/post/post_editor.dart b/lib/screens/post/post_editor.dart index 372f28c..047b832 100644 --- a/lib/screens/post/post_editor.dart +++ b/lib/screens/post/post_editor.dart @@ -346,9 +346,15 @@ class _PostEditorScreenState extends State children: [ const Icon(Icons.edit, size: 16), const Gap(10), - Text('postEditingNotice').tr(args: [ - '@${_writeController.editingPost!.publisher.name}' - ]), + Expanded( + child: Text( + 'postEditingNotice', + maxLines: 1, + overflow: TextOverflow.ellipsis, + ).tr(args: [ + '@${_writeController.editingPost!.publisher.name}' + ]), + ), ], ), ),