Merge ~ilasc/launchpad:fix-expose-send-notifications into launchpad:master

[Ioana Lasc]

Separate Bug.newMessage into internal and API methods

[Colin Watson (cjwatson)]

review: Approve

diff --git a/lib/lp/bugs/browser/bugtarget.py b/lib/lp/bugs/browser/bugtarget.py
index e59af36..e7b3dc6 100644
--- a/lib/lp/bugs/browser/bugtarget.py
+++ b/lib/lp/bugs/browser/bugtarget.py
@@ -648,7 +648,7 @@ class FileBugViewBase(LaunchpadFormView):
         attachment = self.request.form.get(self.widgets["filecontent"].name)
         if attachment or extra_data.attachments:
             # Attach all the comments to a single empty comment.
-            attachment_comment = bug.newMessage(
+            attachment_comment = bug.newMessage_internal(
                 owner=self.user,
                 subject=bug.followup_subject(),
                 content=None,
diff --git a/lib/lp/bugs/interfaces/bug.py b/lib/lp/bugs/interfaces/bug.py
index ab4e2fc..9697660 100644
--- a/lib/lp/bugs/interfaces/bug.py
+++ b/lib/lp/bugs/interfaces/bug.py
@@ -1045,6 +1045,11 @@ class IBugAppend(Interface):
     def newMessage(owner, subject, content, send_notifications=True):
         """Create a new message, and link it to this object."""
 
+    def newMessage_internal(owner, subject, content, send_notifications=True):
+        """Create a new message, and link it to this object.
+        This method is used internally mostly by the UI.
+        """
+
     @operation_parameters(
         person=Reference(IPerson, title=_("Person"), required=True),
         level=Choice(
diff --git a/lib/lp/bugs/model/bug.py b/lib/lp/bugs/model/bug.py
index 7685c10..5b1465c 100644
--- a/lib/lp/bugs/model/bug.py
+++ b/lib/lp/bugs/model/bug.py
@@ -1487,6 +1487,37 @@ class Bug(SQLBase, InformationTypeMixin):
         remote_comment_id=None,
         send_notifications=True,
     ):
+        # Admins, commercial admins, registry experts, pillar owners,
+        # pillar drivers, and pillar bug supervisors should be able
+        # to disable email notifications
+        if not send_notifications:
+            authz = getAdapter(self, IAuthorization, "launchpad.Moderate")
+            if not authz.checkAuthenticated(IPersonRoles(owner)):
+                raise CannotDisableNotifications(
+                    "Email notifications can only "
+                    "be disabled by admins, commercial admins, "
+                    "registry experts, or bug supervisors."
+                )
+        return self.newMessage_internal(
+            owner=owner,
+            subject=subject,
+            content=content,
+            parent=parent,
+            bugwatch=bugwatch,
+            remote_comment_id=remote_comment_id,
+            send_notifications=send_notifications,
+        )
+
+    def newMessage_internal(
+        self,
+        owner=None,
+        subject=None,
+        content=None,
+        parent=None,
+        bugwatch=None,
+        remote_comment_id=None,
+        send_notifications=True,
+    ):
         """Create a new Message and link it to this bug."""
         if subject is None:
             subject = self.followup_subject()
@@ -1504,18 +1535,6 @@ class Bug(SQLBase, InformationTypeMixin):
         if not bugmsg:
             return
 
-        # Admins, commercial admins, registry experts, pillar owners,
-        # pillar drivers, and pillar bug supervisors should be able
-        # to disable email notifications
-        authz = getAdapter(self, IAuthorization, "launchpad.Moderate")
-        if not authz.checkAuthenticated(IPersonRoles(owner)):
-            raise CannotDisableNotifications(
-                "Email notifications can only "
-                "be disabled by admins, commercial admins, "
-                "registry experts, pillar owners, pillar drivers "
-                "or pillar bug supervisors."
-            )
-
         if send_notifications:
             notify(ObjectCreatedEvent(bugmsg, user=owner))
 
diff --git a/lib/lp/bugs/model/tests/test_bug.py b/lib/lp/bugs/model/tests/test_bug.py
index 1ce81f9..75921da 100644
--- a/lib/lp/bugs/model/tests/test_bug.py
+++ b/lib/lp/bugs/model/tests/test_bug.py
@@ -645,7 +645,7 @@ class TestBug(TestCaseWithFactory):
         bug = self.factory.makeBug()
         login_person(bug.owner)
         with EventRecorder() as recorder:
-            bug.newMessage(owner=bug.owner, send_notifications=False)
+            bug.newMessage_internal(owner=bug.owner, send_notifications=False)
             self.assertEqual(0, len(recorder.events))
 
     def test_vulnerabilities_property(self):
diff --git a/lib/lp/bugs/tests/test_bug_messages_webservice.py b/lib/lp/bugs/tests/test_bug_messages_webservice.py
index 39153bf..d8a77a1 100644
--- a/lib/lp/bugs/tests/test_bug_messages_webservice.py
+++ b/lib/lp/bugs/tests/test_bug_messages_webservice.py
@@ -150,8 +150,7 @@ class TestBugMessage(TestCaseWithFactory):
         self.assertEqual(400, response.status)
         self.assertEqual(
             b"Email notifications can only be disabled by admins, "
-            b"commercial admins, registry experts, pillar owners, "
-            b"pillar drivers or pillar bug supervisors.",
+            b"commercial admins, registry experts, or bug supervisors.",
             response.body,
         )
         self.assertFalse(self._email_sent())