jacobemerick / web

controller/waterfalls/ContactController.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -58,16 +58,16 @@
 				'values' => $values);
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Waterfall Site Contact')
-      ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
-        "Message: {$values->message}"
-      )
-      ->send();
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Waterfall Site Contact')
+	  ->setPlainMessage(
+		"Name: {$values->name}\n" .
+		"Email: {$values->email}\n" .
+		"Message: {$values->message}"
+	  )
+	  ->send();
 
 		return (object) array('display' => 'success');
 	}

controller/home/ContactController.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -60,16 +60,16 @@
 				'values' => $values);
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Home Page Contact')
-      ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
-        "Message: {$values->message}"
-      )
-      ->send();		
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Home Page Contact')
+	  ->setPlainMessage(
+		"Name: {$values->name}\n" .
+		"Email: {$values->email}\n" .
+		"Message: {$values->message}"
+	  )
+	  ->send();		
 
 		return (object) array('display' => 'success');
 	}

module/form/CommentSubmitModule.class.inc.php

Indentation +15 added lines, -15 removed lines

@@ -167,26 +167,26 @@
 			}
 		}
         
-        $site = URLDecode::getSite();
+		$site = URLDecode::getSite();
         
-        if ($site == 'blog') {
-            $subject = "New Comment on Jacob Emerick's Blog";
-            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
-        } else if ($site == 'waterfalls') {
-            $subject = "New Comment on Waterfalls of the Keweenaw";
-            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
-        }
+		if ($site == 'blog') {
+			$subject = "New Comment on Jacob Emerick's Blog";
+			$message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+		} else if ($site == 'waterfalls') {
+			$subject = "New Comment on Waterfalls of the Keweenaw";
+			$message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+		}
 
-    global $container;
+	global $container;
 
 		foreach($email_recipient_array as $email_recipient)
 		{
-      $sent = $container['mail']
-        ->addTo($email_recipient['email'], $email_recipient['name'])
-        ->addBCC($container['config']->admin_email)
-        ->setSubject($subject)
-        ->setPlainMessage($message)
-        ->send();		
+	  $sent = $container['mail']
+		->addTo($email_recipient['email'], $email_recipient['name'])
+		->addBCC($container['config']->admin_email)
+		->setSubject($subject)
+		->setPlainMessage($message)
+		->send();		
 		}
 	}
 

public/index.php

Indentation +24 added lines, -24 removed lines

@@ -22,28 +22,28 @@
 
 // sets up shutdown function to display profiler
 register_shutdown_function(function () use ($container) {
-    if (
-        !isset($_COOKIE['debugger']) ||
-        $_COOKIE['debugger'] != 'display'
-    ) {
-        return;
-    }
-
-    $dbProfiles = $container['db_connection_locator']
-        ->getRead()
-        ->getProfiler()
-        ->getProfiles();
-    $dbProfiles = array_filter($dbProfiles, function ($profile) {
-        return $profile['function'] == 'perform';
-    });
-    $dbProfiles = array_map(function ($profile) {
-        return [
-            'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
-            'parameters' => $profile['bind_values'],
-            'time' => $profile['duration'],
-        ];
-    }, $dbProfiles);
-    $container['profiler']->setProfiledQueries($dbProfiles);
-    $container['profiler']->setDisplay(new Particletree\Pqp\Display());
-    $container['profiler']->display($container['db_connection_locator']->getRead());
+	if (
+		!isset($_COOKIE['debugger']) ||
+		$_COOKIE['debugger'] != 'display'
+	) {
+		return;
+	}
+
+	$dbProfiles = $container['db_connection_locator']
+		->getRead()
+		->getProfiler()
+		->getProfiles();
+	$dbProfiles = array_filter($dbProfiles, function ($profile) {
+		return $profile['function'] == 'perform';
+	});
+	$dbProfiles = array_map(function ($profile) {
+		return [
+			'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
+			'parameters' => $profile['bind_values'],
+			'time' => $profile['duration'],
+		];
+	}, $dbProfiles);
+	$container['profiler']->setProfiledQueries($dbProfiles);
+	$container['profiler']->setDisplay(new Particletree\Pqp\Display());
+	$container['profiler']->display($container['db_connection_locator']->getRead());
 });

script/cron/fetch-blog-activity.php

Indentation +36 added lines, -36 removed lines

@@ -13,24 +13,24 @@ 
 
 $blogFeed = Feed::loadRss('http://blog.jacobemerick.com/rss.xml');
 foreach ($blogFeed->item as $item) {
-    $datetime = new DateTime($item->pubDate);
-    if ($datetime <= $mostRecentBlogDateTime) {
-        // break;
-    }
-
-    $uniqueBlogCheck = $blogRepository->getBlogByPermalink((string) $item->guid);
-    if ($uniqueBlogCheck !== false) {
-        continue;
-    }
-
-    $datetime->setTimezone($container['default_timezone']);
-    $metadata = json_decode(json_encode($item), true);
-
-    $blogRepository->insertBlog(
-        (string) $item->guid,
-        $datetime,
-        $metadata
-    );
+	$datetime = new DateTime($item->pubDate);
+	if ($datetime <= $mostRecentBlogDateTime) {
+		// break;
+	}
+
+	$uniqueBlogCheck = $blogRepository->getBlogByPermalink((string) $item->guid);
+	if ($uniqueBlogCheck !== false) {
+		continue;
+	}
+
+	$datetime->setTimezone($container['default_timezone']);
+	$metadata = json_decode(json_encode($item), true);
+
+	$blogRepository->insertBlog(
+		(string) $item->guid,
+		$datetime,
+		$metadata
+	);
 }
 
 $blogCommentRepository = new BlogCommentRepository($container['db_connection_locator']);
@@ -41,22 +41,22 @@ 
 
 $commentFeed = Feed::loadRss('http://blog.jacobemerick.com/rss-comments.xml');
 foreach ($commentFeed->item as $item) {
-    $datetime = new DateTime($item->pubDate);
-    if ($datetime <= $mostRecentBlogCommentDateTime) {
-        break;
-    }
-
-    $uniqueBlogCommentCheck = $blogCommentRepository->getBlogCommentByPermalink((string) $item->guid);
-    if ($uniqueBlogCommentCheck !== false) {
-        continue;
-    }
-
-    $datetime->setTimezone($container['default_timezone']);
-    $metadata = json_decode(json_encode($item), true);
-
-    $blogCommentRepository->insertBlogComment(
-        (string) $item->guid,
-        $datetime,
-        $metadata
-    );
+	$datetime = new DateTime($item->pubDate);
+	if ($datetime <= $mostRecentBlogCommentDateTime) {
+		break;
+	}
+
+	$uniqueBlogCommentCheck = $blogCommentRepository->getBlogCommentByPermalink((string) $item->guid);
+	if ($uniqueBlogCommentCheck !== false) {
+		continue;
+	}
+
+	$datetime->setTimezone($container['default_timezone']);
+	$metadata = json_decode(json_encode($item), true);
+
+	$blogCommentRepository->insertBlogComment(
+		(string) $item->guid,
+		$datetime,
+		$metadata
+	);
 }

controller/waterfalls/LogController.class.inc.php

Indentation +196 added lines, -196 removed lines

@@ -1,210 +1,210 @@
 <?
 
 Loader::load('collector', array(
-    'image/AlbumCollector',
-    'waterfall/LogCollector'));
+	'image/AlbumCollector',
+	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
 final class LogController extends DefaultPageController
 {
 
-    private static $AUTHOR = 'Jacob Emerick';
-    private static $AUTHOR_URL = 'http://home.jacobemerick.com/';
-    private static $JOURNAL_DIRECTORY = 'journal';
-
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
-
-    private $log;
-
-    public function __construct()
-    {
-        parent::__construct();
-        
-        $log_path = URLDecode::getPiece(2);
-        
-        $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
-
-        $this->parent_navigation_item = 'journal';
-        
-        $this->handle_comment_submit(
-            self::$WATERFALL_SITE_ID,
-            $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
-            $this->log->title);
-        
-        $this->add_waterfall_js();
-    }
-
-    protected function set_head_data()
-    {
-        parent::set_head_data();
-        
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
-        $this->set_description($this->log->introduction);
-        
-        $keyword_array = array();
-        $tag_result = LogCollector::getTagListForLog($this->log->id);
-        foreach($tag_result as $tag)
-        {
-            $keyword_array[] = $tag->name;
-        }
-        
-        $this->set_keywords($keyword_array);
-    }
-
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
-        
-        $this->set_body('view', 'Log');
-
-        $body_data = $this->get_formatted_log();
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
-        $body_data['sidebar'] = $this->get_sidebar();
-        $body_data['series'] = $this->get_series();
-        $body_data['album'] = $this->get_album();
-        
-        $this->set_body('data', $body_data);
-    }
-
-    private function get_formatted_log()
-    {
-        $formatted_log = array();
-        
-        $formatted_log['introduction'] = $this->get_log_introduction($this->log);
-        $formatted_log['title'] = $this->log->title;
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
-
-        $formatted_log['body'] = $this->get_formatted_log_body();
-        
-        return $formatted_log;
-    }
-
-    private function get_log_introduction($log)
-    {
-        return array(
-            'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
-            'date' => $this->get_parsed_date($log->date),
-            'publish_date' => $this->get_parsed_date($log->publish_date),
-            'introduction' => $log->introduction,
-            'image' => sprintf(
-                self::$MEDIUM_IMAGE_NODE,
-                $log->image_category,
-                $log->image_name,
-                $log->image_description),
-            'author' => self::$AUTHOR,
-            'author_url' => self::$AUTHOR_URL,
-        );
-    }
-
-    // @todo - link things up
-    private function get_formatted_log_body()
-    {
-        $body = $this->log->body;
-        
-        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
-        $body = Content::instance('FixInternalLink', $body)->activate();
-        
-        return $body;
-    }
-
-    private function get_series()
-    {
-        $series = array(
-            'previous' => array(),
-            'next' => array());
-        
-        $previous_log = LogCollector::getPreviousLog($this->log->id);
-        if($previous_log != false)
-        {
-            $series['previous'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
-                'title' => $previous_log->title,
-                'date' => $previous_log->date);
-        }
-        
-        $next_log = LogCollector::getNextLog($this->log->id);
-        if($next_log != false)
-        {
-            $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
-                'title' => $next_log->title,
-                'date' => $next_log->date);
-        }
-        
-        return $series;
-    }
-
-    private function get_sidebar()
-    {
-        $sidebar = array();
-        
-        $sidebar['companion_list'] = array();
-        $companions = LogCollector::getCompanionListForLog($this->log->id);
-        foreach($companions as $companion)
-        {
-            $sidebar['companion_list'][] = (object) array(
-                'title' => $companion->name,
-                'path' => "/companion/{$companion->alias}/");
-        }
-        
-        $sidebar['tag_list'] = array();
-        $tags = LogCollector::getTagListForLog($this->log->id);
-        foreach($tags as $tag)
-        {
-            $sidebar['tag_list'][] = (object) array(
-                'title' => $tag->name,
-                'path' => "/journal/tag/{$tag->alias}/");
-        }
-        
-        $sidebar['waterfall_list'] = array();
-        $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
-        foreach($waterfalls as $waterfall)
-        {
-            $sidebar['waterfall_list'][] = (object) array(
-                'title' => $waterfall->name,
-                'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
-        }
-        
-        return $sidebar;
-    }
-
-    private function get_album()
-    {
-        $album = array();
-        
-        if($this->log->album == 0)
-            return $album;
-        
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
-        foreach($photo_list as $photo)
-        {
-            $photo_array = array();
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
-            $photo_array['description'] = $photo->description;
+	private static $AUTHOR = 'Jacob Emerick';
+	private static $AUTHOR_URL = 'http://home.jacobemerick.com/';
+	private static $JOURNAL_DIRECTORY = 'journal';
+
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
+
+	private $log;
+
+	public function __construct()
+	{
+		parent::__construct();
+        
+		$log_path = URLDecode::getPiece(2);
+        
+		$this->log = LogCollector::getByAlias($log_path);
+		if(!$this->log)
+			$this->eject();
+
+		$this->parent_navigation_item = 'journal';
+        
+		$this->handle_comment_submit(
+			self::$WATERFALL_SITE_ID,
+			$this->log->alias,
+			Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+			$this->log->title);
+        
+		$this->add_waterfall_js();
+	}
+
+	protected function set_head_data()
+	{
+		parent::set_head_data();
+        
+		$this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+		$this->set_description($this->log->introduction);
+        
+		$keyword_array = array();
+		$tag_result = LogCollector::getTagListForLog($this->log->id);
+		foreach($tag_result as $tag)
+		{
+			$keyword_array[] = $tag->name;
+		}
+        
+		$this->set_keywords($keyword_array);
+	}
+
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
+        
+		$this->set_body('view', 'Log');
+
+		$body_data = $this->get_formatted_log();
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
+		$body_data['sidebar'] = $this->get_sidebar();
+		$body_data['series'] = $this->get_series();
+		$body_data['album'] = $this->get_album();
+        
+		$this->set_body('data', $body_data);
+	}
+
+	private function get_formatted_log()
+	{
+		$formatted_log = array();
+        
+		$formatted_log['introduction'] = $this->get_log_introduction($this->log);
+		$formatted_log['title'] = $this->log->title;
+		$formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
+
+		$formatted_log['body'] = $this->get_formatted_log_body();
+        
+		return $formatted_log;
+	}
+
+	private function get_log_introduction($log)
+	{
+		return array(
+			'title' => $log->title,
+			'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+			'date' => $this->get_parsed_date($log->date),
+			'publish_date' => $this->get_parsed_date($log->publish_date),
+			'introduction' => $log->introduction,
+			'image' => sprintf(
+				self::$MEDIUM_IMAGE_NODE,
+				$log->image_category,
+				$log->image_name,
+				$log->image_description),
+			'author' => self::$AUTHOR,
+			'author_url' => self::$AUTHOR_URL,
+		);
+	}
+
+	// @todo - link things up
+	private function get_formatted_log_body()
+	{
+		$body = $this->log->body;
+        
+		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
+		$body = Content::instance('FixInternalLink', $body)->activate();
+        
+		return $body;
+	}
+
+	private function get_series()
+	{
+		$series = array(
+			'previous' => array(),
+			'next' => array());
+        
+		$previous_log = LogCollector::getPreviousLog($this->log->id);
+		if($previous_log != false)
+		{
+			$series['previous'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
+				'title' => $previous_log->title,
+				'date' => $previous_log->date);
+		}
+        
+		$next_log = LogCollector::getNextLog($this->log->id);
+		if($next_log != false)
+		{
+			$series['next'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+				'title' => $next_log->title,
+				'date' => $next_log->date);
+		}
+        
+		return $series;
+	}
+
+	private function get_sidebar()
+	{
+		$sidebar = array();
+        
+		$sidebar['companion_list'] = array();
+		$companions = LogCollector::getCompanionListForLog($this->log->id);
+		foreach($companions as $companion)
+		{
+			$sidebar['companion_list'][] = (object) array(
+				'title' => $companion->name,
+				'path' => "/companion/{$companion->alias}/");
+		}
+        
+		$sidebar['tag_list'] = array();
+		$tags = LogCollector::getTagListForLog($this->log->id);
+		foreach($tags as $tag)
+		{
+			$sidebar['tag_list'][] = (object) array(
+				'title' => $tag->name,
+				'path' => "/journal/tag/{$tag->alias}/");
+		}
+        
+		$sidebar['waterfall_list'] = array();
+		$waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
+		foreach($waterfalls as $waterfall)
+		{
+			$sidebar['waterfall_list'][] = (object) array(
+				'title' => $waterfall->name,
+				'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
+		}
+        
+		return $sidebar;
+	}
+
+	private function get_album()
+	{
+		$album = array();
+        
+		if($this->log->album == 0)
+			return $album;
+        
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
+		foreach($photo_list as $photo)
+		{
+			$photo_array = array();
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
+			$photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+			if($photo->height < $photo->width)
+				list($height, $width) = array(75, 100);
+			else
+				list($height, $width) = array(100, 75);
             
-            $photo_array['image_node'] = sprintf(
-                self::$THUMB_IMAGE_NODE,
-                $photo->category,
-                $photo->name,
-                $photo->description,
-                $height,
-                $width);
+			$photo_array['image_node'] = sprintf(
+				self::$THUMB_IMAGE_NODE,
+				$photo->category,
+				$photo->name,
+				$photo->description,
+				$height,
+				$width);
             
-            $album[] = (object) $photo_array;
-        }
+			$album[] = (object) $photo_array;
+		}
         
-        return $album;
-    }
+		return $album;
+	}
 
 }

bootstrap.php

Indentation +37 added lines, -37 removed lines

@@ -10,7 +10,7 @@ 
 
 $handle = @fopen($config_path, 'r');
 if ($handle === false) {
-    throw new RuntimeException("Could not load config");
+	throw new RuntimeException("Could not load config");
 }
 $config = fread($handle, filesize($config_path));
 fclose($handle);
@@ -18,7 +18,7 @@ 
 $config = json_decode($config);
 $last_json_error = json_last_error();
 if ($last_json_error !== JSON_ERROR_NONE) {
-    throw new RuntimeException("Could not parse config - JSON error detected");
+	throw new RuntimeException("Could not parse config - JSON error detected");
 }
 $container['config'] = $config;
 
@@ -26,64 +26,64 @@ 
 // timezones are fun
 date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration
 $container['default_timezone'] = function ($c) {
-    return new DateTimeZone('America/Phoenix');
+	return new DateTimeZone('America/Phoenix');
 };
 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
 $db_connections->setDefault(function () use ($config) {
-    $connection = $config->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setWrite('master', function () use ($config) {
-    $connection = $config->database->master;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->master;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setRead('slave', function () use ($config) {
-    $connection = $config->database->slave;
-    $pdo = new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
-
-    $profiler = new Aura\Sql\Profiler();
-    $profiler->setActive(true);
-    $pdo->setProfiler($profiler);
-
-    return $pdo;
+	$connection = $config->database->slave;
+	$pdo = new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
+
+	$profiler = new Aura\Sql\Profiler();
+	$profiler->setActive(true);
+	$pdo->setProfiler($profiler);
+
+	return $pdo;
 });
 $container['db_connection_locator'] = $db_connections;
 
 
 // setup mail handler
 $container['mail'] = $container->factory(function ($c) {
-    return new Jacobemerick\Archangel\Archangel();
+	return new Jacobemerick\Archangel\Archangel();
 });
 
 
 // setup the logger
 $container['setup_logger'] = $container->protect(function ($name) use ($container) {
-    $logger = new Monolog\Logger($name);
+	$logger = new Monolog\Logger($name);
 
-    $logPath = __DIR__ . "/../logs/{$name}.log";
-    $streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
-    $streamHandler->setFormatter(
-        new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
-    );
-    $logger->pushHandler($streamHandler);
+	$logPath = __DIR__ . "/../logs/{$name}.log";
+	$streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
+	$streamHandler->setFormatter(
+		new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
+	);
+	$logger->pushHandler($streamHandler);
 
-    Monolog\ErrorHandler::register($logger);
-    $container['logger'] = $logger;
+	Monolog\ErrorHandler::register($logger);
+	$container['logger'] = $logger;
 });
 
 

script/cron/build-activity-stream.php

Indentation +436 added lines, -436 removed lines

@@ -11,58 +11,58 @@ 
 
 $lastBlogActivity = $activityRepository->getActivityLastUpdateByType('blog');
 if ($lastBlogActivity === false) {
-    $lastBlogActivityDateTime = new DateTime('2008-05-03');
+	$lastBlogActivityDateTime = new DateTime('2008-05-03');
 } else {
-    $lastBlogActivityDateTime = new DateTime($lastBlogActivity['updated_at']);
-    $lastBlogActivityDateTime->modify('-5 days');
+	$lastBlogActivityDateTime = new DateTime($lastBlogActivity['updated_at']);
+	$lastBlogActivityDateTime->modify('-5 days');
 }
 $newBlogActivity = $blogRepository->getBlogsUpdatedSince($lastBlogActivityDateTime);
 foreach ($newBlogActivity as $blog) {
-    $uniqueBlogCheck = $activityRepository->getActivityByTypeId('blog', $blog['id']);
-    if ($uniqueBlogCheck !== false) {
-        continue;
-    }
-
-    $blogData = json_decode($blog['metadata'], true);
-    $message = sprintf(
-        'Blogged about %s | %s.',
-        str_replace('-', ' ', $blogData['category']),
-        $blogData['title']
-    );
-
-    if (isset($blogData['enclosure'])) {
-        $messageLong = sprintf(
-            "<img src=\"%s\" alt=\"Blog | %s\" />\n" .
-            "<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" .
-            "<p>%s [<a href=\"%s\">read more</a></a>]</p>",
-            $blogData['enclosure']['@attributes']['url'],
-            $blogData['title'],
-            $blogData['link'],
-            $blogData['title'],
-            $blogData['title'],
-            htmlentities($blogData['description']),
-            $blogData['link']
-        );
-    } else {
-        $messageLong = sprintf(
-            "<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" .
-            "<p>%s [<a href=\"%s\">read more</a></a>]</p>",
-            $blogData['link'],
-            $blogData['title'],
-            $blogData['title'],
-            htmlentities($blogData['description']),
-            $blogData['link']
-        );
-    }
-
-    $activityRepository->insertActivity(
-        $message,
-        $messageLong,
-        (new DateTime($blog['datetime'])),
-        [],
-        'blog',
-        $blog['id']
-    );
+	$uniqueBlogCheck = $activityRepository->getActivityByTypeId('blog', $blog['id']);
+	if ($uniqueBlogCheck !== false) {
+		continue;
+	}
+
+	$blogData = json_decode($blog['metadata'], true);
+	$message = sprintf(
+		'Blogged about %s | %s.',
+		str_replace('-', ' ', $blogData['category']),
+		$blogData['title']
+	);
+
+	if (isset($blogData['enclosure'])) {
+		$messageLong = sprintf(
+			"<img src=\"%s\" alt=\"Blog | %s\" />\n" .
+			"<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" .
+			"<p>%s [<a href=\"%s\">read more</a></a>]</p>",
+			$blogData['enclosure']['@attributes']['url'],
+			$blogData['title'],
+			$blogData['link'],
+			$blogData['title'],
+			$blogData['title'],
+			htmlentities($blogData['description']),
+			$blogData['link']
+		);
+	} else {
+		$messageLong = sprintf(
+			"<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" .
+			"<p>%s [<a href=\"%s\">read more</a></a>]</p>",
+			$blogData['link'],
+			$blogData['title'],
+			$blogData['title'],
+			htmlentities($blogData['description']),
+			$blogData['link']
+		);
+	}
+
+	$activityRepository->insertActivity(
+		$message,
+		$messageLong,
+		(new DateTime($blog['datetime'])),
+		[],
+		'blog',
+		$blog['id']
+	);
 }
 
 use Jacobemerick\Web\Domain\Stream\BlogComment\MysqlBlogCommentRepository as BlogCommentRepository;
@@ -70,30 +70,30 @@ 
 $blogCommentActivity = $blogCommentRepository->getBlogComments();
 $blogCommentHolder = [];
 foreach ($blogCommentActivity as $blogComment) {
-    $blogPermalink = $blogComment['permalink'];
-    $blogPermalink = explode('#', $blogPermalink);
-    $blogPermalink = current($blogPermalink);
-
-    $blog = $blogRepository->getBlogByPermalink($blogPermalink);
-    if (!array_key_exists($blog['id'], $blogCommentHolder)) {
-        $blogCommentHolder[$blog['id']] = 1;
-    } else {
-        $blogCommentHolder[$blog['id']]++;
-    }
+	$blogPermalink = $blogComment['permalink'];
+	$blogPermalink = explode('#', $blogPermalink);
+	$blogPermalink = current($blogPermalink);
+
+	$blog = $blogRepository->getBlogByPermalink($blogPermalink);
+	if (!array_key_exists($blog['id'], $blogCommentHolder)) {
+		$blogCommentHolder[$blog['id']] = 1;
+	} else {
+		$blogCommentHolder[$blog['id']]++;
+	}
 }
 
 foreach ($blogCommentHolder as $blogId => $commentCount) {
-    $blogActivity = $activityRepository->getActivityByTypeId('blog', $blogId);
-    $blogActivityMetadata = json_decode($blogActivity['metadata'], true);
-    if (
-        !isset($blogActivityMetadata['comments']) ||
-        $blogActivityMetadata['comments'] != $commentCount
-    ) {
-        $activityRepository->updateActivityMetadata(
-            $blogActivity['id'],
-            ['comments' => $commentCount]
-        );
-    }
+	$blogActivity = $activityRepository->getActivityByTypeId('blog', $blogId);
+	$blogActivityMetadata = json_decode($blogActivity['metadata'], true);
+	if (
+		!isset($blogActivityMetadata['comments']) ||
+		$blogActivityMetadata['comments'] != $commentCount
+	) {
+		$activityRepository->updateActivityMetadata(
+			$blogActivity['id'],
+			['comments' => $commentCount]
+		);
+	}
 }
 
 // distance
@@ -102,67 +102,67 @@ 
 
 $lastDailyMileActivity = $activityRepository->getActivityLastUpdateByType('distance');
 if ($lastDailyMileActivity === false) {
-    $lastDailyMileActivityDateTime = new DateTime('2008-05-03');
+	$lastDailyMileActivityDateTime = new DateTime('2008-05-03');
 } else {
-    $lastDailyMileActivityDateTime = new DateTime($lastDailyMileActivity['updated_at']);
-    $lastDailyMileActivityDateTime->modify('-5 days');
+	$lastDailyMileActivityDateTime = new DateTime($lastDailyMileActivity['updated_at']);
+	$lastDailyMileActivityDateTime->modify('-5 days');
 }
 $newDailyMileActivity = $dailyMileRepository->getDailyMilesUpdatedSince($lastDailyMileActivityDateTime);
 foreach ($newDailyMileActivity as $dailyMile) {
-    $uniqueDailyMileCheck = $activityRepository->getActivityByTypeId('distance', $dailyMile['id']);
-    if ($uniqueDailyMileCheck !== false) {
-        continue;
-    }
-
-    $dailyMileData = json_decode($dailyMile['metadata'], true);
-    if ($dailyMile['type'] == 'Hiking') {
-        $message = sprintf(
-            '%s %.2f %s and felt %s.',
-            'Hiked',
-            $dailyMileData['workout']['distance']['value'],
-            $dailyMileData['workout']['distance']['units'],
-            $dailyMileData['workout']['felt']
-        );
-        $messageLong = "<p>{$message}</p>";
-        if (isset($dailyMileData['workout']['title'])) {
-            $messageLong .= "\n<p>I was hiking up around the {$dailyMileData['workout']['title']} area.</p>";
-        }
-    } else if ($dailyMile['type'] == 'Running') {
-        $message = sprintf(
-            '%s %.2f %s and felt %s.',
-            'Ran',
-            $dailyMileData['workout']['distance']['value'],
-            $dailyMileData['workout']['distance']['units'],
-            $dailyMileData['workout']['felt']
-        );
-        $messageLong = "<p>{$message}</p>";
-        if (isset($dailyMileData['message'])) {
-            $messageLong .= "\n<p>Afterwards, I was all like '{$dailyMileData['message']}'.</p>";
-        }
-    } else if ($dailyMile['type'] == 'Walking') {
-        $message = sprintf(
-            '%s %.2f %s and felt %s.',
-            'Walked',
-            $dailyMileData['workout']['distance']['value'],
-            $dailyMileData['workout']['distance']['units'],
-            $dailyMileData['workout']['felt']
-        );
-        $messageLong = "<p>{$message}</p>";
-        if (isset($dailyMileData['message'])) {
-            $messageLong .= "\n<p>{$dailyMileData['message']}</p>";
-        }
-    } else {
-        continue;
-    }
-
-    $activityRepository->insertActivity(
-        $message,
-        $messageLong,
-        (new DateTime($dailyMile['datetime'])),
-        [],
-        'distance',
-        $dailyMile['id']
-    );
+	$uniqueDailyMileCheck = $activityRepository->getActivityByTypeId('distance', $dailyMile['id']);
+	if ($uniqueDailyMileCheck !== false) {
+		continue;
+	}
+
+	$dailyMileData = json_decode($dailyMile['metadata'], true);
+	if ($dailyMile['type'] == 'Hiking') {
+		$message = sprintf(
+			'%s %.2f %s and felt %s.',
+			'Hiked',
+			$dailyMileData['workout']['distance']['value'],
+			$dailyMileData['workout']['distance']['units'],
+			$dailyMileData['workout']['felt']
+		);
+		$messageLong = "<p>{$message}</p>";
+		if (isset($dailyMileData['workout']['title'])) {
+			$messageLong .= "\n<p>I was hiking up around the {$dailyMileData['workout']['title']} area.</p>";
+		}
+	} else if ($dailyMile['type'] == 'Running') {
+		$message = sprintf(
+			'%s %.2f %s and felt %s.',
+			'Ran',
+			$dailyMileData['workout']['distance']['value'],
+			$dailyMileData['workout']['distance']['units'],
+			$dailyMileData['workout']['felt']
+		);
+		$messageLong = "<p>{$message}</p>";
+		if (isset($dailyMileData['message'])) {
+			$messageLong .= "\n<p>Afterwards, I was all like '{$dailyMileData['message']}'.</p>";
+		}
+	} else if ($dailyMile['type'] == 'Walking') {
+		$message = sprintf(
+			'%s %.2f %s and felt %s.',
+			'Walked',
+			$dailyMileData['workout']['distance']['value'],
+			$dailyMileData['workout']['distance']['units'],
+			$dailyMileData['workout']['felt']
+		);
+		$messageLong = "<p>{$message}</p>";
+		if (isset($dailyMileData['message'])) {
+			$messageLong .= "\n<p>{$dailyMileData['message']}</p>";
+		}
+	} else {
+		continue;
+	}
+
+	$activityRepository->insertActivity(
+		$message,
+		$messageLong,
+		(new DateTime($dailyMile['datetime'])),
+		[],
+		'distance',
+		$dailyMile['id']
+	);
 }
 
 // github
@@ -171,128 +171,128 @@ 
 
 $lastGithubActivity = $activityRepository->getActivityLastUpdateByType('github');
 if ($lastGithubActivity === false) {
-    $lastGithubActivityDateTime = new DateTime('2015-10-01');
+	$lastGithubActivityDateTime = new DateTime('2015-10-01');
 } else {
-    $lastGithubActivityDateTime = new DateTime($lastGithubActivity['updated_at']);
-    $lastGithubActivityDateTime->modify('-5 days');
+	$lastGithubActivityDateTime = new DateTime($lastGithubActivity['updated_at']);
+	$lastGithubActivityDateTime->modify('-5 days');
 }
 
 $newGithubActivity = $githubRepository->getGithubsUpdatedSince($lastGithubActivityDateTime);
 foreach ($newGithubActivity as $github) {
-    $uniqueGithubCheck = $activityRepository->getActivityByTypeId('github', $github['id']);
-    if ($uniqueGithubCheck !== false) {
-        continue;
-    }
-
-    $githubData = json_decode($github['metadata'], true);
-
-    if ($github['type'] == 'CreateEvent') {
-        if (
-            $githubData['payload']['ref_type'] == 'branch' ||
-            $githubData['payload']['ref_type'] == 'tag'
-        ) {
-            $message = sprintf(
-                'Created %s %s at %s.',
-                $githubData['payload']['ref_type'],
-                $githubData['payload']['ref'],
-                $githubData['repo']['name']
-            );
-            $messageLong = sprintf(
-                '<p>Created %s %s at <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>',
-                $githubData['payload']['ref_type'],
-                $githubData['payload']['ref'],
-                "https://github.com/{$githubData['repo']['name']}",
-                $githubData['repo']['name'],
-                $githubData['repo']['name']
-            );
-        } else if ($githubData['payload']['ref_type'] == 'repository') {
-            $message = sprintf(
-                'Created %s %s.',
-                $githubData['payload']['ref_type'],
-                $githubData['repo']['name']
-            );
-            $messageLong = sprintf(
-                '<p>Created %s <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>',
-                $githubData['payload']['ref_type'],
-                "https://github.com/{$githubData['repo']['name']}",
-                $githubData['repo']['name'],
-                $githubData['repo']['name']
-            );
-        } else {
-            continue;
-        }
-    } else if ($github['type'] == 'ForkEvent') {
-        $message = sprintf(
-            'Forked %s to %s',
-            $githubData['repo']['name'],
-            $githubData['payload']['forkee']['full_name']
-        );
-        $messageLong = sprintf(
-            '<p>Forked <a href="%s" target="_blank" title="Github | %s">%s</a> to <a href="%s" target="_blank" title="Github | %s">%s</a>.',
-            "https://github.com/{$githubData['repo']['name']}",
-            $githubData['repo']['name'],
-            $githubData['repo']['name'],
-            $githubData['payload']['forkee']['html_url'],
-            $githubData['payload']['forkee']['full_name'],
-            $githubData['payload']['forkee']['full_name']
-        );
-    } else if ($github['type'] == 'PullRequestEvent') {
-        $message = sprintf(
-            '%s a pull request at %s',
-            ucwords($githubData['payload']['action']),
-            $githubData['repo']['name']
-        );
-        $messageLong = sprintf(
-            '<p>%s pull request <a href="%s" target="_blank" title="Github | %s PR %d">%d</a> at <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>',
-            ucwords($githubData['payload']['action']),
-            $githubData['payload']['pull_request']['html_url'],
-            $githubData['repo']['name'],
-            $githubData['payload']['number'],
-            $githubData['payload']['number'],
-            "https://github.com/{$githubData['repo']['name']}",
-            $githubData['repo']['name'],
-            $githubData['repo']['name']
-        );
-    } else if ($github['type'] == 'PushEvent') {
-        $message = sprintf(
-            'Pushed some code at %s.',
-            $githubData['repo']['name']
-        );
-        $messageLong = sprintf(
-            "<p>Pushed some code at <a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a>.</p>\n",
-            $githubData['payload']['ref'],
-            "https://github.com/{$githubData['repo']['name']}",
-            $githubData['repo']['name'],
-            $githubData['repo']['name']
-        );
-        $messageLong .= "<ul>\n";
-        foreach ($githubData['payload']['commits'] as $commit) {
-            $messageShort = $commit['message'];
-            $messageShort = strtok($messageShort, "\n");
-            if (strlen($messageShort) > 72) {
-                $messageShort = wordwrap($messageShort, 65);
-                $messageShort = strtok($messageShort, "\n");
-                $messageShort .= '...';
-            }
-            $messageLong .= sprintf(
-                "<li><a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a> %s.</li>\n",
-                "https://github.com/{$githubData['repo']['name']}/commit/{$commit['sha']}",
-                substr($commit['sha'], 0, 7),
-                substr($commit['sha'], 0, 7),
-                $messageShort
-            );
-        }
-        $messageLong .= "</ul>";
-    }
-
-    $activityRepository->insertActivity(
-        $message,
-        $messageLong,
-        (new DateTime($github['datetime'])),
-        [],
-        'github',
-        $github['id']
-    );
+	$uniqueGithubCheck = $activityRepository->getActivityByTypeId('github', $github['id']);
+	if ($uniqueGithubCheck !== false) {
+		continue;
+	}
+
+	$githubData = json_decode($github['metadata'], true);
+
+	if ($github['type'] == 'CreateEvent') {
+		if (
+			$githubData['payload']['ref_type'] == 'branch' ||
+			$githubData['payload']['ref_type'] == 'tag'
+		) {
+			$message = sprintf(
+				'Created %s %s at %s.',
+				$githubData['payload']['ref_type'],
+				$githubData['payload']['ref'],
+				$githubData['repo']['name']
+			);
+			$messageLong = sprintf(
+				'<p>Created %s %s at <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>',
+				$githubData['payload']['ref_type'],
+				$githubData['payload']['ref'],
+				"https://github.com/{$githubData['repo']['name']}",
+				$githubData['repo']['name'],
+				$githubData['repo']['name']
+			);
+		} else if ($githubData['payload']['ref_type'] == 'repository') {
+			$message = sprintf(
+				'Created %s %s.',
+				$githubData['payload']['ref_type'],
+				$githubData['repo']['name']
+			);
+			$messageLong = sprintf(
+				'<p>Created %s <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>',
+				$githubData['payload']['ref_type'],
+				"https://github.com/{$githubData['repo']['name']}",
+				$githubData['repo']['name'],
+				$githubData['repo']['name']
+			);
+		} else {
+			continue;
+		}
+	} else if ($github['type'] == 'ForkEvent') {
+		$message = sprintf(
+			'Forked %s to %s',
+			$githubData['repo']['name'],
+			$githubData['payload']['forkee']['full_name']
+		);
+		$messageLong = sprintf(
+			'<p>Forked <a href="%s" target="_blank" title="Github | %s">%s</a> to <a href="%s" target="_blank" title="Github | %s">%s</a>.',
+			"https://github.com/{$githubData['repo']['name']}",
+			$githubData['repo']['name'],
+			$githubData['repo']['name'],
+			$githubData['payload']['forkee']['html_url'],
+			$githubData['payload']['forkee']['full_name'],
+			$githubData['payload']['forkee']['full_name']
+		);
+	} else if ($github['type'] == 'PullRequestEvent') {
+		$message = sprintf(
+			'%s a pull request at %s',
+			ucwords($githubData['payload']['action']),
+			$githubData['repo']['name']
+		);
+		$messageLong = sprintf(
+			'<p>%s pull request <a href="%s" target="_blank" title="Github | %s PR %d">%d</a> at <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>',
+			ucwords($githubData['payload']['action']),
+			$githubData['payload']['pull_request']['html_url'],
+			$githubData['repo']['name'],
+			$githubData['payload']['number'],
+			$githubData['payload']['number'],
+			"https://github.com/{$githubData['repo']['name']}",
+			$githubData['repo']['name'],
+			$githubData['repo']['name']
+		);
+	} else if ($github['type'] == 'PushEvent') {
+		$message = sprintf(
+			'Pushed some code at %s.',
+			$githubData['repo']['name']
+		);
+		$messageLong = sprintf(
+			"<p>Pushed some code at <a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a>.</p>\n",
+			$githubData['payload']['ref'],
+			"https://github.com/{$githubData['repo']['name']}",
+			$githubData['repo']['name'],
+			$githubData['repo']['name']
+		);
+		$messageLong .= "<ul>\n";
+		foreach ($githubData['payload']['commits'] as $commit) {
+			$messageShort = $commit['message'];
+			$messageShort = strtok($messageShort, "\n");
+			if (strlen($messageShort) > 72) {
+				$messageShort = wordwrap($messageShort, 65);
+				$messageShort = strtok($messageShort, "\n");
+				$messageShort .= '...';
+			}
+			$messageLong .= sprintf(
+				"<li><a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a> %s.</li>\n",
+				"https://github.com/{$githubData['repo']['name']}/commit/{$commit['sha']}",
+				substr($commit['sha'], 0, 7),
+				substr($commit['sha'], 0, 7),
+				$messageShort
+			);
+		}
+		$messageLong .= "</ul>";
+	}
+
+	$activityRepository->insertActivity(
+		$message,
+		$messageLong,
+		(new DateTime($github['datetime'])),
+		[],
+		'github',
+		$github['id']
+	);
 }
 
 // books
@@ -301,46 +301,46 @@ 
 
 $lastGoodreadActivity = $activityRepository->getActivityLastUpdateByType('book');
 if ($lastGoodreadActivity === false) {
-    $lastGoodreadActivityDateTime = new DateTime('2010-08-28');
+	$lastGoodreadActivityDateTime = new DateTime('2010-08-28');
 } else {
-    $lastGoodreadActivityDateTime = new DateTime($lastGoodreadActivity['updated_at']);
-    $lastGoodreadActivityDateTime->modify('-5 days');
+	$lastGoodreadActivityDateTime = new DateTime($lastGoodreadActivity['updated_at']);
+	$lastGoodreadActivityDateTime->modify('-5 days');
 }
 $newGoodreadActivity = $goodreadRepository->getGoodreadsUpdatedSince($lastGoodreadActivityDateTime);
 foreach ($newGoodreadActivity as $goodread) {
-    $uniqueGoodreadCheck = $activityRepository->getActivityByTypeId('book', $goodread['id']);
-    if ($uniqueGoodreadCheck !== false) {
-        continue;
-    }
-
-    $goodreadData = json_decode($goodread['metadata'], true);
-
-    if (empty($goodreadData['user_read_at'])) {
-        continue;
-    }
-
-    $message = sprintf(
-        'Read %s by %s.',
-        $goodreadData['title'],
-        $goodreadData['author_name']
-    );
-    if (isset($goodreadData['book_large_image_url'])) {
-        $messageLong = sprintf(
-            "<img alt=\"Goodreads | %s\" src=\"%s\" />\n",
-            $goodreadData['title'],
-            $goodreadData['book_large_image_url']
-        );
-    }
-    $messageLong .= "<p>{$message}</p>";
-
-    $activityRepository->insertActivity(
-        $message,
-        $messageLong,
-        (new DateTime($goodread['datetime'])),
-        [],
-        'book',
-        $goodread['id']
-    );
+	$uniqueGoodreadCheck = $activityRepository->getActivityByTypeId('book', $goodread['id']);
+	if ($uniqueGoodreadCheck !== false) {
+		continue;
+	}
+
+	$goodreadData = json_decode($goodread['metadata'], true);
+
+	if (empty($goodreadData['user_read_at'])) {
+		continue;
+	}
+
+	$message = sprintf(
+		'Read %s by %s.',
+		$goodreadData['title'],
+		$goodreadData['author_name']
+	);
+	if (isset($goodreadData['book_large_image_url'])) {
+		$messageLong = sprintf(
+			"<img alt=\"Goodreads | %s\" src=\"%s\" />\n",
+			$goodreadData['title'],
+			$goodreadData['book_large_image_url']
+		);
+	}
+	$messageLong .= "<p>{$message}</p>";
+
+	$activityRepository->insertActivity(
+		$message,
+		$messageLong,
+		(new DateTime($goodread['datetime'])),
+		[],
+		'book',
+		$goodread['id']
+	);
 }
 
 // twitter
@@ -349,136 +349,136 @@ 
 
 $lastTwitterActivity = $activityRepository->getActivityLastUpdateByType('twitter');
 if ($lastTwitterActivity === false) {
-    $lastTwitterActivityDateTime = new DateTime('2010-03-10');
+	$lastTwitterActivityDateTime = new DateTime('2010-03-10');
 } else {
-    $lastTwitterActivityDateTime = new DateTime($lastTwitterActivity['updated_at']);
-    $lastTwitterActivityDateTime->modify('-5 days');
+	$lastTwitterActivityDateTime = new DateTime($lastTwitterActivity['updated_at']);
+	$lastTwitterActivityDateTime->modify('-5 days');
 }
 $newTwitterActivity = $twitterRepository->getTwittersUpdatedSince($lastTwitterActivityDateTime);
 foreach ($newTwitterActivity as $twitter) {
-    $twitterData = json_decode($twitter['metadata'], true);
-
-    $uniqueTwitterCheck = $activityRepository->getActivityByTypeId('twitter', $twitter['id']);
-    if ($uniqueTwitterCheck !== false) {
-        $metadata = [];
-        if ($twitterData['favorite_count'] > 0) {
-            $metadata['favorites'] = $twitterData['favorite_count'];
-        }
-        if ($twitterData['retweet_count'] > 0) {
-            $metadata['retweets'] = $twitterData['retweet_count'];
-        }
-
-        $activityRepository->updateActivityMetadata($uniqueTwitterCheck['id'], $metadata);
-        continue;
-    }
-
-    if (
-        ($twitterData['in_reply_to_user_id'] != null || substr($twitterData['text'], 0, 1) === '@') &&
-        $twitterData['favorite_count'] == 0 &&
-        $twitterData['retweet_count'] == 0
-    ) {
-        continue;
-    }
-
-    $entityHolder = [];
-    foreach ($twitterData['entities'] as $entityType => $entities) {
-        foreach ($entities as $entity) {
-            if ($entityType == 'urls' || $entityType == 'media') {
-                $entityHolder[$entity['indices'][0]] = [
-                    'start' => $entity['indices'][0],
-                    'end' => $entity['indices'][1],
-                    'replace' => "[{$entity['display_url']}]"
-                ];
-            }
-        }
-    }
-
-    $message = $twitterData['text'];
-    krsort($entityHolder);
-    foreach($entityHolder as $entity)
-    {
-        $message =
-            mb_substr($message, 0, $entity['start']) .
-            $entity['replace'] .
-            mb_substr($message, $entity['end'], null, 'UTF-8');
-    }
-    $message = mb_convert_encoding($message, 'HTML-ENTITIES', 'UTF-8');
-    $message = trim(preg_replace('/\s+/', ' ', $message));
-    $message = "Tweeted | {$message}";
-
-    $entityHolder = [];
-    foreach ($twitterData['entities'] as $entityType => $entities) {
-        foreach ($entities as $entity) {
-            if ($entityType == 'hashtags') {
-                $replace = sprintf(
-                    '<a href="https://twitter.com/search?q=%%23%s&src=hash" rel="nofollow" target="_blank">#%s</a>',
-                    $entity['text'],
-                    $entity['text']
-                );
-            } else if ($entityType == 'urls') {
-                $replace = sprintf(
-                    '<a href="%s" rel="nofollow" target="_blank" title="%s">%s</a>',
-                    $entity['url'],
-                    $entity['expanded_url'],
-                    $entity['display_url']
-                );
-            } else if ($entityType == 'user_mentions') {
-                $replace = sprintf(
-                    '<a href="https://twitter.com/%s" rel="nofollow" target="_blank" title="Twitter | %s">@%s</a>',
-                    strtolower($entity['screen_name']),
-                    $entity['name'],
-                    $entity['screen_name']
-                );
-            } else if ($entityType == 'media') {
-                $replace = sprintf(
-                    "<img src=\"%s:%s\" alt=\"%s\" height=\"%s\" width=\"%s\" />",
-                    $entity['media_url'],
-                    'large',
-                    $entity['display_url'],
-                    $entity['sizes']['large']['h'],
-                    $entity['sizes']['large']['w']
-                );
-            } else {
-                continue 2;
-            }
-
-            $entityHolder[$entity['indices'][0]] = [
-                'start' => $entity['indices'][0],
-                'end' => $entity['indices'][1],
-                'replace' => $replace,
-            ];
-        }
-    }
-
-    $messageLong = $twitterData['text'];
-    krsort($entityHolder);
-    foreach($entityHolder as $entity)
-    {
-        $messageLong =
-            mb_substr($messageLong, 0, $entity['start']) .
-            $entity['replace'] .
-            mb_substr($messageLong, $entity['end'], null, 'UTF-8');
-    }
-    $messageLong = mb_convert_encoding($messageLong, 'HTML-ENTITIES', 'UTF-8');
-    $messageLong = nl2br($messageLong, true);
-    $messageLong = "<p>{$messageLong}</p>";
-
-    $metadata = [];
-    if ($twitterData['favorite_count'] > 0) {
-        $metadata['favorites'] = $twitterData['favorite_count'];
-    }
-    if ($twitterData['retweet_count'] > 0) {
-        $metadata['retweets'] = $twitterData['retweet_count'];
-    }
-
-    $activityRepository->insertActivity(
-        $message,
-        $messageLong,
-        (new DateTime($twitter['datetime'])),
-        $metadata,
-        'twitter',
-        $twitter['id']
-    );
+	$twitterData = json_decode($twitter['metadata'], true);
+
+	$uniqueTwitterCheck = $activityRepository->getActivityByTypeId('twitter', $twitter['id']);
+	if ($uniqueTwitterCheck !== false) {
+		$metadata = [];
+		if ($twitterData['favorite_count'] > 0) {
+			$metadata['favorites'] = $twitterData['favorite_count'];
+		}
+		if ($twitterData['retweet_count'] > 0) {
+			$metadata['retweets'] = $twitterData['retweet_count'];
+		}
+
+		$activityRepository->updateActivityMetadata($uniqueTwitterCheck['id'], $metadata);
+		continue;
+	}
+
+	if (
+		($twitterData['in_reply_to_user_id'] != null || substr($twitterData['text'], 0, 1) === '@') &&
+		$twitterData['favorite_count'] == 0 &&
+		$twitterData['retweet_count'] == 0
+	) {
+		continue;
+	}
+
+	$entityHolder = [];
+	foreach ($twitterData['entities'] as $entityType => $entities) {
+		foreach ($entities as $entity) {
+			if ($entityType == 'urls' || $entityType == 'media') {
+				$entityHolder[$entity['indices'][0]] = [
+					'start' => $entity['indices'][0],
+					'end' => $entity['indices'][1],
+					'replace' => "[{$entity['display_url']}]"
+				];
+			}
+		}
+	}
+
+	$message = $twitterData['text'];
+	krsort($entityHolder);
+	foreach($entityHolder as $entity)
+	{
+		$message =
+			mb_substr($message, 0, $entity['start']) .
+			$entity['replace'] .
+			mb_substr($message, $entity['end'], null, 'UTF-8');
+	}
+	$message = mb_convert_encoding($message, 'HTML-ENTITIES', 'UTF-8');
+	$message = trim(preg_replace('/\s+/', ' ', $message));
+	$message = "Tweeted | {$message}";
+
+	$entityHolder = [];
+	foreach ($twitterData['entities'] as $entityType => $entities) {
+		foreach ($entities as $entity) {
+			if ($entityType == 'hashtags') {
+				$replace = sprintf(
+					'<a href="https://twitter.com/search?q=%%23%s&src=hash" rel="nofollow" target="_blank">#%s</a>',
+					$entity['text'],
+					$entity['text']
+				);
+			} else if ($entityType == 'urls') {
+				$replace = sprintf(
+					'<a href="%s" rel="nofollow" target="_blank" title="%s">%s</a>',
+					$entity['url'],
+					$entity['expanded_url'],
+					$entity['display_url']
+				);
+			} else if ($entityType == 'user_mentions') {
+				$replace = sprintf(
+					'<a href="https://twitter.com/%s" rel="nofollow" target="_blank" title="Twitter | %s">@%s</a>',
+					strtolower($entity['screen_name']),
+					$entity['name'],
+					$entity['screen_name']
+				);
+			} else if ($entityType == 'media') {
+				$replace = sprintf(
+					"<img src=\"%s:%s\" alt=\"%s\" height=\"%s\" width=\"%s\" />",
+					$entity['media_url'],
+					'large',
+					$entity['display_url'],
+					$entity['sizes']['large']['h'],
+					$entity['sizes']['large']['w']
+				);
+			} else {
+				continue 2;
+			}
+
+			$entityHolder[$entity['indices'][0]] = [
+				'start' => $entity['indices'][0],
+				'end' => $entity['indices'][1],
+				'replace' => $replace,
+			];
+		}
+	}
+
+	$messageLong = $twitterData['text'];
+	krsort($entityHolder);
+	foreach($entityHolder as $entity)
+	{
+		$messageLong =
+			mb_substr($messageLong, 0, $entity['start']) .
+			$entity['replace'] .
+			mb_substr($messageLong, $entity['end'], null, 'UTF-8');
+	}
+	$messageLong = mb_convert_encoding($messageLong, 'HTML-ENTITIES', 'UTF-8');
+	$messageLong = nl2br($messageLong, true);
+	$messageLong = "<p>{$messageLong}</p>";
+
+	$metadata = [];
+	if ($twitterData['favorite_count'] > 0) {
+		$metadata['favorites'] = $twitterData['favorite_count'];
+	}
+	if ($twitterData['retweet_count'] > 0) {
+		$metadata['retweets'] = $twitterData['retweet_count'];
+	}
+
+	$activityRepository->insertActivity(
+		$message,
+		$messageLong,
+		(new DateTime($twitter['datetime'])),
+		$metadata,
+		'twitter',
+		$twitter['id']
+	);
 }
 
 // youtube
@@ -487,39 +487,39 @@ 
 
 $lastYouTubeActivity = $activityRepository->getActivityLastUpdateByType('youtube');
 if ($lastYouTubeActivity === false) {
-    $lastYouTubeActivityDateTime = new DateTime('2010-08-28');
+	$lastYouTubeActivityDateTime = new DateTime('2010-08-28');
 } else {
-    $lastYouTubeActivityDateTime = new DateTime($lastYouTubeActivity['updated_at']);
-    $lastYouTubeActivityDateTime->modify('-5 days');
+	$lastYouTubeActivityDateTime = new DateTime($lastYouTubeActivity['updated_at']);
+	$lastYouTubeActivityDateTime->modify('-5 days');
 }
 $newYouTubeActivity = $youTubeRepository->getYouTubesUpdatedSince($lastYouTubeActivityDateTime);
 foreach ($newYouTubeActivity as $youTube) {
-    $uniqueYouTubeCheck = $activityRepository->getActivityByTypeId('youtube', $youTube['id']);
-    if ($uniqueYouTubeCheck !== false) {
-        continue;
-    }
-
-    $youTubeData = json_decode($youTube['metadata'], true);
-
-    $message = sprintf(
-        'Favorited %s on YouTube.',
-        $youTubeData['snippet']['title']
-    );
-    $messageLong = sprintf(
-        "<iframe src=\"%s\" frameborder=\"0\" allowfullscreen></iframe>\n" .
-        "<p>Favorited <a href=\"%s\" target=\"_blank\" title=\"YouTube | %s\">%s</a> on YouTube.</p>",
-        "https://www.youtube.com/embed/{$youTubeData['contentDetails']['videoId']}",
-        "https://youtu.be/{$youTubeData['contentDetails']['videoId']}",
-        $youTubeData['snippet']['title'],
-        $youTubeData['snippet']['title']
-    );
-
-    $activityRepository->insertActivity(
-        $message,
-        $messageLong,
-        (new DateTime($youTube['datetime'])),
-        [],
-        'youtube',
-        $youTube['id']
-    );
+	$uniqueYouTubeCheck = $activityRepository->getActivityByTypeId('youtube', $youTube['id']);
+	if ($uniqueYouTubeCheck !== false) {
+		continue;
+	}
+
+	$youTubeData = json_decode($youTube['metadata'], true);
+
+	$message = sprintf(
+		'Favorited %s on YouTube.',
+		$youTubeData['snippet']['title']
+	);
+	$messageLong = sprintf(
+		"<iframe src=\"%s\" frameborder=\"0\" allowfullscreen></iframe>\n" .
+		"<p>Favorited <a href=\"%s\" target=\"_blank\" title=\"YouTube | %s\">%s</a> on YouTube.</p>",
+		"https://www.youtube.com/embed/{$youTubeData['contentDetails']['videoId']}",
+		"https://youtu.be/{$youTubeData['contentDetails']['videoId']}",
+		$youTubeData['snippet']['title'],
+		$youTubeData['snippet']['title']
+	);
+
+	$activityRepository->insertActivity(
+		$message,
+		$messageLong,
+		(new DateTime($youTube['datetime'])),
+		[],
+		'youtube',
+		$youTube['id']
+	);
 }

script/cron/fetch-twitter-activity.php

Indentation +23 added lines, -23 removed lines

@@ -6,40 +6,40 @@
 use Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository as TwitterRepository;
 
 $client = new TwitterOAuth(
-    $config->twitter->consumer_key,
-    $config->twitter->consumer_secret,
-    $config->twitter->access_token,
-    $config->twitter->access_token_secret
+	$config->twitter->consumer_key,
+	$config->twitter->consumer_secret,
+	$config->twitter->access_token,
+	$config->twitter->access_token_secret
 );
 $client->setDecodeJsonAsArray(true);
 
 $twitterRepository = new TwitterRepository($container['db_connection_locator']);
 
 $recentTweets = $client->get('statuses/user_timeline', [
-    'screen_name' => 'jpemeric',
-    'count' => 50,
-    'trim_user' => true,
+	'screen_name' => 'jpemeric',
+	'count' => 50,
+	'trim_user' => true,
 ]);
 
 if (isset($recentTweets['errors'])) {
-    throw new Exception("Error encountered with twitter api {$recentTweets['errors'][0]['message']}");
+	throw new Exception("Error encountered with twitter api {$recentTweets['errors'][0]['message']}");
 }
 
 foreach ($recentTweets as $tweet) {
-    $uniqueTweetCheck = $twitterRepository->getTwitterByTweetId($tweet['id_str']);
-    if ($uniqueTweetCheck !== false) {
-        $currentTweetHash = md5($uniqueTweetCheck['metadata']);
-        $newTweetHash = md5(json_encode($tweet));
-        if ($uniqueTweetCheck['metadata'] != json_encode($tweet)) {
-            $twitterRepository->updateTweetMetadata($tweet['id_str'], $tweet);
-        }
-        continue;
-    }
-
-    $twitterRepository->insertTweet(
-        $tweet['id_str'],
-        (new DateTime($tweet['created_at']))->setTimezone($container['default_timezone']),
-        $tweet
-    );
+	$uniqueTweetCheck = $twitterRepository->getTwitterByTweetId($tweet['id_str']);
+	if ($uniqueTweetCheck !== false) {
+		$currentTweetHash = md5($uniqueTweetCheck['metadata']);
+		$newTweetHash = md5(json_encode($tweet));
+		if ($uniqueTweetCheck['metadata'] != json_encode($tweet)) {
+			$twitterRepository->updateTweetMetadata($tweet['id_str'], $tweet);
+		}
+		continue;
+	}
+
+	$twitterRepository->insertTweet(
+		$tweet['id_str'],
+		(new DateTime($tweet['created_at']))->setTimezone($container['default_timezone']),
+		$tweet
+	);
 }