nuntius 1.4.13 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b66852f99b565e240fbbfc95c3f63a658cc6570a6a1ab44d322d6429116e5c44
-  data.tar.gz: 7b3159843eb6553b109f670dfd483c2616b5dc8cb3b0a2506afb97d8d00bb52a
+  metadata.gz: 650cc4b129b084d4fb17dd3b3b21c2a44f9cf14fb6c10d0d3902baa67bfb66fb
+  data.tar.gz: 004110c56dc8b127dc38170a5249135ff1d71700f219aa460b8e62866cdc2107
 SHA512:
-  metadata.gz: 282cfdb7b4597733bc32d2b5045c4784f327c668568ad20a912d4a3aa9524af361fde8d6c717e121e03423b901cc8a0fd8f4af57e64a0aa182ca3ce1fc459eb8
-  data.tar.gz: 210f4b291af759c117e4a2b2fff0e9a07fcc4d59d7be0978ade4b7c65ef8c3b61a51444dc5c29415418e62d755e7b03441852b241c51f9db737f93066c3cca3a
+  metadata.gz: 6f3601b35b149815c37e3056e003d0a6e6900bd20b7bdcd2b17f82b04170fd873ac6aebe85cf3da41f351f11080420e350f2dd554bfd6f026ea2c75c91d4e623
+  data.tar.gz: 9c48531460a4e2d1c5f8a7747ef17712e128ee00f1f57e78d6187a615d3bcd97485ee268b1dd33b445b1e29ab0b5e0ff280c01a7cfab13f9726f6a72cc6d5416

data/app/controllers/nuntius/subscribers_controller.rb

@@ -5,6 +5,7 @@ require_dependency "nuntius/application_controller"
 module Nuntius
   class SubscribersController < ApplicationController
     # skip_before_action :authenticate_user!, only: %i[show destroy]
+    skip_before_action :verify_authenticity_token, only: :unsubscribe
     layout "empty"
 
     def show

data/app/models/nuntius/message.rb

@@ -18,6 +18,8 @@ module Nuntius
     belongs_to :campaign, optional: true
     belongs_to :template, optional: true
     belongs_to :parent_message, class_name: "Message", optional: true
+    belongs_to :subscriber, optional: true
+
     has_many :child_messages, class_name: "Message", foreign_key: "parent_message_id", dependent: :destroy
     has_many :message_trackings, class_name: "MessageTracking", dependent: :destroy
 

data/app/models/nuntius/subscriber.rb

@@ -32,5 +32,15 @@ module Nuntius
 
       super
     end
+
+    def link(campaign, message, tag: true)
+      link_text = campaign.metadata["subscriber_url_text"] || I18n.t("subscriber_url_text")
+      url = Nuntius::Engine.routes.url_helpers.subscriber_url(self, host: Nuntius.config.host(message), protocol: "https")
+      tag ? "<a href=\"#{url}\" data-nuntius-tracking=\"false\">#{link_text}</a>" : url
+    end
+
+    def unsubscribe_link(campaign, message)
+      Nuntius::Engine.routes.url_helpers.unsubscribe_subscriber_url(self, host: Nuntius.config.host(message), protocol: "https")
+    end
   end
 end

data/app/providers/nuntius/smtp_mail_provider.rb

@@ -25,6 +25,13 @@ module Nuntius
         Mail.new(from: from_header)
       end
 
+      mail.header["X-Nuntius-Message-Id"] = message.id
+
+      if message.campaign.present? && message.subscriber.present?
+        mail.header["List-Unsubscribe"] = "<" + message.subscriber.unsubscribe_link(message.campaign, message) + ">"
+        mail.header["List-Unsubscribe-Post"] = "List-Unsubscribe=One-Click"
+      end
+
       if Rails.env.test?
         mail.delivery_method :test
       else

data/app/services/nuntius/deliver_campaign_service.rb

@@ -22,11 +22,11 @@ module Nuntius
     end
 
     def new_message(subscriber, assigns = {})
-      message = Nuntius::Message.create!(transport: campaign.transport, campaign: campaign, nuntiable: subscriber.nuntiable, metadata: campaign.metadata)
+      message = Nuntius::Message.create!(transport: campaign.transport, campaign: campaign, nuntiable: subscriber.nuntiable, metadata: campaign.metadata, subscriber: subscriber)
 
       assigns["campaign"] = context.campaign
       assigns["subscriber"] = subscriber
-      assigns["subscriber_link"] = subscriber_link(subscriber, message)
+      assigns["subscriber_link"] = subscriber.link(campaign, message)
 
       if subscriber.nuntiable
         name = Nuntius::BaseMessenger.liquid_variable_name_for(subscriber.nuntiable)
@@ -62,11 +62,6 @@ module Nuntius
       scope.join(".")
     end
 
-    def subscriber_link(subscriber, message)
-      url = Nuntius::Engine.routes.url_helpers.subscriber_url(subscriber, host: Nuntius.config.host(message))
-      "<a href=\"#{url}\" data-nuntius-tracking=\"false\">#{t("subscriber_url_text")}</a>"
-    end
-
     private
 
     def render(attr, assigns, locale, options = {})

data/app/tables/nuntius/campaigns_table.rb

@@ -25,7 +25,7 @@ module Nuntius
         show ->(campaign) { campaign.transport != "sms" && campaign.can_publish? }
         link { |campaign| campaign.can_publish? ? nuntius.publish_admin_campaign_path(campaign) : nil }
         icon "fa-solid fa-paper-plane"
-        link_attributes data: {"turbo-confirm": "Are you sure you want to send out this campaign?", "turbo-method": :post}
+        link_attributes data: {"turbo-confirm": t(".campaign_publish_confirm"), "turbo-method": :post}
       end
 
       order name: :asc

data/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  campaign_publish_confirm: "Are you sure you want to send out this campaign?"
   subscriber_url_text: "Click here to unsubscribe"
   choose_files: Choose files
   activerecord:

data/config/locales/nl.yml

@@ -1,4 +1,5 @@
 nl:
+  campaign_publish_confirm: "Weet je zeker dat je deze campagne wilt verzenden?"
   subscriber_url_text: "Klik hier om je uit te schrijven"
   choose_files: Kies bestanden
   activerecord:

data/db/migrate/20260310153208_add_subscriber_to_message.rb

@@ -0,0 +1,5 @@
+class AddSubscriberToMessage < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :nuntius_messages, :subscriber, null: true, type: :uuid, foreign_key: {to_table: :nuntius_subscribers}
+  end
+end

data/lib/nuntius/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nuntius
-  VERSION = "1.4.13"
+  VERSION = "1.4.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nuntius
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.4.14
 platform: ruby
 authors:
 - Tom de Grunt
@@ -553,6 +553,7 @@ files:
 - db/migrate/20260123160443_change_nuntius_events_id.rb
 - db/migrate/20260210122500_add_tracking_to_nuntius_messages.rb
 - db/migrate/20260225123822_add_metadata_to_subscriber.rb
+- db/migrate/20260310153208_add_subscriber_to_message.rb
 - lib/generators/nuntius/install_generator.rb
 - lib/generators/nuntius/tailwind_config_generator.rb
 - lib/generators/nuntius/templates/config/initializers/nuntius.rb