Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

- Joins bulk and individual processing into one method

Browse Source 
- Refactors code as per code review comments
This commit is contained in:
Vlad
2016-06-20 23:12:32 -04:00
parent e807aad814
commit f32d6bb331
10 changed files with 155 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@ -14,13 +14,21 @@ use MailPoet\Util\Helpers;
if(!defined('ABSPATH')) exit;
class Newsletter {
static function get($newsletter_id) {
public $tracking_enabled;
public $tracking_image_inserted;
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;
}
static function getAndPreProcess(array $queue) {
$newsletter = self::get($queue['newsletter_id']);
function getAndPreProcess(array $queue) {
$newsletter = $this->get($queue['newsletter_id']);
if(!$newsletter) {
return false;
}
@ -31,16 +39,18 @@ class Newsletter {
return $newsletter;
}
// if tracking is enabled, do additional processing
if((boolean) Setting::getValue('tracking.enabled')) {
// add tracking image
OpenTracking::addTrackingImage();
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();
}
// render newsletter
$newsletter = self::render($newsletter);
$newsletter = $this->render($newsletter);
// hash and save all links
$newsletter = LinksTask::process($newsletter, $queue);
} else {
// render newsletter
$newsletter = self::render($newsletter);
$newsletter = $this->render($newsletter);
}
// check if this is a post notification and if it contains posts
$newsletter_contains_posts = strpos($newsletter['rendered_body']['html'], 'data-post-id');
@ -52,13 +62,13 @@ class Newsletter {
return $newsletter;
}
static function render($newsletter) {
function render($newsletter) {
$renderer = new Renderer($newsletter);
$newsletter['rendered_body'] = $renderer->render();
return $newsletter;
}
static function prepareNewsletterForSending(
function prepareNewsletterForSending(
array $newsletter, array $subscriber, array $queue
) {
// shortcodes and links will be replaced in the subject, html and text body
@ -76,7 +86,7 @@ class Newsletter {
$subscriber,
$queue
);
if((boolean) Setting::getValue('tracking.enabled')) {
if($this->tracking_enabled) {
$prepared_newsletter = NewsletterLinks::replaceSubscriberData(
$newsletter['id'],
$subscriber['id'],