From 424dcad245a471657438a0a4aca1a2dc64d0adbf Mon Sep 17 00:00:00 2001
From: walidmujahid <walid.mujahid.dev@gmail.com>
Date: Wed, 19 Feb 2020 16:41:12 -0500
Subject: [PATCH] feat: enable editing townsquare comments

Comments can be edited. Editing can be cancled via Cancel button or
'Escape`.

This is part of the townsquare improvements:
https://github.com/gitcoinco/web/issues/6003

fixes https://github.com/gitcoinco/web/issues/6010
---
 app/assets/v2/js/activity.js                  | 203 +++++++++++++++---
 .../migrations/0086_merge_20200306_1527.py    |  14 ++
 .../migrations/0090_auto_20200312_0008.py     |  42 ----
 .../migrations/0090_auto_20200313_1425.py     |  19 --
 .../migrations/0090_merge_20200401_2017.py    |  14 ++
 .../migrations/0091_auto_20200401_2018.py     | 105 +++++++++
 .../migrations/0091_merge_20200316_2209.py    |  14 --
 .../migrations/0092_auto_20200316_2228.py     |  61 ------
 .../migrations/0093_auto_20200323_1304.py     |  18 --
 .../migrations/0094_auto_20200324_2138.py     |  18 --
 .../migrations/0095_hackathonevent_visible.py |  18 --
 .../migrations/0011_comment_is_edited.py      |  18 ++
 .../migrations/0013_merge_20200224_1243.py    |  14 ++
 .../migrations/0014_merge_20200304_0529.py    |  14 ++
 .../migrations/0015_merge_20200401_2017.py    |  14 ++
 .../migrations/0015_offer_comments_admin.py   |  18 --
 ...favorite.py => 0016_auto_20200401_2018.py} |  11 +-
 app/townsquare/models.py                      |   1 +
 app/townsquare/views.py                       |  24 +++
 19 files changed, 395 insertions(+), 245 deletions(-)
 create mode 100644 app/dashboard/migrations/0086_merge_20200306_1527.py
 delete mode 100644 app/dashboard/migrations/0090_auto_20200312_0008.py
 delete mode 100644 app/dashboard/migrations/0090_auto_20200313_1425.py
 create mode 100644 app/dashboard/migrations/0090_merge_20200401_2017.py
 create mode 100644 app/dashboard/migrations/0091_auto_20200401_2018.py
 delete mode 100644 app/dashboard/migrations/0091_merge_20200316_2209.py
 delete mode 100644 app/dashboard/migrations/0092_auto_20200316_2228.py
 delete mode 100644 app/dashboard/migrations/0093_auto_20200323_1304.py
 delete mode 100644 app/dashboard/migrations/0094_auto_20200324_2138.py
 delete mode 100644 app/dashboard/migrations/0095_hackathonevent_visible.py
 create mode 100644 app/townsquare/migrations/0011_comment_is_edited.py
 create mode 100644 app/townsquare/migrations/0013_merge_20200224_1243.py
 create mode 100644 app/townsquare/migrations/0014_merge_20200304_0529.py
 create mode 100644 app/townsquare/migrations/0015_merge_20200401_2017.py
 delete mode 100644 app/townsquare/migrations/0015_offer_comments_admin.py
 rename app/townsquare/migrations/{0016_favorite.py => 0016_auto_20200401_2018.py} (77%)

diff --git a/app/assets/v2/js/activity.js b/app/assets/v2/js/activity.js
index c1d5a9f2028..5200853830c 100644
--- a/app/assets/v2/js/activity.js
+++ b/app/assets/v2/js/activity.js
@@ -535,45 +535,91 @@ $(document).ready(function() {
       return;
     }
 
-    // user input
-    var comment = $parent.parents('.box').find('.comment_container textarea').val().trim();
+    if ($('.editableComment')[0]) {
+      // edited content
+      const comment = $parent.parents('.box').find('.editableComment').val();
 
-    // validation
-    if (!comment) {
-      return;
-    }
+      $('.editableComment').prop('disabled', true);
 
-    $parent.parents('.box').find('.comment_container textarea').prop('disabled', true);
-    $('.post_comment').prop('disabled', true);
+      // validation
+      if (!comment) {
+        $('.editableComment').prop('disabled', false);
+        return;
+      }
 
-    $parent.parents('.activity.box').find('.loading').removeClass('hidden');
-    var has_hidden_comments = $parent.parents('.activity.box').find('.row.comment_row.hidden').length;
-    // increment number
-    var num = $parent.find('span.num').html();
+      $parent.parents('.activity.box').find('.loading').removeClass('hidden');
 
-    num = parseInt(num) + 1;
-    $parent.find('span.num').html(num);
+      const has_hidden_comments = $parent.parents('.activity.box').find('.row.comment_row.hidden').length;
+      const num = $parent.find('span.num').html();
+      const comment_id = $('.editableComment').parent().closest('.comment_row').data('id');
+      const url = '/api/v0.1/comment/' + comment_id;
+      const params = {
+        'method': 'EDIT',
+        'comment': comment,
+        'csrfmiddlewaretoken': $('input[name=csrfmiddlewaretoken]').val()
+      };
 
-    // remote post
-    var params = {
-      'method': 'comment',
-      'comment': comment,
-      'csrfmiddlewaretoken': $('input[name=csrfmiddlewaretoken]').val()
-    };
-    var url = '/api/v0.1/activity/' + $parent.data('pk');
+      $.post(url, params, function(response) {
+        const success_callback = function($parent) {
+          $.noop(); // do nothing
+        };
 
-    $.post(url, params, function(response) {
-      var success_callback = function($parent) {
-        $parent.parents('.box').find('.comment_container textarea').val('');
-        $parent.find('textarea').focus();
+        view_comments($parent, allow_close_comment_container, success_callback);
+      }).always(function() {
+        $parent.parents('.activity.box').find('.loading').addClass('hidden');
+        $parent.parents('.box').find('.comment_container textarea').prop('disabled', false);
+        $('.editableComment').prop('disabled', false);
+        $(`.comment_row[data-id="${comment_id}"] .comment_options`).prop('disabled', false).removeClass('hidden');
+        $(`.comment_row[data-id="${comment_id}"]`).parent().closest('.box')
+          .find('#container-post_comment')
+          .find('*').prop('disabled', false).removeClass('hidden');
+        // TODO: automatically cancel editing when another edit_comment button is clicked
+        $('.edit_comment').prop('disabled', false);
+      });
+    } else {
+      // user input
+      const comment = $parent.parents('.box').find('.comment_container textarea').val().trim();
+
+      $parent.parents('.box').find('.comment_container textarea').prop('disabled', true);
+      $('.post_comment').prop('disabled', true);
+
+      // validation
+      if (!comment) {
+        $parent.parents('.box').find('.comment_container textarea').prop('disabled', false);
+        $('.post_comment').prop('disabled', false);
+        return;
+      }
+
+
+      $parent.parents('.activity.box').find('.loading').removeClass('hidden');
+      const has_hidden_comments = $parent.parents('.activity.box').find('.row.comment_row.hidden').length;
+
+      // increment number
+      let num = $parent.find('span.num').html();
 
+      num = parseInt(num) + 1;
+      $parent.find('span.num').html(num);
+
+      // remote post
+      const params = {
+        'method': 'comment',
+        'comment': comment,
+        'csrfmiddlewaretoken': $('input[name=csrfmiddlewaretoken]').val()
       };
-      var override_hide_comments = !has_hidden_comments;
+      const url = '/api/v0.1/activity/' + $parent.data('pk');
 
-      view_comments($parent, allow_close_comment_container, success_callback, override_hide_comments);
-    }).done(function() {
-      // pass
-    })
+      $.post(url, params, function(response) {
+        const success_callback = function($parent) {
+          $parent.parents('.box').find('.comment_container textarea').val('');
+          $parent.find('textarea').focus();
+
+        };
+        const override_hide_comments = !has_hidden_comments;
+
+        view_comments($parent, allow_close_comment_container, success_callback, override_hide_comments);
+      }).done(function() {
+        // pass
+      })
       .fail(function() {
         $parent.parents('.activity.box').find('.error').removeClass('hidden');
       })
@@ -582,6 +628,7 @@ $(document).ready(function() {
         $parent.parents('.box').find('.comment_container textarea').prop('disabled', false);
         $('.post_comment').prop('disabled', false);
       });
+    }
   };
 
   // converts an object to a dict
@@ -637,6 +684,7 @@ $(document).ready(function() {
         const timeAgo = timedifferenceCvrt(new Date(comment['created_on']));
         const show_tip = true;
         const is_comment_owner = document.contxt.github_handle == comment['profile_handle'];
+        const is_edited = typeof comment['is_edited'] !== 'undefined' ? comment['is_edited'] : false;
         var sorted_match_curve_html = '';
 
         if (comment['sorted_match_curve']) {
@@ -646,6 +694,7 @@ $(document).ready(function() {
           for (let j = 0; j < match_curve.length; j++) {
             let ele = match_curve[j];
 
+
             sorted_match_curve_html += '<li>';
             sorted_match_curve_html += `Your contribution of ${ele.name} could yield $${Math.round(ele.value * 1000) / 1000} in matching.`;
             sorted_match_curve_html += '</li>';
@@ -707,11 +756,14 @@ $(document).ready(function() {
               </span>
               <span class='float-right'>
                 <span class="d-none d-sm-inline grey font-smaller-5 text-right">
-                  ${timeAgo}
+                  ${timeAgo} ${is_edited ? '(edited)' : ''}
                 </span>
-                <span class="font-smaller-5 mt-1" style="display: block; text-align: right;">
+                <span class="comment_options font-smaller-5 mt-1" style="display: block; text-align: right;">
                   ${is_comment_owner ?
     `<i data-pk=${comment['id']} class="delete_comment fas fa-trash font-smaller-7 position-relative text-black-70 mr-1 cursor-pointer" style="top:-1px; "></i>| `
+    : ''}
+    ${is_comment_owner ?
+    `<i data-pk=${comment['id']} class="edit_comment fas fa-edit font-smaller-7 position-relative text-black-70 mr-1 cursor-pointer" style="top:-1px; "></i>| `
     : ''}
                   ${show_tip ? `
                   <span class="action like px-0 ${comment['is_liked'] ? 'open' : ''}" data-toggle="tooltip" title="Liked by ${comment['likes']}">
@@ -735,7 +787,7 @@ $(document).ready(function() {
       }
 
       const post_comment_html = `
-        <div class="row py-2 mx-auto">
+        <div id="container-post_comment" class="row py-2 mx-auto">
           <div class="col-sm-1 mt-1 activity-avatar d-none d-sm-inline">
             <img src="/dynamic/avatar/${document.contxt.github_handle}">
           </div>
@@ -836,6 +888,59 @@ $(document).ready(function() {
     post_comment($target, false);
   });
 
+
+  // cancel editing comment
+  $(document).on('click', '.cancel_edit', function(e) {
+    e.preventDefault();
+    const comment_id = $(this).data('id');
+    const editableContainer = $('#editableContainer');
+
+    const url = '/api/v0.1/comment/' + comment_id;
+    const params = {
+      'method': 'GET_COMMENT'
+    };
+
+    $.get(url, params, function(response) {
+      let the_comment = response['comment'];
+
+      the_comment = urlify(the_comment);
+      the_comment = linkify(the_comment);
+      the_comment = the_comment.replace(/\r\n|\r|\n/g, '<br />');
+
+      editableContainer.replaceWith(`<div class="activity_comments_main_comment">${the_comment}</div>`);
+
+    }).always(function() {
+      $(`.comment_row[data-id="${comment_id}"] .comment_options`).prop('disabled', false).removeClass('hidden');
+      $(`.comment_row[data-id="${comment_id}"]`).parent().closest('.box')
+        .find('#container-post_comment')
+        .find('*').prop('disabled', false).removeClass('hidden');
+      // TODO: automatically cancel editing when another edit_comment button is clicked
+      $('.edit_comment').prop('disabled', false);
+    });
+  });
+
+
+  $(document).on('click', '.edit_comment', function(e) {
+    e.preventDefault();
+    let comment_id = $(this).data('pk');
+    let commentContainer = $(`.comment_row[data-id="${comment_id}"] .activity_comments_main_comment`);
+    let content = commentContainer.html().replace(/<br>/g, '\n').trim();
+    let editableContainer = $(`<div id="editableContainer" class="col-12 col-sm-12 text-right"><textarea class="form-control bg-lightblue font-caption editableComment" cols="80" rows="3" data-id="${comment_id}">${content}</textarea><a href=# class="btn btn-gc-blue btn-sm mt-2 font-smaller-7 font-weight-bold cancel_edit" data-id="${comment_id}">CANCEL</a></div>`);
+
+    $(`.comment_row[data-id="${comment_id}"] .comment_options`).prop('disabled', true).addClass('hidden');
+    $(`.comment_row[data-id="${comment_id}"]`).parent().closest('.box')
+      .find('#container-post_comment')
+      .find('*').prop('disabled', true).addClass('hidden');
+
+    commentContainer.replaceWith(editableContainer);
+
+    $(`#editableContainer textarea[data-id="${comment_id}`).focus();
+
+    // TODO: automatically cancel editing when another edit_comment button is clicked
+    $('.edit_comment').prop('disabled', true);
+  });
+
+
   $(document).on('click', '.delete_comment', function(e) {
     e.preventDefault();
     const comment_id = $(this).data('pk');
@@ -865,12 +970,42 @@ $(document).ready(function() {
   });
 
 
-  $(document).on('keypress', '.enter-activity-comment', function(e) {
+  $(document).on('keyup keydown keypress', '.enter-activity-comment, .editableComment', function(e) {
     if (e.which == 13 && !e.shiftKey) {
       const $target = $(this).parents('.activity.box').find('.comment_activity');
 
       post_comment($target, false);
     }
+
+    if (e.key === 'Escape' && typeof $('.editableComment')[0] != 'undefined') {
+      const comment_id = $(this).data('id');
+      const editableContainer = $('#editableContainer');
+
+      const url = '/api/v0.1/comment/' + comment_id;
+      const params = {
+        'method': 'GET_COMMENT'
+      };
+
+      $.get(url, params, function(response) {
+        let the_comment = response['comment'];
+
+        the_comment = urlify(the_comment);
+        the_comment = linkify(the_comment);
+        the_comment = the_comment.replace(/\r\n|\r|\n/g, '<br />');
+
+        editableContainer.replaceWith(`<div class="activity_comments_main_comment">${the_comment}</div>`);
+
+      }).always(function() {
+        $(`.comment_row[data-id="${comment_id}"] .comment_options`)
+          .prop('disabled', false)
+          .removeClass('hidden');
+        $(`.comment_row[data-id="${comment_id}"]`).parent().closest('.box')
+          .find('#container-post_comment')
+          .find('*').prop('disabled', false).removeClass('hidden');
+        // TODO: automatically cancel editing when another edit_comment button is clicked
+        $('.edit_comment').prop('disabled', false);
+      });
+    }
   });
 
   // post comment activity
diff --git a/app/dashboard/migrations/0086_merge_20200306_1527.py b/app/dashboard/migrations/0086_merge_20200306_1527.py
new file mode 100644
index 00000000000..001e76d11ef
--- /dev/null
+++ b/app/dashboard/migrations/0086_merge_20200306_1527.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2020-03-06 15:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0085_activity_hackathonevent'),
+        ('dashboard', '0085_merge_20200303_2256'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/dashboard/migrations/0090_auto_20200312_0008.py b/app/dashboard/migrations/0090_auto_20200312_0008.py
deleted file mode 100644
index 5590bd5bc10..00000000000
--- a/app/dashboard/migrations/0090_auto_20200312_0008.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-12 00:08
-
-from django.db import migrations, models
-import economy.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0089_merge_20200310_1649'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='bounty',
-            name='payout_confirmed',
-        ),
-        migrations.RemoveField(
-            model_name='bounty',
-            name='payout_tx_id',
-        ),
-        migrations.AddField(
-            model_name='bountyfulfillment',
-            name='payout_amount',
-            field=models.DecimalField(blank=True, decimal_places=4, max_digits=50, null=True),
-        ),
-        migrations.AddField(
-            model_name='bountyfulfillment',
-            name='payout_status',
-            field=models.CharField(blank=True, choices=[('pending', 'pending'), ('done', 'done')], max_length=10),
-        ),
-        migrations.AddField(
-            model_name='bountyfulfillment',
-            name='payout_tx_id',
-            field=models.CharField(blank=True, default='0x0', max_length=255),
-        ),
-        migrations.AddField(
-            model_name='bountyfulfillment',
-            name='token_name',
-            field=models.CharField(blank=True, max_length=10),
-        ),
-    ]
diff --git a/app/dashboard/migrations/0090_auto_20200313_1425.py b/app/dashboard/migrations/0090_auto_20200313_1425.py
deleted file mode 100644
index 573aed923b3..00000000000
--- a/app/dashboard/migrations/0090_auto_20200313_1425.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-13 14:25
-
-from django.db import migrations, models
-import economy.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0089_merge_20200310_1649'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='last_calc_date',
-            field=models.DateTimeField(default=economy.models.get_0_time),
-        ),
-    ]
diff --git a/app/dashboard/migrations/0090_merge_20200401_2017.py b/app/dashboard/migrations/0090_merge_20200401_2017.py
new file mode 100644
index 00000000000..a0712edef93
--- /dev/null
+++ b/app/dashboard/migrations/0090_merge_20200401_2017.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2020-04-01 20:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0086_merge_20200306_1527'),
+        ('dashboard', '0089_merge_20200310_1649'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/dashboard/migrations/0091_auto_20200401_2018.py b/app/dashboard/migrations/0091_auto_20200401_2018.py
new file mode 100644
index 00000000000..a0df0602ca3
--- /dev/null
+++ b/app/dashboard/migrations/0091_auto_20200401_2018.py
@@ -0,0 +1,105 @@
+# Generated by Django 2.2.4 on 2020-04-01 20:18
+
+from django.db import migrations, models
+import economy.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dashboard', '0090_merge_20200401_2017'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='bounty',
+            name='payout_confirmed',
+        ),
+        migrations.RemoveField(
+            model_name='bounty',
+            name='payout_tx_id',
+        ),
+        migrations.RemoveField(
+            model_name='profile',
+            name='last_chat_seen',
+        ),
+        migrations.RemoveField(
+            model_name='profile',
+            name='last_chat_status',
+        ),
+        migrations.AddField(
+            model_name='bountyfulfillment',
+            name='payout_amount',
+            field=models.DecimalField(blank=True, decimal_places=4, max_digits=50, null=True),
+        ),
+        migrations.AddField(
+            model_name='bountyfulfillment',
+            name='payout_status',
+            field=models.CharField(blank=True, choices=[('pending', 'pending'), ('done', 'done')], max_length=10),
+        ),
+        migrations.AddField(
+            model_name='bountyfulfillment',
+            name='payout_tx_id',
+            field=models.CharField(blank=True, default='0x0', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='bountyfulfillment',
+            name='token_name',
+            field=models.CharField(blank=True, max_length=10),
+        ),
+        migrations.AddField(
+            model_name='hackathonevent',
+            name='visible',
+            field=models.BooleanField(default=True, help_text='Can this HackathonEvent be seeing on /hackathons ?'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='average_rating',
+            field=models.DecimalField(decimal_places=2, default=0, help_text='avg feedback from those who theyve done work with', max_digits=50),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='earnings_count',
+            field=models.IntegerField(db_index=True, default=0, help_text='How many times has user earned crypto with Gitcoin'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='follower_count',
+            field=models.IntegerField(db_index=True, default=0, help_text='how many users follow them'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='following_count',
+            field=models.IntegerField(db_index=True, default=0, help_text='how many users are they following'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='is_org',
+            field=models.BooleanField(db_index=True, default=True, help_text='Is this profile an org?'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='organizations_fk',
+            field=models.ManyToManyField(blank=True, to='dashboard.Profile'),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='spent_count',
+            field=models.IntegerField(db_index=True, default=0, help_text='How many times has user spent crypto with Gitcoin'),
+        ),
+        migrations.AlterField(
+            model_name='activity',
+            name='activity_type',
+            field=models.CharField(blank=True, choices=[('wall_post', 'Wall Post'), ('status_update', 'Update status'), ('new_bounty', 'New Bounty'), ('start_work', 'Work Started'), ('stop_work', 'Work Stopped'), ('work_submitted', 'Work Submitted'), ('work_done', 'Work Done'), ('worker_approved', 'Worker Approved'), ('worker_rejected', 'Worker Rejected'), ('worker_applied', 'Worker Applied'), ('increased_bounty', 'Increased Funding'), ('killed_bounty', 'Canceled Bounty'), ('new_tip', 'New Tip'), ('receive_tip', 'Tip Received'), ('bounty_abandonment_escalation_to_mods', 'Escalated checkin from @gitcoinbot about bounty status'), ('bounty_abandonment_warning', 'Checkin from @gitcoinbot about bounty status'), ('bounty_removed_slashed_by_staff', 'Dinged and Removed from Bounty by Staff'), ('bounty_removed_by_staff', 'Removed from Bounty by Staff'), ('bounty_removed_by_funder', 'Removed from Bounty by Funder'), ('new_crowdfund', 'New Crowdfund Contribution'), ('new_grant', 'New Grant'), ('update_grant', 'Updated Grant'), ('killed_grant', 'Cancelled Grant'), ('negative_contribution', 'Negative Grant Contribution'), ('new_grant_contribution', 'Contributed to Grant'), ('new_grant_subscription', 'Subscribed to Grant'), ('killed_grant_contribution', 'Cancelled Grant Contribution'), ('new_milestone', 'New Milestone'), ('update_milestone', 'Updated Milestone'), ('new_kudos', 'New Kudos'), ('created_kudos', 'Created Kudos'), ('receive_kudos', 'Receive Kudos'), ('joined', 'Joined Gitcoin'), ('played_quest', 'Played Quest'), ('beat_quest', 'Beat Quest'), ('created_quest', 'Created Quest'), ('updated_avatar', 'Updated Avatar'), ('mini_clr_payout', 'Mini CLR Payout'), ('leaderboard_rank', 'Leaderboard Rank'), ('consolidated_leaderboard_rank', 'Consolidated Leaderboard Rank'), ('consolidated_mini_clr_payout', 'Consolidated CLR Payout'), ('hackathon_registration', 'Hackathon Registration'), ('flagged_grant', 'Flagged Grant')], db_index=True, max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='hide_profile',
+            field=models.BooleanField(db_index=True, default=True, help_text='If this option is chosen, we will remove your profile information all_together'),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='last_calc_date',
+            field=models.DateTimeField(default=economy.models.get_0_time),
+        ),
+    ]
diff --git a/app/dashboard/migrations/0091_merge_20200316_2209.py b/app/dashboard/migrations/0091_merge_20200316_2209.py
deleted file mode 100644
index 7e4b083a28e..00000000000
--- a/app/dashboard/migrations/0091_merge_20200316_2209.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-16 22:09
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0090_auto_20200312_0008'),
-        ('dashboard', '0090_auto_20200313_1425'),
-    ]
-
-    operations = [
-    ]
diff --git a/app/dashboard/migrations/0092_auto_20200316_2228.py b/app/dashboard/migrations/0092_auto_20200316_2228.py
deleted file mode 100644
index bdf2e343556..00000000000
--- a/app/dashboard/migrations/0092_auto_20200316_2228.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-16 22:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0091_merge_20200316_2209'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='profile',
-            name='last_chat_seen',
-        ),
-        migrations.RemoveField(
-            model_name='profile',
-            name='last_chat_status',
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='average_rating',
-            field=models.DecimalField(decimal_places=2, default=0, help_text='avg feedback from those who theyve done work with', max_digits=50),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='earnings_count',
-            field=models.IntegerField(db_index=True, default=0, help_text='How many times has user earned crypto with Gitcoin'),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='follower_count',
-            field=models.IntegerField(db_index=True, default=0, help_text='how many users follow them'),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='following_count',
-            field=models.IntegerField(db_index=True, default=0, help_text='how many users are they following'),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='is_org',
-            field=models.BooleanField(db_index=True, default=True, help_text='Is this profile an org?'),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='organizations_fk',
-            field=models.ManyToManyField(blank=True, to='dashboard.Profile'),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='spent_count',
-            field=models.IntegerField(db_index=True, default=0, help_text='How many times has user spent crypto with Gitcoin'),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='hide_profile',
-            field=models.BooleanField(db_index=True, default=True, help_text='If this option is chosen, we will remove your profile information all_together'),
-        ),
-    ]
diff --git a/app/dashboard/migrations/0093_auto_20200323_1304.py b/app/dashboard/migrations/0093_auto_20200323_1304.py
deleted file mode 100644
index d98554eecf6..00000000000
--- a/app/dashboard/migrations/0093_auto_20200323_1304.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-23 13:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0092_auto_20200316_2228'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='activity',
-            name='activity_type',
-            field=models.CharField(blank=True, choices=[('wall_post', 'Wall Post'), ('status_update', 'Update status'), ('new_bounty', 'New Bounty'), ('start_work', 'Work Started'), ('stop_work', 'Work Stopped'), ('work_submitted', 'Work Submitted'), ('work_done', 'Work Done'), ('worker_approved', 'Worker Approved'), ('worker_rejected', 'Worker Rejected'), ('worker_applied', 'Worker Applied'), ('increased_bounty', 'Increased Funding'), ('killed_bounty', 'Canceled Bounty'), ('new_tip', 'New Tip'), ('receive_tip', 'Tip Received'), ('bounty_abandonment_escalation_to_mods', 'Escalated checkin from @gitcoinbot about bounty status'), ('bounty_abandonment_warning', 'Checkin from @gitcoinbot about bounty status'), ('bounty_removed_slashed_by_staff', 'Dinged and Removed from Bounty by Staff'), ('bounty_removed_by_staff', 'Removed from Bounty by Staff'), ('bounty_removed_by_funder', 'Removed from Bounty by Funder'), ('new_crowdfund', 'New Crowdfund Contribution'), ('new_grant', 'New Grant'), ('update_grant', 'Updated Grant'), ('killed_grant', 'Cancelled Grant'), ('negative_contribution', 'Negative Grant Contribution'), ('new_grant_contribution', 'Contributed to Grant'), ('new_grant_subscription', 'Subscribed to Grant'), ('killed_grant_contribution', 'Cancelled Grant Contribution'), ('new_milestone', 'New Milestone'), ('update_milestone', 'Updated Milestone'), ('new_kudos', 'New Kudos'), ('created_kudos', 'Created Kudos'), ('receive_kudos', 'Receive Kudos'), ('joined', 'Joined Gitcoin'), ('played_quest', 'Played Quest'), ('beat_quest', 'Beat Quest'), ('created_quest', 'Created Quest'), ('updated_avatar', 'Updated Avatar'), ('mini_clr_payout', 'Mini CLR Payout'), ('leaderboard_rank', 'Leaderboard Rank'), ('consolidated_leaderboard_rank', 'Consolidated Leaderboard Rank'), ('consolidated_mini_clr_payout', 'Consolidated CLR Payout'), ('hackathon_registration', 'Hackathon Registration')], db_index=True, max_length=50),
-        ),
-    ]
diff --git a/app/dashboard/migrations/0094_auto_20200324_2138.py b/app/dashboard/migrations/0094_auto_20200324_2138.py
deleted file mode 100644
index 06fd158702a..00000000000
--- a/app/dashboard/migrations/0094_auto_20200324_2138.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-24 21:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0093_auto_20200323_1304'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='activity',
-            name='activity_type',
-            field=models.CharField(blank=True, choices=[('wall_post', 'Wall Post'), ('status_update', 'Update status'), ('new_bounty', 'New Bounty'), ('start_work', 'Work Started'), ('stop_work', 'Work Stopped'), ('work_submitted', 'Work Submitted'), ('work_done', 'Work Done'), ('worker_approved', 'Worker Approved'), ('worker_rejected', 'Worker Rejected'), ('worker_applied', 'Worker Applied'), ('increased_bounty', 'Increased Funding'), ('killed_bounty', 'Canceled Bounty'), ('new_tip', 'New Tip'), ('receive_tip', 'Tip Received'), ('bounty_abandonment_escalation_to_mods', 'Escalated checkin from @gitcoinbot about bounty status'), ('bounty_abandonment_warning', 'Checkin from @gitcoinbot about bounty status'), ('bounty_removed_slashed_by_staff', 'Dinged and Removed from Bounty by Staff'), ('bounty_removed_by_staff', 'Removed from Bounty by Staff'), ('bounty_removed_by_funder', 'Removed from Bounty by Funder'), ('new_crowdfund', 'New Crowdfund Contribution'), ('new_grant', 'New Grant'), ('update_grant', 'Updated Grant'), ('killed_grant', 'Cancelled Grant'), ('negative_contribution', 'Negative Grant Contribution'), ('new_grant_contribution', 'Contributed to Grant'), ('new_grant_subscription', 'Subscribed to Grant'), ('killed_grant_contribution', 'Cancelled Grant Contribution'), ('new_milestone', 'New Milestone'), ('update_milestone', 'Updated Milestone'), ('new_kudos', 'New Kudos'), ('created_kudos', 'Created Kudos'), ('receive_kudos', 'Receive Kudos'), ('joined', 'Joined Gitcoin'), ('played_quest', 'Played Quest'), ('beat_quest', 'Beat Quest'), ('created_quest', 'Created Quest'), ('updated_avatar', 'Updated Avatar'), ('mini_clr_payout', 'Mini CLR Payout'), ('leaderboard_rank', 'Leaderboard Rank'), ('consolidated_leaderboard_rank', 'Consolidated Leaderboard Rank'), ('consolidated_mini_clr_payout', 'Consolidated CLR Payout'), ('hackathon_registration', 'Hackathon Registration'), ('flagged_grant', 'Flagged Grant')], db_index=True, max_length=50),
-        ),
-    ]
diff --git a/app/dashboard/migrations/0095_hackathonevent_visible.py b/app/dashboard/migrations/0095_hackathonevent_visible.py
deleted file mode 100644
index a50b027b947..00000000000
--- a/app/dashboard/migrations/0095_hackathonevent_visible.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-27 18:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dashboard', '0094_auto_20200324_2138'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='hackathonevent',
-            name='visible',
-            field=models.BooleanField(default=True, help_text='Can this HackathonEvent be seeing on /hackathons ?'),
-        ),
-    ]
diff --git a/app/townsquare/migrations/0011_comment_is_edited.py b/app/townsquare/migrations/0011_comment_is_edited.py
new file mode 100644
index 00000000000..e815c96fd2a
--- /dev/null
+++ b/app/townsquare/migrations/0011_comment_is_edited.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-02-22 17:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('townsquare', '0010_comment_likes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='comment',
+            name='is_edited',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/app/townsquare/migrations/0013_merge_20200224_1243.py b/app/townsquare/migrations/0013_merge_20200224_1243.py
new file mode 100644
index 00000000000..8d2bc1d1e19
--- /dev/null
+++ b/app/townsquare/migrations/0013_merge_20200224_1243.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2020-02-24 12:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('townsquare', '0012_matchranking_match_curve'),
+        ('townsquare', '0011_comment_is_edited'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/townsquare/migrations/0014_merge_20200304_0529.py b/app/townsquare/migrations/0014_merge_20200304_0529.py
new file mode 100644
index 00000000000..f9aa7290ec6
--- /dev/null
+++ b/app/townsquare/migrations/0014_merge_20200304_0529.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2020-03-04 05:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('townsquare', '0013_merge_20200224_1243'),
+        ('townsquare', '0013_suggestedaction'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/townsquare/migrations/0015_merge_20200401_2017.py b/app/townsquare/migrations/0015_merge_20200401_2017.py
new file mode 100644
index 00000000000..6d638b30ca9
--- /dev/null
+++ b/app/townsquare/migrations/0015_merge_20200401_2017.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2020-04-01 20:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('townsquare', '0014_merge_20200304_0529'),
+        ('townsquare', '0014_auto_20200319_1901'),
+    ]
+
+    operations = [
+    ]
diff --git a/app/townsquare/migrations/0015_offer_comments_admin.py b/app/townsquare/migrations/0015_offer_comments_admin.py
deleted file mode 100644
index 9e271752007..00000000000
--- a/app/townsquare/migrations/0015_offer_comments_admin.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2.4 on 2020-03-31 14:26
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('townsquare', '0014_auto_20200319_1901'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='offer',
-            name='comments_admin',
-            field=models.TextField(blank=True, default=''),
-        ),
-    ]
diff --git a/app/townsquare/migrations/0016_favorite.py b/app/townsquare/migrations/0016_auto_20200401_2018.py
similarity index 77%
rename from app/townsquare/migrations/0016_favorite.py
rename to app/townsquare/migrations/0016_auto_20200401_2018.py
index f7692beb963..4857f45dae9 100644
--- a/app/townsquare/migrations/0016_favorite.py
+++ b/app/townsquare/migrations/0016_auto_20200401_2018.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.4 on 2020-03-09 09:26
+# Generated by Django 2.2.4 on 2020-04-01 20:18
 
 from django.conf import settings
 from django.db import migrations, models
@@ -10,11 +10,16 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('dashboard', '0095_hackathonevent_visible'),
-        ('townsquare', '0015_offer_comments_admin'),
+        ('dashboard', '0091_auto_20200401_2018'),
+        ('townsquare', '0015_merge_20200401_2017'),
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='offer',
+            name='comments_admin',
+            field=models.TextField(blank=True, default=''),
+        ),
         migrations.CreateModel(
             name='Favorite',
             fields=[
diff --git a/app/townsquare/models.py b/app/townsquare/models.py
index d89fd609117..bd40ae732be 100644
--- a/app/townsquare/models.py
+++ b/app/townsquare/models.py
@@ -60,6 +60,7 @@ class Comment(SuperModel):
     likes = ArrayField(models.IntegerField(), default=list, blank=True) #pks of users who like this post
     likes_handles = ArrayField(models.CharField(max_length=200, blank=True), default=list, blank=True) #handles of users who like this post
     tip_count_eth = models.DecimalField(default=0, decimal_places=5, max_digits=50)
+    is_edited = models.BooleanField(default=False)
 
     def __str__(self):
         return f"Comment of {self.activity.pk} by {self.profile.handle}: {self.comment}"
diff --git a/app/townsquare/views.py b/app/townsquare/views.py
index ad3444247d7..fb02910748d 100644
--- a/app/townsquare/views.py
+++ b/app/townsquare/views.py
@@ -466,6 +466,8 @@ def api(request, activity_id):
             counter += 1; results[counter] += time.time() - start_time; start_time = time.time()
             comment_dict['sorted_match_curve'] = comment.profile.matchranking_this_round.sorted_match_curve if comment.profile.matchranking_this_round else None
             counter += 1; results[counter] += time.time() - start_time; start_time = time.time()
+            if comment.is_edited:
+                comment_dict['is_edited'] = comment.is_edited
             response['comments'].append(comment_dict)
         for key, val in results.items():
             if settings.DEBUG:
@@ -595,6 +597,28 @@ def comment_v1(request, comment_id):
         }
         return JsonResponse(response)
 
+    if method == 'EDIT':
+        content = request.POST.get('comment')
+        title = request.POST.get('comment')
+
+        comment.comment = content
+        comment.is_edited = True
+        comment.save()
+        response = {
+            'status': 203,
+            'message': 'comment successfully updated'
+        }
+        return JsonResponse(response)
+
+    # no perms needed responses go here
+    if request.GET.get('method') == 'GET_COMMENT':
+        response = {
+            'status': 202,
+            'message': 'comment successfully retrieved',
+            'comment': comment.comment,
+        }
+        return JsonResponse(response)
+
     return JsonResponse(response)