🚸 Make block methods as one method.

openjmu · Feb 16, 2020 · 3470d86 · 3470d86
1 parent 43b6a46
commit 3470d86
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 56 deletions.
diff --git a/lib/api/user_api.dart b/lib/api/user_api.dart
@@ -169,9 +169,7 @@ class UserAPI {
     return users;
   }
 
-  ///
   /// Blacklists.
-  ///
   static final blacklist = <BlacklistUser>{};
 
   static Future getBlacklist({int pos, int size}) {
@@ -180,28 +178,45 @@ class UserAPI {
     );
   }
 
+  static void confirmBlock(context, BlacklistUser user) async {
+    final add = !UserAPI.blacklist.contains(user);
+    final confirm = await ConfirmationDialog.show(
+      context,
+      title: '${add ? '加入' : '移出'}黑名单',
+      content: '确定将此人${add ? '加入' : '移出'}黑名单吗?',
+      showConfirm: true,
+    );
+    if (confirm) {
+      if (add) {
+        UserAPI.fAddToBlacklist(user);
+      } else {
+        UserAPI.fRemoveFromBlacklist(user);
+      }
+    }
+  }
+
   static void fAddToBlacklist(BlacklistUser user) {
     if (blacklist.contains(user)) {
       showToast('仇恨值拉满啦！不要重复屏蔽噢~');
     } else {
       NetUtils.postWithCookieSet(API.addToBlacklist, data: {'fid': user.uid}).then((response) {
         blacklist.add(user);
-        showToast('屏蔽成功');
+        showToast('加入黑名单成功');
         Instances.eventBus.fire(BlacklistUpdateEvent());
         unFollow(user.uid, fromBlacklist: true);
       }).catchError((e) {
-        showToast('屏蔽失败');
+        showToast('加入黑名单失败');
         debugPrint('Add $user to blacklist failed : $e');
       });
     }
   }
 
   static void fRemoveFromBlacklist(BlacklistUser user) {
     blacklist.remove(user);
-    showToast('取消屏蔽成功');
+    showToast('移出黑名单成功');
     Instances.eventBus.fire(BlacklistUpdateEvent());
     NetUtils.postWithCookieSet(API.removeFromBlacklist, data: {'fid': user.uid}).catchError((e) {
-      showToast('取消屏蔽失败');
+      showToast('移出黑名单失败');
       debugPrint('Remove $user from blacklist failed: $e');
       if (blacklist.contains(user)) blacklist.remove(user);
       Instances.eventBus.fire(BlacklistUpdateEvent());

diff --git a/lib/pages/post/post_detail_page.dart b/lib/pages/post/post_detail_page.dart
@@ -226,8 +226,13 @@ class PostDetailPageState extends State<PostDetailPage> {
         )))
           ConfirmationBottomSheetAction(
             icon: Icon(Icons.visibility_off),
-            text: '屏蔽此人',
-            onTap: () => confirmBlock(context),
+            text: '${UserAPI.blacklist.contains(
+              BlacklistUser(uid: widget.post.uid, username: widget.post.nickname),
+            ) ? '移出' : '加入'}黑名单',
+            onTap: () => UserAPI.confirmBlock(
+              context,
+              BlacklistUser(uid: widget.post.uid, username: widget.post.nickname),
+            ),
           ),
         ConfirmationBottomSheetAction(
           icon: Icon(Icons.report),
@@ -238,18 +243,6 @@ class PostDetailPageState extends State<PostDetailPage> {
     );
   }
 
-  void confirmBlock(context) async {
-    final confirm = await ConfirmationDialog.show(
-      context,
-      title: '屏蔽此人',
-      content: '确定屏蔽此人吗',
-      showConfirm: true,
-    );
-    if (confirm) {
-      UserAPI.fAddToBlacklist(BlacklistUser(uid: widget.post.uid, username: widget.post.nickname));
-    }
-  }
-
   void confirmReport(context) async {
     final confirm = await ConfirmationDialog.show(
       context,

diff --git a/lib/widgets/cards/post_card.dart b/lib/widgets/cards/post_card.dart
@@ -549,12 +549,16 @@ class _PostCardState extends State<PostCard> {
     ConfirmationBottomSheet.show(
       context,
       children: <Widget>[
-        if (!UserAPI.blacklist.contains(widget.post.uid))
-          ConfirmationBottomSheetAction(
-            icon: Icon(Icons.visibility_off),
-            text: '屏蔽此人',
-            onTap: () => confirmBlock(context),
+        ConfirmationBottomSheetAction(
+          icon: Icon(Icons.visibility_off),
+          text: '${UserAPI.blacklist.contains(
+            BlacklistUser(uid: widget.post.uid, username: widget.post.nickname),
+          ) ? '移出' : '加入'}黑名单',
+          onTap: () => UserAPI.confirmBlock(
+            context,
+            BlacklistUser(uid: widget.post.uid, username: widget.post.nickname),
           ),
+        ),
         ConfirmationBottomSheetAction(
           icon: Icon(Icons.report),
           text: '举报动态',
@@ -564,18 +568,6 @@ class _PostCardState extends State<PostCard> {
     );
   }
 
-  void confirmBlock(context) async {
-    final confirm = await ConfirmationDialog.show(
-      context,
-      title: '屏蔽此人',
-      content: '确定屏蔽此人吗',
-      showConfirm: true,
-    );
-    if (confirm) {
-      UserAPI.fAddToBlacklist(BlacklistUser(uid: widget.post.uid, username: widget.post.nickname));
-    }
-  }
-
   void confirmReport(context) async {
     final confirm = await ConfirmationDialog.show(
       context,

diff --git a/lib/widgets/cards/team_post_preview_card.dart b/lib/widgets/cards/team_post_preview_card.dart
@@ -51,12 +51,16 @@ class TeamPostPreviewCard extends StatelessWidget {
     ConfirmationBottomSheet.show(
       context,
       children: <Widget>[
-        if (!UserAPI.blacklist.contains(BlacklistUser(uid: post.uid, username: post.nickname)))
-          ConfirmationBottomSheetAction(
-            icon: Icon(Icons.visibility_off),
-            text: '屏蔽此人',
-            onTap: () => confirmBlock(context),
+        ConfirmationBottomSheetAction(
+          icon: Icon(Icons.visibility_off),
+          text: '${UserAPI.blacklist.contains(
+            BlacklistUser(uid: post.uid, username: post.nickname),
+          ) ? '移出' : '加入'}黑名单',
+          onTap: () => UserAPI.confirmBlock(
+            context,
+            BlacklistUser(uid: post.uid, username: post.nickname),
           ),
+        ),
         ConfirmationBottomSheetAction(
           icon: Icon(Icons.report),
           text: '举报动态',
@@ -66,20 +70,6 @@ class TeamPostPreviewCard extends StatelessWidget {
     );
   }
 
-  void confirmBlock(context) async {
-    final provider = Provider.of<TeamPostProvider>(context, listen: false);
-    final post = provider.post;
-    final confirm = await ConfirmationDialog.show(
-      context,
-      title: '屏蔽此人',
-      content: '确定屏蔽此人吗?',
-      showConfirm: true,
-    );
-    if (confirm) {
-      UserAPI.fAddToBlacklist(BlacklistUser(uid: post.uid, username: post.nickname));
-    }
-  }
-
   void confirmReport(context) async {
     final provider = Provider.of<TeamPostProvider>(context, listen: false);
     final post = provider.post;