- Updates cron's sending queue worker to use model objects
- Adds new method to render newsletter to the newsletter model - Adds new transient object to newsletter model that will hold temporary values (i.e., rendered body) when working with the model
This commit is contained in:
@@ -7,27 +7,28 @@ use MailPoet\Util\Helpers;
|
||||
if(!defined('ABSPATH')) exit;
|
||||
|
||||
class Links {
|
||||
static function process(array $newsletter, array $queue) {
|
||||
list($newsletter, $links) = self::hashAndReplaceLinks($newsletter, $queue);
|
||||
static function process($newsletter, $queue) {
|
||||
list($rendered_body, $links) =
|
||||
self::hashAndReplaceLinks($newsletter->_transient->rendered_body);
|
||||
self::saveLinks($links, $newsletter, $queue);
|
||||
$newsletter->_transient->rendered_body = $rendered_body;
|
||||
return $newsletter;
|
||||
}
|
||||
|
||||
static function hashAndReplaceLinks(array $newsletter, array $queue) {
|
||||
static function hashAndReplaceLinks($newsletter_rendered_body) {
|
||||
// join HTML and TEXT rendered body into a text string
|
||||
$content = Helpers::joinObject($newsletter['rendered_body']);
|
||||
$content = Helpers::joinObject($newsletter_rendered_body);
|
||||
list($content, $links) = NewsletterLinks::process($content);
|
||||
// split the processed body with hashed links back to HTML and TEXT
|
||||
list($newsletter['rendered_body']['html'], $newsletter['rendered_body']['text'])
|
||||
list($newsletter_rendered_body['html'], $newsletter_rendered_body['text'])
|
||||
= Helpers::splitObject($content);
|
||||
return array(
|
||||
$newsletter,
|
||||
$newsletter_rendered_body,
|
||||
$links
|
||||
);
|
||||
}
|
||||
|
||||
static function saveLinks($links, $newsletter, $queue) {
|
||||
return NewsletterLinks::save($links, $newsletter['id'], $queue['id']);
|
||||
return NewsletterLinks::save($links, $newsletter->id, $queue->id);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@@ -13,18 +13,18 @@ class Mailer {
|
||||
$this->mailer = $this->configureMailer();
|
||||
}
|
||||
|
||||
function configureMailer(array $newsletter = null) {
|
||||
$sender['address'] = (!empty($newsletter['sender_address'])) ?
|
||||
$newsletter['sender_address'] :
|
||||
function configureMailer($newsletter = null) {
|
||||
$sender['address'] = (!empty($newsletter->sender_address)) ?
|
||||
$newsletter->sender_address :
|
||||
false;
|
||||
$sender['name'] = (!empty($newsletter['sender_name'])) ?
|
||||
$newsletter['sender_name'] :
|
||||
$sender['name'] = (!empty($newsletter->sender_name)) ?
|
||||
$newsletter->sender_name :
|
||||
false;
|
||||
$reply_to['address'] = (!empty($newsletter['reply_to_address'])) ?
|
||||
$newsletter['reply_to_address'] :
|
||||
$reply_to['address'] = (!empty($newsletter->reply_to_address)) ?
|
||||
$newsletter->reply_to_address :
|
||||
false;
|
||||
$reply_to['name'] = (!empty($newsletter['reply_to_name'])) ?
|
||||
$newsletter['reply_to_name'] :
|
||||
$reply_to['name'] = (!empty($newsletter->reply_to_name)) ?
|
||||
$newsletter->reply_to_name :
|
||||
false;
|
||||
if(!$sender['address']) {
|
||||
$sender = false;
|
||||
@@ -50,8 +50,8 @@ class Mailer {
|
||||
'individual';
|
||||
}
|
||||
|
||||
function prepareSubscriberForSending(array $subscriber) {
|
||||
return $this->mailer->transformSubscriber($subscriber);
|
||||
function prepareSubscriberForSending($subscriber) {
|
||||
return $this->mailer->formatSubscriberNameAndEmailAddress($subscriber);
|
||||
}
|
||||
|
||||
function send($prepared_newsletters, $prepared_subscribers) {
|
||||
|
@@ -19,42 +19,34 @@ class Newsletter {
|
||||
|
||||
function __construct() {
|
||||
$this->tracking_enabled = (boolean)Setting::getValue('tracking.enabled');
|
||||
$this->tracking_image_inserted = false;
|
||||
}
|
||||
|
||||
function get($newsletter_id) {
|
||||
$newsletter = NewsletterModel::findOne($newsletter_id);
|
||||
return ($newsletter) ? $newsletter->asArray() : false;
|
||||
}
|
||||
|
||||
function getAndPreProcess(array $queue) {
|
||||
$newsletter = $this->get($queue['newsletter_id']);
|
||||
function getAndPreProcess($queue) {
|
||||
$newsletter = $queue->getNewsletter();
|
||||
if(!$newsletter) {
|
||||
return false;
|
||||
}
|
||||
// if the newsletter was previously rendered, return it
|
||||
// otherwise, process/render it
|
||||
if(!is_null($queue['newsletter_rendered_body'])) {
|
||||
$newsletter['rendered_body'] = json_decode($queue['newsletter_rendered_body'], true);
|
||||
if(!is_null($queue->newsletter_rendered_body)) {
|
||||
$newsletter->_transient->rendered_body = $queue->getRenderedNewsletterBody();
|
||||
return $newsletter;
|
||||
}
|
||||
// if tracking is enabled, do additional processing
|
||||
if($this->tracking_enabled) {
|
||||
// hook once to the newsletter post-processing filter and add tracking image
|
||||
if(!$this->tracking_image_inserted) {
|
||||
$this->tracking_image_inserted = OpenTracking::addTrackingImage();
|
||||
}
|
||||
// hook to the newsletter post-processing filter and add tracking image
|
||||
$this->tracking_image_inserted = OpenTracking::addTrackingImage();
|
||||
// render newsletter
|
||||
$newsletter = $this->render($newsletter);
|
||||
$newsletter->_transient->rendered_body = $newsletter->render();
|
||||
// hash and save all links
|
||||
$newsletter = LinksTask::process($newsletter, $queue);
|
||||
} else {
|
||||
// render newsletter
|
||||
$newsletter = $this->render($newsletter);
|
||||
$newsletter->_transient->rendered_body = $newsletter->render();
|
||||
}
|
||||
// check if this is a post notification and if it contains posts
|
||||
$newsletter_contains_posts = strpos($newsletter['rendered_body']['html'], 'data-post-id');
|
||||
if($newsletter['type'] === 'notification' && !$newsletter_contains_posts) {
|
||||
$newsletter_contains_posts = strpos($newsletter->_transient->rendered_body['html'], 'data-post-id');
|
||||
if($newsletter->type === 'notification' && !$newsletter_contains_posts) {
|
||||
return false;
|
||||
}
|
||||
// extract and save newsletter posts
|
||||
@@ -62,22 +54,14 @@ class Newsletter {
|
||||
return $newsletter;
|
||||
}
|
||||
|
||||
function render(array $newsletter) {
|
||||
$renderer = new Renderer($newsletter);
|
||||
$newsletter['rendered_body'] = $renderer->render();
|
||||
return $newsletter;
|
||||
}
|
||||
|
||||
function prepareNewsletterForSending(
|
||||
array $newsletter, array $subscriber, array $queue
|
||||
) {
|
||||
function prepareNewsletterForSending($newsletter, $subscriber, $queue) {
|
||||
// shortcodes and links will be replaced in the subject, html and text body
|
||||
// to speed the processing, join content into a continuous string
|
||||
$prepared_newsletter = Helpers::joinObject(
|
||||
array(
|
||||
$newsletter['subject'],
|
||||
$newsletter['rendered_body']['html'],
|
||||
$newsletter['rendered_body']['text']
|
||||
$newsletter->subject,
|
||||
$newsletter->_transient->rendered_body['html'],
|
||||
$newsletter->_transient->rendered_body['text']
|
||||
)
|
||||
);
|
||||
$prepared_newsletter = ShortcodesTask::process(
|
||||
@@ -88,8 +72,8 @@ class Newsletter {
|
||||
);
|
||||
if($this->tracking_enabled) {
|
||||
$prepared_newsletter = NewsletterLinks::replaceSubscriberData(
|
||||
$subscriber['id'],
|
||||
$queue['id'],
|
||||
$subscriber->id,
|
||||
$queue->id,
|
||||
$prepared_newsletter
|
||||
);
|
||||
}
|
||||
@@ -103,8 +87,7 @@ class Newsletter {
|
||||
);
|
||||
}
|
||||
|
||||
function markNewsletterAsSent($newsletter_id) {
|
||||
$newsletter = NewsletterModel::findOne($newsletter_id);
|
||||
function markNewsletterAsSent($newsletter) {
|
||||
// if it's a standard newsletter, update its status
|
||||
if($newsletter->type === NewsletterModel::TYPE_STANDARD) {
|
||||
$newsletter->setStatus(NewsletterModel::STATUS_SENT);
|
||||
|
@@ -7,26 +7,27 @@ use MailPoet\Models\NewsletterPost;
|
||||
if(!defined('ABSPATH')) exit;
|
||||
|
||||
class Posts {
|
||||
static function extractAndSave(array $newsletter) {
|
||||
if(empty($newsletter['rendered_body']['html']) || empty($newsletter['id'])) {
|
||||
return;
|
||||
static function extractAndSave($newsletter) {
|
||||
if(empty($newsletter->_transient->rendered_body['html']) || empty($newsletter->id)) {
|
||||
return false;
|
||||
}
|
||||
preg_match_all(
|
||||
'/data-post-id="(\d+)"/ism',
|
||||
$newsletter['rendered_body']['html'],
|
||||
$newsletter->_transient->rendered_body['html'],
|
||||
$matched_posts_ids);
|
||||
$matched_posts_ids = $matched_posts_ids[1];
|
||||
if(!count($matched_posts_ids)) {
|
||||
return $newsletter;
|
||||
return false;
|
||||
}
|
||||
$newsletter_id = ($newsletter['type'] === NewsletterModel::TYPE_NOTIFICATION_HISTORY) ?
|
||||
$newsletter['parent_id'] :
|
||||
$newsletter['id'];
|
||||
$newsletter_id = ($newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY) ?
|
||||
$newsletter->parent_id :
|
||||
$newsletter->id;
|
||||
foreach($matched_posts_ids as $post_id) {
|
||||
$newletter_post = NewsletterPost::create();
|
||||
$newletter_post->newsletter_id = $newsletter_id;
|
||||
$newletter_post->post_id = $post_id;
|
||||
$newletter_post->save();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
@@ -6,9 +6,8 @@ use MailPoet\Newsletter\Shortcodes\Shortcodes as NewsletterShortcodes;
|
||||
if(!defined('ABSPATH')) exit;
|
||||
|
||||
class Shortcodes {
|
||||
static function process($content, array $newsletter, array $subscriber, array $queue) {
|
||||
static function process($content, $newsletter, $subscriber, $queue) {
|
||||
$shortcodes = new NewsletterShortcodes($newsletter, $subscriber, $queue);
|
||||
return $shortcodes->replace($content);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@@ -4,48 +4,59 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
|
||||
if(!defined('ABSPATH')) exit;
|
||||
|
||||
class Subscribers {
|
||||
const BATCH_SIZE = 50;
|
||||
|
||||
static function splitSubscribersIntoBatches(array $subscribers) {
|
||||
return array_chunk(
|
||||
$subscribers,
|
||||
self::BATCH_SIZE
|
||||
);
|
||||
}
|
||||
|
||||
static function updateToProcessList(
|
||||
array $found_subscribers_ids,
|
||||
array $subscribers_to_process_ids,
|
||||
array $queue_subscribers
|
||||
$found_subscribers_ids,
|
||||
$subscribers_to_process_ids,
|
||||
$queue_subscribers
|
||||
) {
|
||||
// compare existing subscriber to the ones that queued for processing
|
||||
// compare existing subscribers to the ones that are queued for processing
|
||||
$subscibers_to_exclude = array_diff(
|
||||
$subscribers_to_process_ids,
|
||||
$found_subscribers_ids
|
||||
);
|
||||
// remove nonexistent subscribers from the processing list
|
||||
$queue_subscribers['to_process'] = array_diff(
|
||||
$subscibers_to_exclude,
|
||||
$queue_subscribers['to_process']
|
||||
$queue_subscribers['to_process'] = array_values(
|
||||
array_diff(
|
||||
$queue_subscribers['to_process'],
|
||||
$subscibers_to_exclude
|
||||
)
|
||||
);
|
||||
return $queue_subscribers;
|
||||
}
|
||||
|
||||
static function updateFailedList(
|
||||
array $failed_subscribers, array $queue_subscribers
|
||||
) {
|
||||
static function updateFailedList($failed_subscribers, $queue_subscribers) {
|
||||
$queue_subscribers['failed'] = array_merge(
|
||||
$queue_subscribers['failed'],
|
||||
$failed_subscribers
|
||||
);
|
||||
$queue_subscribers['to_process'] = array_diff(
|
||||
$queue_subscribers['to_process'],
|
||||
$failed_subscribers
|
||||
$queue_subscribers['to_process'] = array_values(
|
||||
array_diff(
|
||||
$queue_subscribers['to_process'],
|
||||
$failed_subscribers
|
||||
)
|
||||
);
|
||||
return $queue_subscribers;
|
||||
}
|
||||
|
||||
static function updateProcessedList(
|
||||
array $processed_subscribers, array $queue_subscribers
|
||||
) {
|
||||
static function updateProcessedList($processed_subscribers, $queue_subscribers) {
|
||||
$queue_subscribers['processed'] = array_merge(
|
||||
$queue_subscribers['processed'],
|
||||
$processed_subscribers
|
||||
);
|
||||
$queue_subscribers['to_process'] = array_diff(
|
||||
$queue_subscribers['to_process'],
|
||||
$processed_subscribers
|
||||
$queue_subscribers['to_process'] = array_values(
|
||||
array_diff(
|
||||
$queue_subscribers['to_process'],
|
||||
$processed_subscribers
|
||||
)
|
||||
);
|
||||
return $queue_subscribers;
|
||||
}
|
||||
|
Reference in New Issue
Block a user