add admin action to send messages

AUTHORS

@@ -13,5 +13,6 @@ ADDITIONAL CONTRIBUTORS include:
     * Renato Alves
     * Paul Brown
     * Sebastian Pipping
+    * Steve Weber
     * Jaap Roes
     * Ed Davison

CHANGES.rst

@@ -4,6 +4,7 @@ Change log
 2.2.1 - unreleased
 ------------------
 
+* Add admin action to send messages
 * Add fix for email address that is a NoneType
 * Stop testing on unsupported Python (<3.7) and Django (<2.2) versions
 * Start testing on Python 3.11 and Django 4.1/4.2

src/mailer/admin.py

@@ -1,8 +1,11 @@
 from __future__ import unicode_literals
 
 from django.contrib import admin
+from django.contrib import messages
+from django.utils.translation import gettext_lazy as _
 
 from mailer.models import Message, DontSendEntry, MessageLog
+from mailer.engine import send_all
 
 
 def show_to(message):
@@ -25,6 +28,11 @@ class MessageAdmin(MessageAdminMixin, admin.ModelAdmin):
     list_display = ["id", show_to, "subject", "when_added", "priority", "retry_count"]
     readonly_fields = ['plain_text_body']
     date_hierarchy = "when_added"
+    actions = ['send_messages']
+
+    def send_messages(self, request, queryset):
+        send_all(queryset)
+        messages.add_message(request, messages.INFO, _("Message(s) sent."))
 
 
 class DontSendEntryAdmin(admin.ModelAdmin):

src/mailer/engine.py

@@ -40,10 +40,12 @@
 logger = logging.getLogger(__name__)
 
 
-def prioritize():
+def prioritize(queryset=None):
     """
     Returns the messages in the queue in the order they should be sent.
     """
+    if queryset:
+        return queryset.order_by('priority', 'when_added')
     return Message.objects.non_deferred().order_by('priority', 'when_added')
 
 
@@ -80,12 +82,12 @@ def sender_context(message):
             yield None
 
 
-def get_messages_for_sending():
+def get_messages_for_sending(queryset=None):
     """
     Returns a series of context managers that are used for sending mails in the queue.
     Entering the context manager returns the actual message
     """
-    for message in prioritize():
+    for message in prioritize(queryset):
         yield sender_context(message)
 
 
@@ -181,7 +183,7 @@ def _require_no_backend_loop(mailer_email_backend):
                                    .format(settings.EMAIL_BACKEND))
 
 
-def send_all():
+def send_all(queryset=None):
     """
     Send all eligible messages in the queue.
     """
@@ -214,7 +216,7 @@ def send_all():
 
     try:
         connection = None
-        for context in get_messages_for_sending():
+        for context in get_messages_for_sending(queryset):
             with context as message:
                 if message is None:
                     # We didn't acquire the lock