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

19
lib/Cron/Workers/SendingQueue/Tasks/Links.php
View File

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