@@ -8,80 +8,80 @@ |
||
| 8 | 8 | class MysqlBlogCommentRepository implements BlogCommentRepositoryInterface |
| 9 | 9 | { |
| 10 | 10 | |
| 11 | - /** @var ConnectionLocator */ |
|
| 12 | - protected $connections; |
|
| 11 | + /** @var ConnectionLocator */ |
|
| 12 | + protected $connections; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @param ConnectonLocator $connections |
|
| 16 | - */ |
|
| 17 | - public function __construct(ConnectionLocator $connections) |
|
| 18 | - { |
|
| 19 | - $this->connections = $connections; |
|
| 20 | - } |
|
| 14 | + /** |
|
| 15 | + * @param ConnectonLocator $connections |
|
| 16 | + */ |
|
| 17 | + public function __construct(ConnectionLocator $connections) |
|
| 18 | + { |
|
| 19 | + $this->connections = $connections; |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * @param integer $limit |
|
| 24 | - * @param integer $offset |
|
| 25 | - * |
|
| 26 | - * @return array|false |
|
| 27 | - */ |
|
| 28 | - public function getBlogComments($limit = null, $offset = 0) |
|
| 29 | - { |
|
| 30 | - $query = " |
|
| 22 | + /** |
|
| 23 | + * @param integer $limit |
|
| 24 | + * @param integer $offset |
|
| 25 | + * |
|
| 26 | + * @return array|false |
|
| 27 | + */ |
|
| 28 | + public function getBlogComments($limit = null, $offset = 0) |
|
| 29 | + { |
|
| 30 | + $query = " |
|
| 31 | 31 | SELECT `id`, `permalink`, `datetime` |
| 32 | 32 | FROM `jpemeric_stream`.`blog_comment` |
| 33 | 33 | ORDER BY `datetime` DESC"; |
| 34 | - if (!is_null($limit)) { |
|
| 35 | - $query .= " |
|
| 34 | + if (!is_null($limit)) { |
|
| 35 | + $query .= " |
|
| 36 | 36 | LIMIT {$offset}, {$limit}"; |
| 37 | - } |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - return $this |
|
| 40 | - ->connections |
|
| 41 | - ->getRead() |
|
| 42 | - ->fetchAll($query); |
|
| 43 | - } |
|
| 39 | + return $this |
|
| 40 | + ->connections |
|
| 41 | + ->getRead() |
|
| 42 | + ->fetchAll($query); |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @param string $permalink |
|
| 47 | - * |
|
| 48 | - * @return array|false |
|
| 49 | - */ |
|
| 50 | - public function getBlogCommentByPermalink($permalink) |
|
| 51 | - { |
|
| 52 | - $query = " |
|
| 45 | + /** |
|
| 46 | + * @param string $permalink |
|
| 47 | + * |
|
| 48 | + * @return array|false |
|
| 49 | + */ |
|
| 50 | + public function getBlogCommentByPermalink($permalink) |
|
| 51 | + { |
|
| 52 | + $query = " |
|
| 53 | 53 | SELECT * |
| 54 | 54 | FROM `jpemeric_stream`.`blog_comment` |
| 55 | 55 | WHERE `permalink` = :permalink |
| 56 | 56 | LIMIT 1"; |
| 57 | 57 | |
| 58 | - $bindings = [ |
|
| 59 | - 'permalink' => $permalink, |
|
| 60 | - ]; |
|
| 58 | + $bindings = [ |
|
| 59 | + 'permalink' => $permalink, |
|
| 60 | + ]; |
|
| 61 | 61 | |
| 62 | - return $this |
|
| 63 | - ->connections |
|
| 64 | - ->getRead() |
|
| 65 | - ->fetchOne($query, $bindings); |
|
| 66 | - } |
|
| 62 | + return $this |
|
| 63 | + ->connections |
|
| 64 | + ->getRead() |
|
| 65 | + ->fetchOne($query, $bindings); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - public function insertBlogComment($permalink, DateTime $datetime, array $metadata) |
|
| 69 | - { |
|
| 70 | - $query = " |
|
| 68 | + public function insertBlogComment($permalink, DateTime $datetime, array $metadata) |
|
| 69 | + { |
|
| 70 | + $query = " |
|
| 71 | 71 | INSERT INTO `jpemeric_stream`.`blog_comment` |
| 72 | 72 | (`permalink`, `datetime`, `metadata`) |
| 73 | 73 | VALUES |
| 74 | 74 | (:permalink, :datetime, :metadata)"; |
| 75 | 75 | |
| 76 | - $bindings = [ |
|
| 77 | - 'permalink' => $permalink, |
|
| 78 | - 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
| 79 | - 'metadata' => json_encode($metadata), |
|
| 80 | - ]; |
|
| 76 | + $bindings = [ |
|
| 77 | + 'permalink' => $permalink, |
|
| 78 | + 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
| 79 | + 'metadata' => json_encode($metadata), |
|
| 80 | + ]; |
|
| 81 | 81 | |
| 82 | - return $this |
|
| 83 | - ->connections |
|
| 84 | - ->getWrite() |
|
| 85 | - ->perform($query, $bindings); |
|
| 86 | - } |
|
| 82 | + return $this |
|
| 83 | + ->connections |
|
| 84 | + ->getWrite() |
|
| 85 | + ->perform($query, $bindings); |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -8,112 +8,112 @@ |
||
| 8 | 8 | class MysqlBlogRepository implements BlogRepositoryInterface |
| 9 | 9 | { |
| 10 | 10 | |
| 11 | - /** @var ConnectionLocator */ |
|
| 12 | - protected $connections; |
|
| 13 | - |
|
| 14 | - /** |
|
| 15 | - * @param ConnectonLocator $connections |
|
| 16 | - */ |
|
| 17 | - public function __construct(ConnectionLocator $connections) |
|
| 18 | - { |
|
| 19 | - $this->connections = $connections; |
|
| 20 | - } |
|
| 21 | - |
|
| 22 | - /** |
|
| 23 | - * @param integer $id |
|
| 24 | - * |
|
| 25 | - * @return array|false |
|
| 26 | - */ |
|
| 27 | - public function getBlogById($id) |
|
| 28 | - { |
|
| 29 | - $query = " |
|
| 11 | + /** @var ConnectionLocator */ |
|
| 12 | + protected $connections; |
|
| 13 | + |
|
| 14 | + /** |
|
| 15 | + * @param ConnectonLocator $connections |
|
| 16 | + */ |
|
| 17 | + public function __construct(ConnectionLocator $connections) |
|
| 18 | + { |
|
| 19 | + $this->connections = $connections; |
|
| 20 | + } |
|
| 21 | + |
|
| 22 | + /** |
|
| 23 | + * @param integer $id |
|
| 24 | + * |
|
| 25 | + * @return array|false |
|
| 26 | + */ |
|
| 27 | + public function getBlogById($id) |
|
| 28 | + { |
|
| 29 | + $query = " |
|
| 30 | 30 | SELECT * |
| 31 | 31 | FROM `jpemeric_stream`.`blog` |
| 32 | 32 | WHERE `id` = :id |
| 33 | 33 | LIMIT 1"; |
| 34 | - $bindings = [ |
|
| 35 | - 'id' => $id, |
|
| 36 | - ]; |
|
| 37 | - |
|
| 38 | - return $this |
|
| 39 | - ->connections |
|
| 40 | - ->getRead() |
|
| 41 | - ->fetchOne($query, $bindings); |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - public function getBlogByPermalink($permalink) |
|
| 45 | - { |
|
| 46 | - $query = " |
|
| 34 | + $bindings = [ |
|
| 35 | + 'id' => $id, |
|
| 36 | + ]; |
|
| 37 | + |
|
| 38 | + return $this |
|
| 39 | + ->connections |
|
| 40 | + ->getRead() |
|
| 41 | + ->fetchOne($query, $bindings); |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + public function getBlogByPermalink($permalink) |
|
| 45 | + { |
|
| 46 | + $query = " |
|
| 47 | 47 | SELECT * |
| 48 | 48 | FROM `jpemeric_stream`.`blog2` |
| 49 | 49 | WHERE `permalink` = :permalink |
| 50 | 50 | LIMIT 1"; |
| 51 | - $bindings = [ |
|
| 52 | - 'permalink' => $permalink, |
|
| 53 | - ]; |
|
| 54 | - |
|
| 55 | - return $this |
|
| 56 | - ->connections |
|
| 57 | - ->getRead() |
|
| 58 | - ->fetchOne($query, $bindings); |
|
| 59 | - } |
|
| 60 | - |
|
| 61 | - /** |
|
| 62 | - * @param string $title |
|
| 63 | - * |
|
| 64 | - * @return array|false |
|
| 65 | - */ |
|
| 66 | - public function getBlogByTitle($title) |
|
| 67 | - { |
|
| 68 | - $query = " |
|
| 51 | + $bindings = [ |
|
| 52 | + 'permalink' => $permalink, |
|
| 53 | + ]; |
|
| 54 | + |
|
| 55 | + return $this |
|
| 56 | + ->connections |
|
| 57 | + ->getRead() |
|
| 58 | + ->fetchOne($query, $bindings); |
|
| 59 | + } |
|
| 60 | + |
|
| 61 | + /** |
|
| 62 | + * @param string $title |
|
| 63 | + * |
|
| 64 | + * @return array|false |
|
| 65 | + */ |
|
| 66 | + public function getBlogByTitle($title) |
|
| 67 | + { |
|
| 68 | + $query = " |
|
| 69 | 69 | SELECT * |
| 70 | 70 | FROM `jpemeric_stream`.`blog` |
| 71 | 71 | WHERE `title` = :title |
| 72 | 72 | LIMIT 1"; |
| 73 | - $bindings = [ |
|
| 74 | - 'title' => $title, |
|
| 75 | - ]; |
|
| 76 | - |
|
| 77 | - return $this |
|
| 78 | - ->connections |
|
| 79 | - ->getRead() |
|
| 80 | - ->fetchOne($query, $bindings); |
|
| 81 | - } |
|
| 82 | - |
|
| 83 | - public function getBlogs($limit = null, $offset = 0) |
|
| 84 | - { |
|
| 85 | - $query = " |
|
| 73 | + $bindings = [ |
|
| 74 | + 'title' => $title, |
|
| 75 | + ]; |
|
| 76 | + |
|
| 77 | + return $this |
|
| 78 | + ->connections |
|
| 79 | + ->getRead() |
|
| 80 | + ->fetchOne($query, $bindings); |
|
| 81 | + } |
|
| 82 | + |
|
| 83 | + public function getBlogs($limit = null, $offset = 0) |
|
| 84 | + { |
|
| 85 | + $query = " |
|
| 86 | 86 | SELECT `id`, `permalink`, `datetime` |
| 87 | 87 | FROM `jpemeric_stream`.`blog2` |
| 88 | 88 | ORDER BY `datetime` DESC"; |
| 89 | - if (!is_null($limit)) { |
|
| 90 | - $query .= " |
|
| 89 | + if (!is_null($limit)) { |
|
| 90 | + $query .= " |
|
| 91 | 91 | LIMIT {$limit}, {$offset}"; |
| 92 | - } |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - return $this |
|
| 95 | - ->connections |
|
| 96 | - ->getRead() |
|
| 97 | - ->fetchAll($query); |
|
| 98 | - } |
|
| 94 | + return $this |
|
| 95 | + ->connections |
|
| 96 | + ->getRead() |
|
| 97 | + ->fetchAll($query); |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - public function insertBlog($permalink, DateTime $datetime, array $metadata) |
|
| 101 | - { |
|
| 102 | - $query = " |
|
| 100 | + public function insertBlog($permalink, DateTime $datetime, array $metadata) |
|
| 101 | + { |
|
| 102 | + $query = " |
|
| 103 | 103 | INSERT INTO `jpemeric_stream`.`blog2` |
| 104 | 104 | (`permalink`, `datetime`, `metadata`) |
| 105 | 105 | VALUES |
| 106 | 106 | (:permalink, :datetime, :metadata)"; |
| 107 | 107 | |
| 108 | - $bindings = [ |
|
| 109 | - 'permalink' => $permalink, |
|
| 110 | - 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
| 111 | - 'metadata' => json_encode($metadata), |
|
| 112 | - ]; |
|
| 113 | - |
|
| 114 | - return $this |
|
| 115 | - ->connections |
|
| 116 | - ->getWrite() |
|
| 117 | - ->perform($query, $bindings); |
|
| 118 | - } |
|
| 108 | + $bindings = [ |
|
| 109 | + 'permalink' => $permalink, |
|
| 110 | + 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
| 111 | + 'metadata' => json_encode($metadata), |
|
| 112 | + ]; |
|
| 113 | + |
|
| 114 | + return $this |
|
| 115 | + ->connections |
|
| 116 | + ->getWrite() |
|
| 117 | + ->perform($query, $bindings); |
|
| 118 | + } |
|
| 119 | 119 | } |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface BlogRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getBlogById($id); |
|
| 8 | - public function getBlogByTitle($title); |
|
| 7 | + public function getBlogById($id); |
|
| 8 | + public function getBlogByTitle($title); |
|
| 9 | 9 | } |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface TwitterRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getTwitterById($id); |
|
| 8 | - public function getUnmappedTwitters(); |
|
| 7 | + public function getTwitterById($id); |
|
| 8 | + public function getUnmappedTwitters(); |
|
| 9 | 9 | } |
@@ -20,14 +20,14 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | protected function set_head_data() |
| 22 | 22 | { |
| 23 | - $this->set_head('rss_link', [ |
|
| 24 | - 'title' => 'Jacob Emerick Blog Feed', |
|
| 25 | - 'url' => '/rss.xml' |
|
| 26 | - ]); |
|
| 27 | - $this->set_head('rss_comment_link', [ |
|
| 28 | - 'title' => 'Jacob Emerick Blog Comment Feed', |
|
| 29 | - 'url' => '/rss-comments.xml' |
|
| 30 | - ]); |
|
| 23 | + $this->set_head('rss_link', [ |
|
| 24 | + 'title' => 'Jacob Emerick Blog Feed', |
|
| 25 | + 'url' => '/rss.xml' |
|
| 26 | + ]); |
|
| 27 | + $this->set_head('rss_comment_link', [ |
|
| 28 | + 'title' => 'Jacob Emerick Blog Comment Feed', |
|
| 29 | + 'url' => '/rss-comments.xml' |
|
| 30 | + ]); |
|
| 31 | 31 | |
| 32 | 32 | $this->add_css('normalize'); |
| 33 | 33 | $this->add_css('blog'); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | Loader::load('collector', 'blog/TagCollector'); |
| 93 | 93 | |
| 94 | 94 | $tag_result = TagCollector::getTagsForPost($post->id); |
| 95 | - $tag_array = array(); |
|
| 95 | + $tag_array = array(); |
|
| 96 | 96 | foreach($tag_result as $tag) |
| 97 | 97 | { |
| 98 | 98 | $tag_object = new stdclass(); |
@@ -13,24 +13,24 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | $blogFeed = Feed::loadRss('http://blog.jacobemerick.com/rss.xml'); |
| 15 | 15 | foreach ($blogFeed->item as $item) { |
| 16 | - $datetime = new DateTime($item->pubDate); |
|
| 17 | - if ($datetime <= $mostRecentBlogDateTime) { |
|
| 18 | - break; |
|
| 19 | - } |
|
| 20 | - |
|
| 21 | - $uniqueBlogCheck = $blogRepository->getBlogByPermalink((string) $item->guid); |
|
| 22 | - if ($uniqueBlogCheck !== false) { |
|
| 23 | - continue; |
|
| 24 | - } |
|
| 25 | - |
|
| 26 | - $datetime->setTimezone($container['default_timezone']); |
|
| 27 | - $metadata = json_decode(json_encode($item), true); |
|
| 28 | - |
|
| 29 | - $blogRepository->insertBlog( |
|
| 30 | - (string) $item->guid, |
|
| 31 | - $datetime, |
|
| 32 | - $metadata |
|
| 33 | - ); |
|
| 16 | + $datetime = new DateTime($item->pubDate); |
|
| 17 | + if ($datetime <= $mostRecentBlogDateTime) { |
|
| 18 | + break; |
|
| 19 | + } |
|
| 20 | + |
|
| 21 | + $uniqueBlogCheck = $blogRepository->getBlogByPermalink((string) $item->guid); |
|
| 22 | + if ($uniqueBlogCheck !== false) { |
|
| 23 | + continue; |
|
| 24 | + } |
|
| 25 | + |
|
| 26 | + $datetime->setTimezone($container['default_timezone']); |
|
| 27 | + $metadata = json_decode(json_encode($item), true); |
|
| 28 | + |
|
| 29 | + $blogRepository->insertBlog( |
|
| 30 | + (string) $item->guid, |
|
| 31 | + $datetime, |
|
| 32 | + $metadata |
|
| 33 | + ); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | $blogCommentRepository = new BlogCommentRepository($container['db_connection_locator']); |
@@ -41,22 +41,22 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | $commentFeed = Feed::loadRss('http://blog.jacobemerick.com/rss-comments.xml'); |
| 43 | 43 | foreach ($commentFeed->item as $item) { |
| 44 | - $datetime = new DateTime($item->pubDate); |
|
| 45 | - if ($datetime <= $mostRecentBlogCommentDateTime) { |
|
| 46 | - break; |
|
| 47 | - } |
|
| 48 | - |
|
| 49 | - $uniqueBlogCommentCheck = $blogCommentRepository->getBlogCommentByPermalink((string) $item->guid); |
|
| 50 | - if ($uniqueBlogCommentCheck !== false) { |
|
| 51 | - continue; |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - $datetime->setTimezone($container['default_timezone']); |
|
| 55 | - $metadata = json_decode(json_encode($item), true); |
|
| 56 | - |
|
| 57 | - $blogCommentRepository->insertBlogComment( |
|
| 58 | - (string) $item->guid, |
|
| 59 | - $datetime, |
|
| 60 | - $metadata |
|
| 61 | - ); |
|
| 44 | + $datetime = new DateTime($item->pubDate); |
|
| 45 | + if ($datetime <= $mostRecentBlogCommentDateTime) { |
|
| 46 | + break; |
|
| 47 | + } |
|
| 48 | + |
|
| 49 | + $uniqueBlogCommentCheck = $blogCommentRepository->getBlogCommentByPermalink((string) $item->guid); |
|
| 50 | + if ($uniqueBlogCommentCheck !== false) { |
|
| 51 | + continue; |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + $datetime->setTimezone($container['default_timezone']); |
|
| 55 | + $metadata = json_decode(json_encode($item), true); |
|
| 56 | + |
|
| 57 | + $blogCommentRepository->insertBlogComment( |
|
| 58 | + (string) $item->guid, |
|
| 59 | + $datetime, |
|
| 60 | + $metadata |
|
| 61 | + ); |
|
| 62 | 62 | } |