Merge pull request #148 from Xpirix/use_resend_email

Use resend for email sending

Author: Xpirix

docker-compose-production-ssl.yml

@@ -57,7 +57,7 @@ services:
       QGISFEED_DOCKER_DBUSER: ${QGISFEED_DOCKER_DBUSER}
       QGISFEED_DOCKER_DBPASSWORD: ${QGISFEED_DOCKER_DBPASSWORD}
       QGIS_FEED_PROD_URL: ${QGIS_FEED_PROD_URL}
-      QGISFEED_FROM_EMAIL: ${QGISFEED_FROM_EMAIL:-automation}
+      DEFAULT_FROM_EMAIL: ${DEFAULT_FROM_EMAIL:-automation}
       EMAIL_BACKEND: ${EMAIL_BACKEND}
       EMAIL_HOST: ${EMAIL_HOST}
       EMAIL_PORT: ${EMAIL_PORT}

docker-compose-production.yml

@@ -57,7 +57,7 @@ services:
       QGISFEED_DOCKER_DBUSER: ${QGISFEED_DOCKER_DBUSER}
       QGISFEED_DOCKER_DBPASSWORD: ${QGISFEED_DOCKER_DBPASSWORD}
       QGIS_FEED_PROD_URL: ${QGIS_FEED_PROD_URL}
-      QGISFEED_FROM_EMAIL: ${QGISFEED_FROM_EMAIL:-automation}
+      DEFAULT_FROM_EMAIL: ${DEFAULT_FROM_EMAIL:-automation}
       EMAIL_BACKEND: ${EMAIL_BACKEND}
       EMAIL_HOST: ${EMAIL_HOST}
       EMAIL_PORT: ${EMAIL_PORT}

docker-compose.dev.yml

@@ -26,7 +26,7 @@ services:
       QGISFEED_DOCKER_DBUSER: ${QGISFEED_DOCKER_DBUSER}
       QGISFEED_DOCKER_DBPASSWORD: ${QGISFEED_DOCKER_DBPASSWORD}
       QGIS_FEED_PROD_URL: ${QGIS_FEED_PROD_URL}
-      QGISFEED_FROM_EMAIL: ${QGISFEED_FROM_EMAIL:-automation}
+      DEFAULT_FROM_EMAIL: ${DEFAULT_FROM_EMAIL:-automation}
       EMAIL_BACKEND: ${EMAIL_BACKEND}
       EMAIL_HOST: ${EMAIL_HOST}
       EMAIL_PORT: ${EMAIL_PORT}

env.template

@@ -23,13 +23,14 @@ QGISFEED_DOCKER_DBUSER=docker
 QGISFEED_DOCKER_DBPASSWORD=docker
 
 # Email variables
-QGISFEED_FROM_EMAIL=''
 EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST=''
+EMAIL_HOST='smtp.resend.com'
 EMAIL_PORT=587
 EMAIL_USE_TLS=True
-EMAIL_HOST_USER=''
-EMAIL_HOST_PASSWORD=''
+EMAIL_HOST_USER="resend"
+EMAIL_HOST_PASSWORD=""  # Your Resend API key
+EMAIL_SUBJECT_PREFIX='[QGIS Feed] '
+DEFAULT_FROM_EMAIL='no-reply-feed@qgis.org'
 
 # Allowed hosts
 QGIS_FEED_PROD_URL='feed.qgis.org'

qgisfeedproject/qgisfeed/admin.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-""""QGIS Welcome Page Entry admin
+""" "QGIS Welcome Page Entry admin
 
 .. note:: This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -8,9 +8,9 @@
 
 """
 
-__author__ = 'elpaso@itopen.it'
-__date__ = '2019-05-07'
-__copyright__ = 'Copyright 2019, ItOpen'
+__author__ = "elpaso@itopen.it"
+__date__ = "2019-05-07"
+__copyright__ = "Copyright 2019, ItOpen"
 
 
 # Register your models here.
@@ -23,21 +23,33 @@
 from django.core.mail import send_mail
 from django.urls import reverse
 from django.utils import timezone
-
 from user_visit.admin import UserVisitAdmin
 from user_visit.models import UserVisit
 
-from .models import CharacterLimitConfiguration, QgisFeedEntry, QgisUserVisit, DailyQgisUserVisit
+from .models import (
+    CharacterLimitConfiguration,
+    DailyQgisUserVisit,
+    QgisFeedEntry,
+    QgisUserVisit,
+)
 
 # Get an instance of a logger
-logger = logging.getLogger('qgisfeed.admin')
+logger = logging.getLogger("qgisfeed.admin")
+
+DEFAULT_FROM_EMAIL = getattr(settings, "DEFAULT_FROM_EMAIL", "noreply@qgis.org")
 
-QGISFEED_FROM_EMAIL = getattr(settings, 'QGISFEED_FROM_EMAIL', 'noreply@qgis.org')
 
 class QgisFeedEntryAdmin(admin.GeoModelAdmin):
 
-    list_display = ('title', 'author', 'language_filter', 'published',
-                    'publish_from', 'publish_to', 'sorting')
+    list_display = (
+        "title",
+        "author",
+        "language_filter",
+        "published",
+        "publish_from",
+        "publish_to",
+        "sorting",
+    )
 
     def notify(self, author, request, recipients, obj):
         """Send notification emails"""
@@ -46,19 +58,21 @@ def notify(self, author, request, recipients, obj):
             Title: %s\r\n
             Link: %s\r\n
             """ % (
-                author.username,
-                obj.title,
-                request.build_absolute_uri(reverse('admin:qgisfeed_qgisfeedentry_change', args=(obj.pk,)))
-            )
+            author.username,
+            obj.title,
+            request.build_absolute_uri(
+                reverse("admin:qgisfeed_qgisfeedentry_change", args=(obj.pk,))
+            ),
+        )
         if settings.DEBUG:
             logger.debug("DEBUG is True: email not sent:\n %s" % body)
         else:
             send_mail(
-                'A QGIS News Entry was added: %s' % obj.title,
+                "A QGIS News Entry was added: %s" % obj.title,
                 body,
-                QGISFEED_FROM_EMAIL,
+                DEFAULT_FROM_EMAIL,
                 recipients,
-                fail_silently=True
+                fail_silently=True,
             )
 
     def save_model(self, request, obj, form, change):
@@ -73,11 +87,15 @@ def save_model(self, request, obj, form, change):
         obj.save()
 
         if not change and not request.user.is_superuser:
-            recipients = [u.email for u in User.objects.filter(is_superuser=True, is_active=True, email__isnull=False).exclude(email='')]
+            recipients = [
+                u.email
+                for u in User.objects.filter(
+                    is_superuser=True, is_active=True, email__isnull=False
+                ).exclude(email="")
+            ]
             if recipients:
                 self.notify(request.user, request, recipients, obj)
 
-
     def get_form(self, request, obj=None, **kwargs):
         """Hide published from not admin users"""
 
@@ -88,34 +106,27 @@ def get_form(self, request, obj=None, **kwargs):
 
 
 class QgisUserVisitAdmin(admin.StackedInline):
-    readonly_fields = ('qgis_version', 'location', 'platform')
+    readonly_fields = ("qgis_version", "location", "platform")
     can_delete = False
     model = QgisUserVisit
 
 
 class CharacterLimitConfigurationAdmin(admin.ModelAdmin):
-    list_display = ('field_name', 'max_characters')
+    list_display = ("field_name", "max_characters")
     model = CharacterLimitConfiguration
 
 
 class DailyQgisUserVisitAdmin(admin.ModelAdmin):
-    list_display = (
-        'date',
-    )
+    list_display = ("date",)
 
     def has_add_permission(self, request):
         return False
 
 
 class UpdatedUserVisitAdmin(UserVisitAdmin):
-    inlines = [
-        QgisUserVisitAdmin
-    ]
+    inlines = [QgisUserVisitAdmin]
     list_display = ("timestamp", "qgis_version", "country", "platform")
-    search_fields = (
-        "qgisuservisit__qgis_version",
-        "qgisuservisit__location"
-    )
+    search_fields = ("qgisuservisit__qgis_version", "qgisuservisit__location")
     readonly_fields = (
         "timestamp",
         "hash",
@@ -124,30 +135,33 @@ class UpdatedUserVisitAdmin(UserVisitAdmin):
         "ua_string",
         "created_at",
     )
-    exclude = ['user', 'remote_addr']
+    exclude = ["user", "remote_addr"]
 
     def qgis_version(self, obj):
-        qgis_version = ''
+        qgis_version = ""
         if obj.qgisuservisit:
             qgis_version = obj.qgisuservisit.qgis_version
         if not qgis_version:
-            qgis_version = '-'
+            qgis_version = "-"
         return qgis_version
-    
+
     def country(self, obj):
-        country = '-'
+        country = "-"
         if obj.qgisuservisit:
-            if obj.qgisuservisit.location and 'country_name' in obj.qgisuservisit.location:
-                country = obj.qgisuservisit.location['country_name']
+            if (
+                obj.qgisuservisit.location
+                and "country_name" in obj.qgisuservisit.location
+            ):
+                country = obj.qgisuservisit.location["country_name"]
         return country
 
     def platform(sel, obj):
-        platfrom_string = 'Unknown'
+        platfrom_string = "Unknown"
         if obj.qgisuservisit:
             platfrom_string = obj.qgisuservisit.platform
         return platfrom_string
 
-    qgis_version.short_description = 'QGIS Version'
+    qgis_version.short_description = "QGIS Version"
 
 
 admin.site.register(QgisFeedEntry, QgisFeedEntryAdmin)