jacobemerick / web

src/Domain/Stream/Github/MysqlGithubRepository.php

Indentation +75 added lines, -75 removed lines

@@ -8,104 +8,104 @@
 class MysqlGithubRepository implements GithubRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getEvents($limit = null, $offset = 0)
-    {
-        $query = "
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getEvents($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `event_id`, `datetime`
             FROM `jpemeric_stream`.`github`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 
-    /**
-     * @param integer $eventId
-     *
-     * @return array|false
-     */
-    public function getEventByEventId($eventId)
-    {
-        $query = "
+	/**
+	 * @param integer $eventId
+	 *
+	 * @return array|false
+	 */
+	public function getEventByEventId($eventId)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`github`
             WHERE `event_id` = :event_id
             LIMIT 1";
 
-        $bindings = [
-            'event_id' => $eventId,
-        ];
+		$bindings = [
+			'event_id' => $eventId,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getGithubsUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getGithubsUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`github`
             WHERE `updated_at` >= :last_update";
-        $bindings = [
-            'last_update' => $datetime->format('Y-m-d H:i:s'),
-        ];
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		$bindings = [
+			'last_update' => $datetime->format('Y-m-d H:i:s'),
+		];
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    /**
-     * @param integer  $eventId
-     * @param string   $eventType
-     * @param DateTime $datetime
-     * @param array    $metadata
-     *
-     * @return
-     */
-    public function insertEvent($eventId, $eventType, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	/**
+	 * @param integer  $eventId
+	 * @param string   $eventType
+	 * @param DateTime $datetime
+	 * @param array    $metadata
+	 *
+	 * @return
+	 */
+	public function insertEvent($eventId, $eventType, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`github`
                 (`event_id`, `type`, `datetime`, `metadata`)
             VALUES
                 (:event_id, :event_type, :datetime, :metadata)";
 
-        $bindings = [
-            'event_id' => $eventId,
-            'event_type' => $eventType,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
+		$bindings = [
+			'event_id' => $eventId,
+			'event_type' => $eventType,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
 
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

script/manual/stream-ids-mapper.php

Indentation +51 added lines, -51 removed lines

@@ -14,22 +14,22 @@ 
 $statement = $pdo->prepare($query);
 $statement->execute();
 while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-    $query = "
+	$query = "
         SELECT `activity`.`id`
         FROM `jpemeric_stream`.`activity`
         INNER JOIN `jpemeric_stream`.`blog2` ON `blog2`.`id` = `activity`.`type_id` AND
                                                 `blog2`.`permalink` LIKE '{$row['url']}%'
         WHERE `type` = 'blog'";
-    $updateRecords = $pdo->fetchAll($query);
-    if (count($updateRecords) !== 1) {
-        if ($row['url'] == 'http://blog.jacobemerick.com/hiking/slightly-shuffled/') {
-            continue;
-        }
-        var_dump($updateRecords);
-        var_dump($row);
-        exit('problem with blog uniqueness');
-    }
-    $idMap[current($updateRecords)['id']] = $row['id'];
+	$updateRecords = $pdo->fetchAll($query);
+	if (count($updateRecords) !== 1) {
+		if ($row['url'] == 'http://blog.jacobemerick.com/hiking/slightly-shuffled/') {
+			continue;
+		}
+		var_dump($updateRecords);
+		var_dump($row);
+		exit('problem with blog uniqueness');
+	}
+	$idMap[current($updateRecords)['id']] = $row['id'];
 }
 
 $query = "
@@ -40,17 +40,17 @@ 
 $statement = $pdo->prepare($query);
 $statement->execute();
 while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-    $query = "
+	$query = "
         SELECT `activity`.`id`
         FROM `jpemeric_stream`.`activity`
         INNER JOIN `jpemeric_stream`.`goodread` ON `goodread`.`id` = `activity`.`type_id` AND
                                                    `goodread`.`permalink` = :url
         WHERE `type` = 'book'";
-    $updateRecords = $pdo->fetchAll($query, ['url' => $row['link']]);
-    if (count($updateRecords) !== 1) {
-        exit('problem with book uniqueness');
-    }
-    $idMap[current($updateRecords)['id']] = $row['id'];
+	$updateRecords = $pdo->fetchAll($query, ['url' => $row['link']]);
+	if (count($updateRecords) !== 1) {
+		exit('problem with book uniqueness');
+	}
+	$idMap[current($updateRecords)['id']] = $row['id'];
 }
 
 $query = "
@@ -61,20 +61,20 @@ 
 $statement = $pdo->prepare($query);
 $statement->execute();
 while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-    $query = "
+	$query = "
         SELECT `activity`.`id`
         FROM `jpemeric_stream`.`activity`
         INNER JOIN `jpemeric_stream`.`dailymile` ON `dailymile`.`id` = `activity`.`type_id` AND
                                                     `dailymile`.`entry_id` = :entry_id
         WHERE `activity`.`type` = 'distance'";
-    $entryId = $row['url'];
-    $entryId = explode('/', $entryId);
-    $entryId = end($entryId);
-    $updateRecords = $pdo->fetchAll($query, ['entry_id' => $entryId]);
-    if (count($updateRecords) !== 1) {
-        exit('problem with distance uniqueness');
-    }
-    $idMap[current($updateRecords)['id']] = $row['id'];
+	$entryId = $row['url'];
+	$entryId = explode('/', $entryId);
+	$entryId = end($entryId);
+	$updateRecords = $pdo->fetchAll($query, ['entry_id' => $entryId]);
+	if (count($updateRecords) !== 1) {
+		exit('problem with distance uniqueness');
+	}
+	$idMap[current($updateRecords)['id']] = $row['id'];
 }
 
 $query = "
@@ -85,21 +85,21 @@ 
 $statement = $pdo->prepare($query);
 $statement->execute();
 while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-    $query = "
+	$query = "
         SELECT `activity`.`id`
         FROM `jpemeric_stream`.`activity`
         INNER JOIN `jpemeric_stream`.`twitter2` ON `twitter2`.`id` = `activity`.`type_id` AND
                                                    `twitter2`.`tweet_id` = :tweet_id
         WHERE `type` = 'twitter'";
-    $updateRecords = $pdo->fetchAll($query, ['tweet_id' => $row['twitter_id']]);
-    if (count($updateRecords) !== 1) {
-        if (count($updateRecords) === 0) {
-            echo 'Could not find match for id: ', $row['twitter_id'], PHP_EOL;
-            continue;
-        }
-        exit('problem with twitter uniqueness');
-    }
-    $idMap[current($updateRecords)['id']] = $row['id'];
+	$updateRecords = $pdo->fetchAll($query, ['tweet_id' => $row['twitter_id']]);
+	if (count($updateRecords) !== 1) {
+		if (count($updateRecords) === 0) {
+			echo 'Could not find match for id: ', $row['twitter_id'], PHP_EOL;
+			continue;
+		}
+		exit('problem with twitter uniqueness');
+	}
+	$idMap[current($updateRecords)['id']] = $row['id'];
 }
 
 $query = "
@@ -109,26 +109,26 @@ 
 $statement = $pdo->prepare($query);
 $statement->execute();
 while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-    $query = "
+	$query = "
         SELECT `activity`.`id`
         FROM `jpemeric_stream`.`activity`
         WHERE `activity`.`type` = 'youtube' AND `activity`.`type_id` = :type_id";
-    $updateRecords = $pdo->fetchAll($query, ['type_id' => $row['type_id']]);
-    if (count($updateRecords) != 1) {
-        if (count($updateRecords) === 0) {
-            echo "could not find match for youtube {$row['type_id']}", PHP_EOL;
-            continue;
-        }
-        exit('problem with youtube uniqueness');
-    }
-    $idMap[current($updateRecords)['id']] = $row['id'];
+	$updateRecords = $pdo->fetchAll($query, ['type_id' => $row['type_id']]);
+	if (count($updateRecords) != 1) {
+		if (count($updateRecords) === 0) {
+			echo "could not find match for youtube {$row['type_id']}", PHP_EOL;
+			continue;
+		}
+		exit('problem with youtube uniqueness');
+	}
+	$idMap[current($updateRecords)['id']] = $row['id'];
 }
 
 foreach ($idMap as $currentId => $newId) {
-    $query = "
+	$query = "
         UPDATE `activity` SET `id` = :new_id WHERE `id` = :current_id";
-    $update = $pdo->perform($query, ['new_id' => $newId, 'current_id' => $currentId]);
-    if ($update === false) {
-        exit('problem with update');
-    }
+	$update = $pdo->perform($query, ['new_id' => $newId, 'current_id' => $currentId]);
+	if ($update === false) {
+		exit('problem with update');
+	}
 }

script/cron/build-activity-stream.php

Indentation +402 added lines, -402 removed lines

@@ -11,42 +11,42 @@ 
 
 $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']
-    );
-    $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']
+	);
+	$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;
@@ -54,30 +54,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
@@ -86,67 +86,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
@@ -155,127 +155,127 @@ 
 
 $lastGithubActivity = $activityRepository->getActivityLastUpdateByType('git');
 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('git', $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.</p>\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'])),
-        [],
-        'git',
-        $github['id']
-    );
+	$uniqueGithubCheck = $activityRepository->getActivityByTypeId('git', $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.</p>\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'])),
+		[],
+		'git',
+		$github['id']
+	);
 }
 
 // books
@@ -284,46 +284,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
@@ -332,118 +332,118 @@ 
 
 $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($twitter['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;
-    }
-
-    $message = "Tweeted | {$twitterData['text']}";
-    $message = trim(preg_replace('/\s+/', ' ', $message));
-    $message = mb_convert_encoding($message, 'HTML-ENTITIES', 'UTF-8');
-
-    $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(
-                    "<a href=\"%s\" rel=\"nofollow\" target=\"_blank\" title=\"%s\">\n" .
-                    "<img src=\"%s:%s\" alt=\"%s\" height=\"%s\" width=\"%s\" />\n" .
-                    "</a>",
-                    $entity['url'],
-                    $entity['display_url'],
-                    $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($twitter['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;
+	}
+
+	$message = "Tweeted | {$twitterData['text']}";
+	$message = trim(preg_replace('/\s+/', ' ', $message));
+	$message = mb_convert_encoding($message, 'HTML-ENTITIES', 'UTF-8');
+
+	$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(
+					"<a href=\"%s\" rel=\"nofollow\" target=\"_blank\" title=\"%s\">\n" .
+					"<img src=\"%s:%s\" alt=\"%s\" height=\"%s\" width=\"%s\" />\n" .
+					"</a>",
+					$entity['url'],
+					$entity['display_url'],
+					$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
@@ -452,39 +452,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/manual/import-hulu-activity.php

Indentation +11 added lines, -11 removed lines

@@ -14,21 +14,21 @@
     ORDER BY `hulu`.`date` DESC";
 $huluActivities = $pdo->fetchAll($query);
 foreach ($huluActivities as $huluActivity) {
-    $query = "
+	$query = "
         INSERT INTO `jpemeric_stream`.`activity`
             (`id`, `message`, `message_long`, `datetime`, `metadata`, `type`, `type_id`)
         VALUES
             (:id, :message, :message_long, :datetime, :metadata, :type, :type_id)";
 
-    $bindings = [
-        'id' => $huluActivity['id'],
-        'message' => "Watched {$huluActivity['title']} on Hulu.",
-        'message_long' => "<p>Watched {$huluActivity['title']} on Hulu.</p>",
-        'datetime' => (new DateTime($huluActivity['date'], $container['default_timezone']))->format('Y-m-d H:i:s'),
-        'metadata' => json_encode([]),
-        'type' => 'hulu',
-        'type_id' => $huluActivity['type_id'],
-    ];
+	$bindings = [
+		'id' => $huluActivity['id'],
+		'message' => "Watched {$huluActivity['title']} on Hulu.",
+		'message_long' => "<p>Watched {$huluActivity['title']} on Hulu.</p>",
+		'datetime' => (new DateTime($huluActivity['date'], $container['default_timezone']))->format('Y-m-d H:i:s'),
+		'metadata' => json_encode([]),
+		'type' => 'hulu',
+		'type_id' => $huluActivity['type_id'],
+	];
 
-    $pdo->perform($query, $bindings);
+	$pdo->perform($query, $bindings);
 }

controller/PageController.class.inc.php

Indentation +45 added lines, -45 removed lines

@@ -56,37 +56,37 @@ 
 		return $domain_container;
 	}
 
-    protected function get_recent_activity()
-    {
-        global $container;
-        $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
-        $post_result = $activityRepository->getActivities(5);
-
-        $post_array = array();
-        foreach($post_result as $row) {
-            array_push($post_array, $this->expand_post($row));
-        }
-
-        return $post_array;
-    }
-
-    protected function expand_post($raw_post, $format = 'short')
-    {
-        $post = [
-            'type' => $raw_post['type'],
-            'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
-            'date' => $this->get_parsed_date($raw_post['datetime']),
-        ];
-
-        if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
-
-            $metadata = json_decode($raw_post['metadata'], true);
-            $post = array_merge($post, $metadata);
-        }
-
-        return (object) $post;
-    }
+	protected function get_recent_activity()
+	{
+		global $container;
+		$activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
+		$post_result = $activityRepository->getActivities(5);
+
+		$post_array = array();
+		foreach($post_result as $row) {
+			array_push($post_array, $this->expand_post($row));
+		}
+
+		return $post_array;
+	}
+
+	protected function expand_post($raw_post, $format = 'short')
+	{
+		$post = [
+			'type' => $raw_post['type'],
+			'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
+			'date' => $this->get_parsed_date($raw_post['datetime']),
+		];
+
+		if ($format != 'short') {
+			$post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+
+			$metadata = json_decode($raw_post['metadata'], true);
+			$post = array_merge($post, $metadata);
+		}
+
+		return (object) $post;
+	}
 
 	public function activate()
 	{
@@ -107,11 +107,11 @@ 
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
 		}
         
-        if (URLDecode::getSite() == 'waterfalls') {
-            Loader::load('view', '/WaterfallFoot');
-        } else {
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
-        }
+		if (URLDecode::getSite() == 'waterfalls') {
+			Loader::load('view', '/WaterfallFoot');
+		} else {
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
+		}
 		
 		if($view == '/404' || $view == '/503')
 			exit;
@@ -169,15 +169,15 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
-      return "/css/{$stylesheet}.css";
-    }, $this->css_array);
-    $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
-        return $script;
-      }
-      return "/js/{$script}.min.js";
-    }, $this->js_array);
+	$css_array = array_map(function ($stylesheet) {
+	  return "/css/{$stylesheet}.css";
+	}, $this->css_array);
+	$js_array = array_map(function ($script) {
+	  if (substr($script, 0, 4) == 'http') {
+		return $script;
+	  }
+	  return "/js/{$script}.min.js";
+	}, $this->js_array);
 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);

controller/lifestream/DefaultPageController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
 
   public function __construct()
   {
-    parent::__construct();
+	parent::__construct();
 
-    global $container;
-    $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
+	global $container;
+	$this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
   }
 
 	protected function set_head_data()

controller/lifestream/HomeController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 	protected function get_list_results()
 	{
-    return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset);
+	return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset);
 	}
 
 	protected function get_list_description()

script/cron/generate-sitemaps.php

Indentation +378 added lines, -378 removed lines

@@ -27,26 +27,26 @@ 
  * @return boolean
  */
 $buildSitemap = function (array $entries, $domain, $folder) {
-    $urlSet = new Urlset();
-    foreach ($entries as $path => $entry) {
-        $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
-        $url->setLastMod($entry['lastmod']); // todo check if exists
-        $url->setChangeFreq($entry['changefreq']); // todo check if exists
-        $url->setPriority($entry['priority']); // todo check if exists
-        $urlSet->addUrl($url);
-    }
-
-    $output = new Output();
-    $output->setIndentString('  '); // change indentation from 4 to 2 spaces
-
-    $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
-    $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
-
-    $sitemapHandle = fopen($tempSitemap, 'w');
-    fwrite($sitemapHandle, $output->getOutput($urlSet));
-    fclose($sitemapHandle);
-
-    rename($tempSitemap, $finalSitemap);
+	$urlSet = new Urlset();
+	foreach ($entries as $path => $entry) {
+		$url = new Url("{$domain}{$path}"); // todo better detection of domain by env
+		$url->setLastMod($entry['lastmod']); // todo check if exists
+		$url->setChangeFreq($entry['changefreq']); // todo check if exists
+		$url->setPriority($entry['priority']); // todo check if exists
+		$urlSet->addUrl($url);
+	}
+
+	$output = new Output();
+	$output->setIndentString('  '); // change indentation from 4 to 2 spaces
+
+	$tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
+	$finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
+
+	$sitemapHandle = fopen($tempSitemap, 'w');
+	fwrite($sitemapHandle, $output->getOutput($urlSet));
+	fclose($sitemapHandle);
+
+	rename($tempSitemap, $finalSitemap);
 };
 
 
@@ -54,12 +54,12 @@ 
  * blog.jacobemerick.com
  *********************************************/
 $reduceToMostRecentBlogPost = function ($recentPost, $post) {
-    if (is_null($recentPost)) {
-        return $post;
-    }
-    $postDate = new DateTime($post['date']);
-    $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+	if (is_null($recentPost)) {
+		return $post;
+	}
+	$postDate = new DateTime($post['date']);
+	$recentPostDate = new DateTime($recentPost['date']);
+	return ($postDate > $recentPostDate) ? $post: $recentPost;
 };
 
 $blogPostsPerPage = 10;
@@ -70,107 +70,107 @@ 
 
 // todo these post-level dates should be accurate to H:i:s
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => .9,
-    ]
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => .9,
+	]
 ];
 for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($activeBlogPosts); $i++) {
-    $entryKey = "/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .1,
+		]
+	];
 }
 
 $blogCategoryArray = [
-    'hiking',
-    'personal',
-    'web-development',
+	'hiking',
+	'personal',
+	'web-development',
 ];
 
 foreach ($blogCategoryArray as $blogCategory) {
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
-        return $post['category'] == $blogCategory;
-    });
-    $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
-
-    $entryKey = "/{$blogCategory}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .3,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
-        $entryKey = "/{$blogCategory}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
-                'changefreq' => 'daily',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
+		return $post['category'] == $blogCategory;
+	});
+	$mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
+
+	$entryKey = "/{$blogCategory}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .3,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
+		$entryKey = "/{$blogCategory}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
+				'changefreq' => 'daily',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $blogTagRepository = new BlogTagRepository($container['db_connection_locator']);
 $blogTags = $blogTagRepository->getAllTags();
 foreach ($blogTags as $blogTag) {
-    $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
-    if (count($blogPostsWithTag) < 1) {
-        continue;
-    }
-
-    $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
-
-    $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
-    $entryKey = "/tag/{$blogTagPath}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .1,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
-        $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
-        $entryKey = "/tag/{$blogTagPath}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
-                'changefreq' => 'daily',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
+	if (count($blogPostsWithTag) < 1) {
+		continue;
+	}
+
+	$mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
+
+	$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
+	$entryKey = "/tag/{$blogTagPath}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .1,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
+		$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
+		$entryKey = "/tag/{$blogTagPath}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
+				'changefreq' => 'daily',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $reversedBlogPosts = array_reverse($activeBlogPosts);
 foreach ($reversedBlogPosts as $blogPost) {
-    $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
-            'changefreq' => 'weekly',
-            'priority' => .8,
-        ],
-    ];
+	$entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
+			'changefreq' => 'weekly',
+			'priority' => .8,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .2,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .2,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://blog.jacobemerick.com', 'blog');
@@ -184,21 +184,21 @@ 
 $mostRecentPost = current($mostRecentPost);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => 1,
-    ],
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .4,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .3,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => 1,
+	],
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .4,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .3,
+	],
 ];
 
 $buildSitemap($entryArray, 'http://home.jacobemerick.com', 'home');
@@ -208,12 +208,12 @@ 
  * lifestream.jacobemerick.com
  *********************************************/
 $reduceToMostRecentStreamActivity = function ($recentActivity, $activity) {
-    if (is_null($recentActivity)) {
-        return $activity;
-    }
-    $activityDate = new DateTime($activity['datetime']);
-    $recentActivityDate = new DateTime($recentActivity['datetime']);
-    return ($activityDate > $recentActivityDate) ? $activity: $recentActivity;
+	if (is_null($recentActivity)) {
+		return $activity;
+	}
+	$activityDate = new DateTime($activity['datetime']);
+	$recentActivityDate = new DateTime($recentActivity['datetime']);
+	return ($activityDate > $recentActivityDate) ? $activity: $recentActivity;
 };
 
 $streamActivitiesPerPage = 15;
@@ -223,78 +223,78 @@ 
 $mostRecentStreamActivity = array_reduce($streamActivities, $reduceToMostRecentStreamActivity);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
-        'changefreq' => 'hourly',
-        'priority' => .9,
-    ]
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
+		'changefreq' => 'hourly',
+		'priority' => .9,
+	]
 ];
 for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamActivities); $i++) {
-    $entryKey = "/page/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
-            'changefreq' => 'hourly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/page/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
+			'changefreq' => 'hourly',
+			'priority' => .1,
+		]
+	];
 }
 
 $streamTypeArray = [
-    'blog',
-    'books',
-    'distance',
-    'git',
-    'hulu',
-    'twitter',
-    'youtube',
+	'blog',
+	'books',
+	'distance',
+	'git',
+	'hulu',
+	'twitter',
+	'youtube',
 ];
 
 foreach ($streamTypeArray as $streamType) {
-    $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) {
-        return $post['type'] == $streamType;
-    });
-    $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity);
-
-    $entryKey = "/{$streamType}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
-            'changefreq' => 'hourly',
-            'priority' => .3,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) {
-        $entryKey = "/{$streamType}/page/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
-                'changefreq' => 'hourly',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) {
+		return $post['type'] == $streamType;
+	});
+	$mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity);
+
+	$entryKey = "/{$streamType}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
+			'changefreq' => 'hourly',
+			'priority' => .3,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) {
+		$entryKey = "/{$streamType}/page/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
+				'changefreq' => 'hourly',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $reversedStreamActivities = array_reverse($streamActivities);
 foreach ($reversedStreamActivities as $streamActivity) {
-    $entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'),
-            'changefreq' => 'never',
-            'priority' => .5,
-        ],
-    ];
+	$entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'),
+			'changefreq' => 'never',
+			'priority' => .5,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .7,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .7,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://lifestream.jacobemerick.com', 'lifestream');
@@ -307,43 +307,43 @@ 
 $portfolioPieces = $portfolioRepository->getPieces();
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => 1,
-    ],
-    '/print/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .1,
-    ],
-    '/web/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .1,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .4,
-    ],
-    '/resume/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'yearly',
-        'priority' => .9,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => 1,
+	],
+	'/print/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .1,
+	],
+	'/web/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .1,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .4,
+	],
+	'/resume/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'yearly',
+		'priority' => .9,
+	],
 ];
 
 foreach ($portfolioPieces as $portfolioPiece) {
-    $portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print';
-    $entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'never',
-            'priority' => .7,
-        ],
-    ];
+	$portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print';
+	$entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'never',
+			'priority' => .7,
+		],
+	];
 }
 
 $buildSitemap($entryArray, 'http://portfolio.jacobemerick.com', 'portfolio');
@@ -357,26 +357,26 @@ 
 $mostRecentChange = current($mostRecentChange);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => 1,
-    ],
-    '/terms/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
-    '/change-log/' => [
-        'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'),
-        'changefreq' => 'daily',
-        'priority' => .1,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .6,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => 1,
+	],
+	'/terms/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
+	'/change-log/' => [
+		'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'),
+		'changefreq' => 'daily',
+		'priority' => .1,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .6,
+	],
 ];
 
 $buildSitemap($entryArray, 'http://site.jacobemerick.com', 'site');
@@ -386,108 +386,108 @@ 
  * www.waterfallofthekeweenaw.com
  *********************************************/
 $reduceToMostRecentJournalLog = function ($recentLog, $log) {
-    if (is_null($recentLog)) {
-        return $log;
-    }
-    $logDate = new DateTime($log['publish_date']);
-    $recentLogDate = new DateTime($recentLog['publish_date']);
-    return ($logDate > $recentLogDate) ? log: $recentLog;
+	if (is_null($recentLog)) {
+		return $log;
+	}
+	$logDate = new DateTime($log['publish_date']);
+	$recentLogDate = new DateTime($recentLog['publish_date']);
+	return ($logDate > $recentLogDate) ? log: $recentLog;
 };
 
 $waterfallRepository = new WaterfallRepository($container['db_connection_locator']);
 $waterfallList = $waterfallRepository->getWaterfalls();
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => 1,
-    ],
-    '/falls/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => 1,
+	],
+	'/falls/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
 ];
 
 for ($i = 2; (($i - 1) * 24) < count($waterfallList); $i++) {
-    $entryKey = "/falls/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'weekly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/falls/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'weekly',
+			'priority' => .1,
+		]
+	];
 }
 
 $waterfallCountyRepository = new WaterfallCountyRepository($container['db_connection_locator']);
 $waterfallCountyList = $waterfallCountyRepository->getCountyList();
 
 foreach ($waterfallCountyList as $waterfallCounty) {
-    $entryKey = "/{$waterfallCounty['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'monthly',
-            'priority' => .6
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) {
-        $entryKey = "/{$waterfallCounty['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/{$waterfallCounty['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'monthly',
+			'priority' => .6
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) {
+		$entryKey = "/{$waterfallCounty['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 $waterfallWatercourseRepository = new WaterfallWatercourseRepository($container['db_connection_locator']);
 $waterfallWatercourseList = $waterfallWatercourseRepository->getWatercourseList();
 
 foreach ($waterfallWatercourseList as $waterfallWatercourse) {
-    $entryKey = "/{$waterfallWatercourse['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'monthly',
-            'priority' => .6
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) {
-        $entryKey = "/{$waterfallWatercourse['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/{$waterfallWatercourse['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'monthly',
+			'priority' => .6
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) {
+		$entryKey = "/{$waterfallWatercourse['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 foreach ($waterfallList as $waterfall) {
-    $entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'weekly',
-            'priority' => .8,
-        ],
-    ];
+	$entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'weekly',
+			'priority' => .8,
+		],
+	];
 }
 
 $entryArray += [
-    '/map/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .6,
-    ]
+	'/map/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .6,
+	]
 ];
 
 $waterfallLogRepository = new WaterfallLogRepository($container['db_connection_locator']);
@@ -496,91 +496,91 @@ 
 $mostRecentWaterfallLog = array_reduce($activeWaterfallLogs, $reduceToMostRecentJournalLog);
 
 $entryArray += [
-    '/journal/' => [
-        'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
+	'/journal/' => [
+		'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
 ];
 
 for ($i = 2; (($i - 1) * 10) < count($activeWaterfallLogs); $i++) {
-    $entryKey = "/journal/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
-            'changefreq' => 'weekly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/journal/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
+			'changefreq' => 'weekly',
+			'priority' => .1,
+		]
+	];
 }
 
 $waterfallCompanionRepository = new WaterfallCompanionRepository($container['db_connection_locator']);
 $waterfallCompanionList = $waterfallCompanionRepository->getCompanionList();
 
 foreach ($waterfallCompanionList as $waterfallCompanion) {
-    $entryKey = "/companion/{$waterfallCompanion['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
-            'changefreq' => 'monthly',
-            'priority' => .2
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) {
-        $entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/companion/{$waterfallCompanion['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
+			'changefreq' => 'monthly',
+			'priority' => .2
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) {
+		$entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 $waterfallPeriodRepository = new WaterfallPeriodRepository($container['db_connection_locator']);
 $waterfallPeriodList = $waterfallPeriodRepository->getPeriodList();
 
 foreach ($waterfallPeriodList as $waterfallPeriod) {
-    $entryKey = "/period/{$waterfallPeriod['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
-            'changefreq' => 'monthly',
-            'priority' => .2
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) {
-        $entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/period/{$waterfallPeriod['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
+			'changefreq' => 'monthly',
+			'priority' => .2
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) {
+		$entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 foreach ($activeWaterfallLogs as $waterfallLog) {
-    $entryKey = "/journal/{$waterfallLog['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'),
-            'changefreq' => 'weekly',
-            'priority' => .4,
-        ],
-    ];
+	$entryKey = "/journal/{$waterfallLog['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'),
+			'changefreq' => 'weekly',
+			'priority' => .4,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .6,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .6,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://www.waterfallsofthekeweenaw.com', 'waterfalls');

src/Domain/Stream/Blog/MysqlBlogRepository.php

Indentation +55 added lines, -55 removed lines

@@ -8,85 +8,85 @@
 class MysqlBlogRepository implements BlogRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    public function getBlogByPermalink($permalink)
-    {
-        $query = "
+	public function getBlogByPermalink($permalink)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`blog2`
             WHERE `permalink` = :permalink
             LIMIT 1";
-        $bindings = [
-            'permalink' => $permalink,
-        ];
+		$bindings = [
+			'permalink' => $permalink,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getBlogs($limit = null, $offset = 0)
-    {
-        $query = "
+	public function getBlogs($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `permalink`, `datetime`
             FROM `jpemeric_stream`.`blog2`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$limit}, {$offset}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 
-    public function getBlogsUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getBlogsUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`blog2`
             WHERE `updated_at` >= :last_update";
 
-        $bindings = [
-            'last_update' => $datetime->format('Y-m-d H:i:s'),
-        ];
+		$bindings = [
+			'last_update' => $datetime->format('Y-m-d H:i:s'),
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function insertBlog($permalink, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	public function insertBlog($permalink, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`blog2`
                 (`permalink`, `datetime`, `metadata`)
             VALUES
                 (:permalink, :datetime, :metadata)";
 
-        $bindings = [
-            'permalink' => $permalink,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
+		$bindings = [
+			'permalink' => $permalink,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
 
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }