From 0877858380270af155a8b0fb0d41e5072ac90b14 Mon Sep 17 00:00:00 2001
From: shilangyu <xmarcinmarcin@gmail.com>
Date: Mon, 5 Oct 2020 14:37:43 +0200
Subject: [PATCH 1/3] added comments deletion, closes #16

---
 lib/widgets/comment.dart | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/lib/widgets/comment.dart b/lib/widgets/comment.dart
index c100405..b7641fa 100644
--- a/lib/widgets/comment.dart
+++ b/lib/widgets/comment.dart
@@ -98,6 +98,8 @@ class Comment extends HookWidget {
   }
 
   bool get isOP => commentTree.comment.creatorId == postCreatorId;
+  bool get isMine =>
+      commentTree.comment.creatorId == commentTree.comment.userId;
 
   @override
   Widget build(BuildContext context) {
@@ -106,12 +108,32 @@ class Comment extends HookWidget {
     final showRaw = useState(false);
     final collapsed = useState(false);
     final myVote = useState(commentTree.comment.myVote ?? VoteType.none);
+    final isDeleted = useState(commentTree.comment.deleted);
     final delayedVoting = useDelayedLoading();
+    final delayedDeletion = useDelayedLoading();
     final loggedInAction = useLoggedInAction(commentTree.comment.instanceUrl);
     final newReplies = useState(const <CommentTree>[]);
 
     final comment = commentTree.comment;
 
+    handleDelete(Jwt token) async {
+      final api = LemmyApi(token.payload.iss).v1;
+
+      delayedDeletion.start();
+      Navigator.of(context).pop();
+      try {
+        final res = await api.deleteComment(
+            editId: comment.id, deleted: !isDeleted.value, auth: token.raw);
+        isDeleted.value = res.deleted;
+        // ignore: avoid_catches_without_on_clauses
+      } catch (e) {
+        Scaffold.of(context).showSnackBar(
+            SnackBar(content: Text('Failed to delete/restore comment')));
+        return;
+      }
+      delayedDeletion.cancel();
+    }
+
     void _openMoreMenu(BuildContext context) {
       pop() => Navigator.of(context).pop();
 
@@ -165,6 +187,12 @@ class Comment extends HookWidget {
                 title: Text('Nerd stuff'),
                 onTap: () => _showCommentInfo(context),
               ),
+              if (isMine)
+                ListTile(
+                  leading: Icon(isDeleted.value ? Icons.restore : Icons.delete),
+                  title: Text(isDeleted.value ? 'Restore' : 'Delete'),
+                  onTap: loggedInAction(handleDelete),
+                )
             ],
           ),
         ),
@@ -209,7 +237,7 @@ class Comment extends HookWidget {
     }();
 
     final body = () {
-      if (comment.deleted) {
+      if (isDeleted.value) {
         return Flexible(
           child: Text(
             'comment deleted by creator',
@@ -254,7 +282,7 @@ class Comment extends HookWidget {
     final actions = collapsed.value
         ? SizedBox.shrink()
         : Row(children: [
-            if (selectable.value && !comment.deleted && !comment.removed)
+            if (selectable.value && !isDeleted.value && !comment.removed)
               _CommentAction(
                   icon: Icons.content_copy,
                   tooltip: 'copy',
@@ -268,6 +296,7 @@ class Comment extends HookWidget {
             _CommentAction(
               icon: Icons.more_horiz,
               onPressed: () => _openMoreMenu(context),
+              loading: delayedDeletion.loading,
               tooltip: 'more',
             ),
             _SaveComment(commentTree.comment),

From 5c8ec4f0e4ee8dcf7d56276316c4f71bae4a6b9c Mon Sep 17 00:00:00 2001
From: shilangyu <xmarcinmarcin@gmail.com>
Date: Mon, 5 Oct 2020 14:38:38 +0200
Subject: [PATCH 2/3] forbid replying to removed/deleted comments

---
 lib/widgets/comment.dart | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/widgets/comment.dart b/lib/widgets/comment.dart
index b7641fa..5e69edd 100644
--- a/lib/widgets/comment.dart
+++ b/lib/widgets/comment.dart
@@ -300,11 +300,12 @@ class Comment extends HookWidget {
               tooltip: 'more',
             ),
             _SaveComment(commentTree.comment),
-            _CommentAction(
-              icon: Icons.reply,
-              onPressed: loggedInAction((_) => reply()),
-              tooltip: 'reply',
-            ),
+            if (!isDeleted.value && !comment.removed)
+              _CommentAction(
+                icon: Icons.reply,
+                onPressed: loggedInAction((_) => reply()),
+                tooltip: 'reply',
+              ),
             _CommentAction(
               icon: Icons.arrow_upward,
               iconColor: myVote.value == VoteType.up ? theme.accentColor : null,

From 47ab40a4f65129712494bd1768bd53957f9dee79 Mon Sep 17 00:00:00 2001
From: shilangyu <xmarcinmarcin@gmail.com>
Date: Mon, 5 Oct 2020 21:38:19 +0200
Subject: [PATCH 3/3] moved delete action one higher

---
 lib/widgets/comment.dart | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/widgets/comment.dart b/lib/widgets/comment.dart
index 5e69edd..dee70ec 100644
--- a/lib/widgets/comment.dart
+++ b/lib/widgets/comment.dart
@@ -182,17 +182,17 @@ class Comment extends HookWidget {
                   pop();
                 },
               ),
-              ListTile(
-                leading: Icon(Icons.info_outline),
-                title: Text('Nerd stuff'),
-                onTap: () => _showCommentInfo(context),
-              ),
               if (isMine)
                 ListTile(
                   leading: Icon(isDeleted.value ? Icons.restore : Icons.delete),
                   title: Text(isDeleted.value ? 'Restore' : 'Delete'),
                   onTap: loggedInAction(handleDelete),
-                )
+                ),
+              ListTile(
+                leading: Icon(Icons.info_outline),
+                title: Text('Nerd stuff'),
+                onTap: () => _showCommentInfo(context),
+              ),
             ],
           ),
         ),