updated logic for following/unfollowing threads in place to match develop

Author: Oaphi

app/assets/javascripts/comments.js

@@ -355,19 +355,25 @@ $(() => {
       return;
     }
 
-    const data = await QPixel.followComments(postId);
+    const shouldFollow = action === 'follow';
 
-    QPixel.handleJSONResponse(data, () => {
-      const isFollowing = action === 'follow';
+    const data = shouldFollow ?
+                  await QPixel.followComments(postId) :
+                  await QPixel.unfollowComments(postId);
 
-      target.dataset.action = isFollowing ? 'unfollow' : 'follow';
+    QPixel.handleJSONResponse(data, () => {
+      target.dataset.action = shouldFollow ? 'unfollow' : 'follow';
 
       const icon = document.createElement('i');
-      icon.classList.add('fas', 'fa-fw', isFollowing ? 'fa-bell-slash' : 'fa-bell');
+      icon.classList.add('fas', 'fa-fw', shouldFollow ? 'fa-bell-slash' : 'fa-bell');
+      const text = document.createTextNode(` ${ shouldFollow ? 'Unfollow' : 'Follow' } new`);
+      target.replaceChildren(icon, text);
 
-      const text = document.createTextNode(` ${ isFollowing ? 'Unfollow' : 'Follow' } new`);
+      const form = target.closest('form');
 
-      target.replaceChildren(icon, text);
+      if (form) {
+        form.action = `/comments/post/${postId}/${shouldFollow ? 'unfollow' : 'follow'}`;
+      }
     });
   });
 });

app/views/posts/_follow_comments_link.html.erb

@@ -6,22 +6,21 @@
       user : User to check the following status for
 "%>
 
-<%= form_tag follow_post_comments_path(post_id: post.id), method: :post do %>
-  <% if post.followed_by?(user) %>
-    <%= button_tag type: :submit,
-                   class: "button is-muted is-outlined is-small js-follow-comments",
-                   data: { post_id: post.id, action: 'unfollow' },
-                   title: 'Don\'t follow new comment threads on this post',
-                   'aria-label': 'Unfollow new comment threads on this post' do %>
-      <i class="fas fa-fw fa-bell-slash"></i> Unfollow new
-    <% end %>
-  <% else %>
-    <%= button_tag type: :submit,
-                   class: "button is-muted is-outlined is-small js-follow-comments",
-                   data: { post_id: post.id, action: 'follow' },
-                   title: 'Follow all new comment threads on this post',
-                   'aria-label': 'Follow all new comment threads on this post' do %>
-      <i class="fas fa-fw fa-bell"></i> Follow new
-    <% end %>
+<%
+  is_followed = post.followed_by?(user)
+  action_path = is_followed ?
+                  unfollow_post_comments_path(post_id: post.id) :
+                  follow_post_comments_path(post_id: post.id)
+  text = "#{is_followed ? 'Unfollow' : 'Follow'} new"
+  title = 'Switch following new comment threads on this post'
+%>
+
+<%= form_tag action_path, method: :post do %>
+  <%= button_tag type: :submit,
+                 class: "button is-muted is-outlined is-small js-follow-comments",
+                 data: { post_id: post.id, action: is_followed ? 'unfollow' : 'follow' },
+                 aria: { label: title },
+                 title: title do %>
+    <i class="fas fa-fw <%= is_followed ? 'fa-bell-slash' : 'fa-bell' %>"></i> <%= text %>
   <% end %>
 <% end %>