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

- Updates cron's sending queue worker to use model objects

Browse Source 
- 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:
Vlad
2016-09-18 23:14:17 -04:00
parent b834a6af4d
commit f88dabffe8
11 changed files with 133 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);