From 416becc09a68e420e60e2cbfbb8949319d2a3cc8 Mon Sep 17 00:00:00 2001
From: Oleg Komarov <oleg@blender.org>
Date: Mon, 15 Jul 2024 00:07:26 +0200
Subject: [PATCH 1/5] Notifications: unsubscribe from extension approval
 activity (#177)

---
 .../reviewers/extensions_review_detail.html    | 14 ++++++++++++++
 reviewers/urls.py                              |  5 +++++
 reviewers/views.py                             | 18 +++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/reviewers/templates/reviewers/extensions_review_detail.html b/reviewers/templates/reviewers/extensions_review_detail.html
index f62ccc04..5bd4ede6 100644
--- a/reviewers/templates/reviewers/extensions_review_detail.html
+++ b/reviewers/templates/reviewers/extensions_review_detail.html
@@ -80,6 +80,20 @@
 <section id="activity" class="mt-4">
   <hr class="my-4">
   <h2>Activity</h2>
+  {% if request.user.is_authenticated %}
+    <form method="post" action="{% url 'reviewers:approval-follow' extension.slug %}">
+      {% csrf_token %}
+      <button type="submit" class="btn">
+      {% if user_is_following %}
+        <i class="i-bell-off"></i> Unsubscribe
+        <input type="hidden" name="follow" value="" />
+      {% else %}
+        <i class="i-bell"></i> Subscribe
+        <input type="hidden" name="follow" value="True" />
+      {% endif %}
+      </button>
+    </form>
+  {% endif %}
 
   {% if review_activity %}
   <ul class="activity-list">
diff --git a/reviewers/urls.py b/reviewers/urls.py
index cbc41f71..44263d6a 100644
--- a/reviewers/urls.py
+++ b/reviewers/urls.py
@@ -15,4 +15,9 @@ urlpatterns = [
         views.ExtensionsApprovalFormView.as_view(),
         name='approval-comment',
     ),
+    path(
+        'approval-queue-follow/<slug:slug>/',
+        views.ExtensionsApprovalFollowView.as_view(),
+        name='approval-follow',
+    ),
 ]
diff --git a/reviewers/views.py b/reviewers/views.py
index 4e6569e6..ec132496 100644
--- a/reviewers/views.py
+++ b/reviewers/views.py
@@ -1,12 +1,14 @@
 from collections import defaultdict
 import logging
 
+from actstream.actions import follow, is_following, unfollow
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic.list import ListView
 from django.views.generic import DetailView, FormView
-from django.shortcuts import reverse
+from django.shortcuts import redirect, reverse
 import django.forms
 
+from constants.activity import Flag
 from extensions.models import Extension
 from reviewers.forms import CommentForm
 from reviewers.models import ApprovalActivity
@@ -134,6 +136,7 @@ class ExtensionsApprovalDetailView(DetailView):
             form.fields['type'].widget.choices = choices
             if len(choices) == 1:
                 form.fields['type'].widget = django.forms.HiddenInput()
+            ctx['user_is_following'] = is_following(user, self.object, flag=Flag.REVIEWER)
         return ctx
 
 
@@ -158,3 +161,16 @@ class ExtensionsApprovalFormView(LoginRequiredMixin, FormView):
         form.save()
         self.approve_if_allowed(form)
         return super().form_valid(form)
+
+
+class ExtensionsApprovalFollowView(LoginRequiredMixin, DetailView):
+    model = Extension
+
+    def post(self, request, *args, **kwargs):
+        extension = self.get_object()
+        user = request.user
+        if request.POST.get('follow'):
+            follow(user, extension, flag=Flag.REVIEWER)
+        else:
+            unfollow(user, extension, flag=Flag.REVIEWER)
+        return redirect(extension.get_review_url() + '#activity')
-- 
2.30.2


From 68929fbe5441eeb5324474501b13847fccf3b48f Mon Sep 17 00:00:00 2001
From: Oleg Komarov <oleg@blender.org>
Date: Tue, 16 Jul 2024 17:05:13 +0200
Subject: [PATCH 2/5] hide the button from maintainers to avoid confusion

---
 reviewers/templates/reviewers/extensions_review_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reviewers/templates/reviewers/extensions_review_detail.html b/reviewers/templates/reviewers/extensions_review_detail.html
index 5bd4ede6..0daefdc0 100644
--- a/reviewers/templates/reviewers/extensions_review_detail.html
+++ b/reviewers/templates/reviewers/extensions_review_detail.html
@@ -80,7 +80,7 @@
 <section id="activity" class="mt-4">
   <hr class="my-4">
   <h2>Activity</h2>
-  {% if request.user.is_authenticated %}
+  {% if request.user.is_authenticated and not is_maintainer %}
     <form method="post" action="{% url 'reviewers:approval-follow' extension.slug %}">
       {% csrf_token %}
       <button type="submit" class="btn">
-- 
2.30.2


From 53587fd131615570b9933f35e5dd6ce83bbeb04d Mon Sep 17 00:00:00 2001
From: Oleg Komarov <oleg@blender.org>
Date: Tue, 16 Jul 2024 17:45:51 +0200
Subject: [PATCH 3/5] add a test

---
 reviewers/tests/test_notifications.py | 50 +++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 reviewers/tests/test_notifications.py

diff --git a/reviewers/tests/test_notifications.py b/reviewers/tests/test_notifications.py
new file mode 100644
index 00000000..92d79e57
--- /dev/null
+++ b/reviewers/tests/test_notifications.py
@@ -0,0 +1,50 @@
+from django.test import TestCase
+from django.urls import reverse
+
+from common.tests.factories.extensions import create_version
+from common.tests.factories.users import UserFactory
+from notifications.models import Notification
+from reviewers.models import ApprovalActivity
+
+
+class TestNotifications(TestCase):
+    def test_unsubscribe(self):
+        version = create_version()
+        extension = version.extension
+        some_user = UserFactory()
+        some_user2 = UserFactory()
+
+        self.client.force_login(some_user)
+        url = reverse('reviewers:approval-comment', args=[extension.slug])
+        self.client.post(url, {'type': ApprovalActivity.ActivityType.COMMENT, 'message': 'lala'})
+
+        notification_nr = Notification.objects.filter(recipient=some_user).count()
+        self.client.force_login(some_user2)
+        url = reverse('reviewers:approval-comment', args=[extension.slug])
+        self.client.post(url, {'type': ApprovalActivity.ActivityType.COMMENT, 'message': 'lala2'})
+        new_notification_nr = Notification.objects.filter(recipient=some_user).count()
+        self.assertEqual(new_notification_nr, notification_nr + 1)
+
+        # unsubscribe and see what happens
+        self.client.force_login(some_user)
+        url = reverse('reviewers:approval-follow', args=[extension.slug])
+        self.client.post(url, {'follow': ''})
+
+        self.client.force_login(some_user2)
+        url = reverse('reviewers:approval-comment', args=[extension.slug])
+        self.client.post(url, {'type': ApprovalActivity.ActivityType.COMMENT, 'message': 'lala3'})
+
+        new_notification_nr2 = Notification.objects.filter(recipient=some_user).count()
+        self.assertEqual(new_notification_nr2, new_notification_nr)
+
+        # subscribe back
+        self.client.force_login(some_user)
+        url = reverse('reviewers:approval-follow', args=[extension.slug])
+        self.client.post(url, {'follow': '1'})
+
+        self.client.force_login(some_user2)
+        url = reverse('reviewers:approval-comment', args=[extension.slug])
+        self.client.post(url, {'type': ApprovalActivity.ActivityType.COMMENT, 'message': 'lala4'})
+
+        new_notification_nr3 = Notification.objects.filter(recipient=some_user).count()
+        self.assertEqual(new_notification_nr3, new_notification_nr2 + 1)
-- 
2.30.2


From 3f56a87d743ef22a893b06e70522a17c808faa0a Mon Sep 17 00:00:00 2001
From: Oleg Komarov <oleg@blender.org>
Date: Wed, 17 Jul 2024 15:34:26 +0200
Subject: [PATCH 4/5] always set send_action=False

---
 reviewers/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reviewers/views.py b/reviewers/views.py
index ec132496..a119e363 100644
--- a/reviewers/views.py
+++ b/reviewers/views.py
@@ -170,7 +170,7 @@ class ExtensionsApprovalFollowView(LoginRequiredMixin, DetailView):
         extension = self.get_object()
         user = request.user
         if request.POST.get('follow'):
-            follow(user, extension, flag=Flag.REVIEWER)
+            follow(user, extension, send_action=False, flag=Flag.REVIEWER)
         else:
-            unfollow(user, extension, flag=Flag.REVIEWER)
+            unfollow(user, extension, send_action=False, flag=Flag.REVIEWER)
         return redirect(extension.get_review_url() + '#activity')
-- 
2.30.2


From e37f67c6ef5b5fc10808daec17ece9ffcd42b284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Lente?= <marton@blender.org>
Date: Tue, 30 Jul 2024 11:56:14 +0200
Subject: [PATCH 5/5] UI: Improve template reviewers extensions review detail
 approval activity subscription

Improve approval activity subscription buttons' display and layout
in template reviewers extensions_review_detail.
Part of #177
---
 .../reviewers/extensions_review_detail.html   | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/reviewers/templates/reviewers/extensions_review_detail.html b/reviewers/templates/reviewers/extensions_review_detail.html
index 0daefdc0..fa288e4c 100644
--- a/reviewers/templates/reviewers/extensions_review_detail.html
+++ b/reviewers/templates/reviewers/extensions_review_detail.html
@@ -79,21 +79,27 @@
 {% block extension_activity %}
 <section id="activity" class="mt-4">
   <hr class="my-4">
-  <h2>Activity</h2>
-  {% if request.user.is_authenticated and not is_maintainer %}
-    <form method="post" action="{% url 'reviewers:approval-follow' extension.slug %}">
-      {% csrf_token %}
-      <button type="submit" class="btn">
-      {% if user_is_following %}
-        <i class="i-bell-off"></i> Unsubscribe
-        <input type="hidden" name="follow" value="" />
-      {% else %}
-        <i class="i-bell"></i> Subscribe
-        <input type="hidden" name="follow" value="True" />
-      {% endif %}
-      </button>
-    </form>
-  {% endif %}
+  <div class="align-items-center d-flex w-100">
+    <h2>Activity</h2>
+    {% if request.user.is_authenticated and not is_maintainer %}
+      <form class="d-flex flex-column flex-grow-1" method="post" action="{% url 'reviewers:approval-follow' extension.slug %}">
+        {% csrf_token %}
+        {% if user_is_following %}
+          <button class="btn ms-auto" type="submit">
+            <i class="i-bell-off"></i> Unsubscribe
+            <input type="hidden" name="follow" value="" />
+          </button>
+          <small class="text-muted text-end">{% trans "You're receiving notifications because you're subscribed to this thread." %}</small>
+          {% else %}
+          <button class="btn ms-auto" type="submit">
+            <i class="i-bell"></i> Subscribe
+            <input type="hidden" name="follow" value="True" />
+          </button>
+          <small class="text-muted text-end">{% trans "You're not receiving notifications from this thread." %}</small>
+        {% endif %}
+      </form>
+    {% endif %}
+  </div>
 
   {% if review_activity %}
   <ul class="activity-list">
-- 
2.30.2