change post by email to be premium only

Author: sirodoht

main/models.py

@@ -169,6 +169,10 @@ def footer_note_as_html(self):
     def post_count(self):
         return Post.objects.filter(owner=self).count()
 
+    @property
+    def has_premium_features(self):
+        return self.is_premium or self.is_grandfathered
+
     @property
     def class_status(self):
         if self.is_premium or self.is_grandfathered:

main/templates/main/guides_postbyemail.html

@@ -11,6 +11,12 @@ <h1>Post by email</h1>
         Mataroa supports publishing blog posts via email, inspired by <a href="https://posthaven.com/">Posthaven</a>.
     </p>
 
+    {% if request.user.is_authenticated and not request.user.is_premium %}
+    <p>
+        This is a premium feature. <a href="{% url 'billing_overview' %}">Upgrade to Premium</a> to use it.
+    </p>
+    {% endif %}
+
     {% if request.user.is_authenticated and not request.user.email %}
     <h2>Requirements</h2>
     <p>
@@ -52,19 +58,16 @@ <h2>Notes</h2>
             will be ignored.
         </li>
         <li>
-            Emails to <code>post@</code> are published immediately. Use
-            <code>draft@</code> to save as a draft instead.
-        </li>
-        <li>
-            Drafts are unlisted but still accessible via their URL.
+            Drafts do not appear in a blog's home page but are accessible
+            directly from their URL.
         </li>
         <li>
             Only the plain text version of the email is used for the post body.
             HTML formatting in your email will not be preserved.
         </li>
         <li>
             The post slug is automatically generated from the email subject
-            (post title).
+            (which becomes the post title).
         </li>
     </ul>
 

main/templates/main/landing.html

@@ -32,7 +32,7 @@ <h2>Features</h2>
         <li>No platform lock-in</li>
         <ul>
             <li><a href="{% url 'export_index' %}">Export blog anytime</a></li>
-            <li><a href="https://hey.mataroa.blog/blog/monthly-auto-exports-via-email/">Monthly auto-exports via email</a> (premium feature)</li>
+            <li><a href="https://hey.mataroa.blog/blog/monthly-auto-exports-via-email/">Monthly auto-exports via email</a></li>
             <li><a href="https://hey.mataroa.blog/blog/redirect-to-new-domain/">Redirect to new domain</a></li>
         </ul>
         <li>
@@ -66,7 +66,7 @@ <h2>Pricing</h2>
         <li>Free — most features</li>
         <ul>
             <li>No custom domain</li>
-            <li>No auto-exports via email</li>
+            <li>No post by email</li>
         </ul>
         <li>Premium — all features</li>
         <ul>

main/tests/test_blog.py

@@ -430,7 +430,7 @@ class PostmarkWebhookTestCase(TestCase):
 
     def setUp(self):
         self.user = models.User.objects.create(
-            username="alice", email="[email protected]"
+            username="alice", email="[email protected]", is_premium=True
         )
 
     def test_postmark_webhook_create_post_success(self):
@@ -551,3 +551,60 @@ def test_postmark_webhook_cannot_post_to_another_users_blog(self):
         self.assertFalse(models.Post.objects.exists())
         # no email sent
         self.assertEqual(len(mail.outbox), 0)
+
+    def test_postmark_webhook_non_premium_user_cannot_post(self):
+        """Non-premium users should receive an upgrade email instead of creating a post."""
+        non_premium_user = models.User.objects.create(
+            username="freemium", email="[email protected]", is_premium=False
+        )
+
+        data = {
+            "From": "[email protected]",
+            "To": f"post@{non_premium_user.username}.{settings.CANONICAL_HOST}",
+            "Subject": "My Post Attempt",
+            "TextBody": "This should not create a post.",
+            "Headers": [],
+        }
+
+        response = self.client.post(
+            reverse("postmark_webhook"),
+            data=json.dumps(data),
+            content_type="application/json",
+        )
+
+        self.assertEqual(response.status_code, 200)
+        # no post created
+        self.assertFalse(models.Post.objects.exists())
+        # upgrade email sent
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].to, ["[email protected]"])
+        self.assertIn("premium feature", mail.outbox[0].body.lower())
+        self.assertIn("https://mataroa.blog/billing/overview/", mail.outbox[0].body)
+
+    def test_postmark_webhook_non_premium_user_cannot_create_draft(self):
+        """Non-premium users should receive an upgrade email when trying to create a draft."""
+        non_premium_user = models.User.objects.create(
+            username="freemium", email="[email protected]", is_premium=False
+        )
+
+        data = {
+            "From": "[email protected]",
+            "To": f"draft@{non_premium_user.username}.{settings.CANONICAL_HOST}",
+            "Subject": "My Draft Attempt",
+            "TextBody": "This should not create a draft.",
+            "Headers": [],
+        }
+
+        response = self.client.post(
+            reverse("postmark_webhook"),
+            data=json.dumps(data),
+            content_type="application/json",
+        )
+
+        self.assertEqual(response.status_code, 200)
+        # no post created
+        self.assertFalse(models.Post.objects.exists())
+        # upgrade email sent
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].to, ["[email protected]"])
+        self.assertIn("premium feature", mail.outbox[0].body.lower())

main/views/general.py

@@ -1272,6 +1272,24 @@ def postmark_webhook(request):
         )
         return HttpResponse(status=500)
 
+    # check if user is premium
+    if not user.has_premium_features:
+        logger.warning(f"Post by email attempted by non-premium user: {user.username}")
+        body = "This is a premium feature. Please upgrade to Premium to use it. https://mataroa.blog/billing/overview/"
+        extra_headers = {}
+        if message_id:
+            extra_headers["In-Reply-To"] = message_id
+            extra_headers["References"] = message_id
+        email = mail.EmailMessage(
+            subject=subject,
+            body=body,
+            from_email=settings.DEFAULT_FROM_EMAIL,
+            to=[from_email],
+            headers=extra_headers,
+        )
+        email.send()
+        return HttpResponse(status=200)
+
     # check inbound host
     to_email_parts = to_email.split("@")
     email_prefix = to_email_parts[0]