@@ -8,93 +8,93 @@ |
||
8 | 8 | class MysqlGoodreadRepository implements GoodreadRepositoryInterface |
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 $limit |
|
24 | - * @param integer $offset |
|
25 | - * |
|
26 | - * @return array|false |
|
27 | - */ |
|
28 | - public function getReviews($limit = null, $offset = 0) |
|
29 | - { |
|
30 | - $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 $limit |
|
24 | + * @param integer $offset |
|
25 | + * |
|
26 | + * @return array|false |
|
27 | + */ |
|
28 | + public function getReviews($limit = null, $offset = 0) |
|
29 | + { |
|
30 | + $query = " |
|
31 | 31 | SELECT `id`, `permalink`, `datetime` |
32 | 32 | FROM `jpemeric_stream`.`goodread` |
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 | - public function getReviewByPermalink($permalink) |
|
46 | - { |
|
47 | - $query = " |
|
45 | + public function getReviewByPermalink($permalink) |
|
46 | + { |
|
47 | + $query = " |
|
48 | 48 | SELECT * |
49 | 49 | FROM `jpemeric_stream`.`goodread` |
50 | 50 | WHERE `permalink` = :permalink |
51 | 51 | LIMIT 1"; |
52 | 52 | |
53 | - $bindings = [ |
|
54 | - 'permalink' => $permalink, |
|
55 | - ]; |
|
53 | + $bindings = [ |
|
54 | + 'permalink' => $permalink, |
|
55 | + ]; |
|
56 | 56 | |
57 | - return $this |
|
58 | - ->connections |
|
59 | - ->getRead() |
|
60 | - ->fetchOne($query, $bindings); |
|
61 | - } |
|
57 | + return $this |
|
58 | + ->connections |
|
59 | + ->getRead() |
|
60 | + ->fetchOne($query, $bindings); |
|
61 | + } |
|
62 | 62 | |
63 | - public function getGoodreadsUpdatedSince(DateTime $datetime) |
|
64 | - { |
|
65 | - $query = " |
|
63 | + public function getGoodreadsUpdatedSince(DateTime $datetime) |
|
64 | + { |
|
65 | + $query = " |
|
66 | 66 | SELECT * |
67 | 67 | FROM `jpemeric_stream`.`goodread` |
68 | 68 | WHERE `updated_at` >= :last_update"; |
69 | 69 | |
70 | - $bindings = [ |
|
71 | - 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
72 | - ]; |
|
70 | + $bindings = [ |
|
71 | + 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
72 | + ]; |
|
73 | 73 | |
74 | - return $this |
|
75 | - ->connections |
|
76 | - ->getRead() |
|
77 | - ->fetchAll($query, $bindings); |
|
78 | - } |
|
74 | + return $this |
|
75 | + ->connections |
|
76 | + ->getRead() |
|
77 | + ->fetchAll($query, $bindings); |
|
78 | + } |
|
79 | 79 | |
80 | - public function insertReview($permalink, $bookId, DateTime $datetime, array $metadata) |
|
81 | - { |
|
82 | - $query = " |
|
80 | + public function insertReview($permalink, $bookId, DateTime $datetime, array $metadata) |
|
81 | + { |
|
82 | + $query = " |
|
83 | 83 | INSERT INTO `jpemeric_stream`.`goodread` |
84 | 84 | (`permalink`, `book_id`, `datetime`, `metadata`) |
85 | 85 | VALUES |
86 | 86 | (:permalink, :book_id, :datetime, :metadata)"; |
87 | 87 | |
88 | - $bindings = [ |
|
89 | - 'permalink' => $permalink, |
|
90 | - 'book_id' => $bookId, |
|
91 | - 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
92 | - 'metadata' => json_encode($metadata), |
|
93 | - ]; |
|
94 | - |
|
95 | - return $this |
|
96 | - ->connections |
|
97 | - ->getWrite() |
|
98 | - ->perform($query, $bindings); |
|
99 | - } |
|
88 | + $bindings = [ |
|
89 | + 'permalink' => $permalink, |
|
90 | + 'book_id' => $bookId, |
|
91 | + 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
92 | + 'metadata' => json_encode($metadata), |
|
93 | + ]; |
|
94 | + |
|
95 | + return $this |
|
96 | + ->connections |
|
97 | + ->getWrite() |
|
98 | + ->perform($query, $bindings); |
|
99 | + } |
|
100 | 100 | } |
@@ -8,104 +8,104 @@ |
||
8 | 8 | class MysqlGithubRepository implements GithubRepositoryInterface |
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 getEvents($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 getEvents($limit = null, $offset = 0) |
|
29 | + { |
|
30 | + $query = " |
|
31 | 31 | SELECT `id`, `event_id`, `datetime` |
32 | 32 | FROM `jpemeric_stream`.`github` |
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 integer $eventId |
|
47 | - * |
|
48 | - * @return array|false |
|
49 | - */ |
|
50 | - public function getEventByEventId($eventId) |
|
51 | - { |
|
52 | - $query = " |
|
45 | + /** |
|
46 | + * @param integer $eventId |
|
47 | + * |
|
48 | + * @return array|false |
|
49 | + */ |
|
50 | + public function getEventByEventId($eventId) |
|
51 | + { |
|
52 | + $query = " |
|
53 | 53 | SELECT * |
54 | 54 | FROM `jpemeric_stream`.`github` |
55 | 55 | WHERE `event_id` = :event_id |
56 | 56 | LIMIT 1"; |
57 | 57 | |
58 | - $bindings = [ |
|
59 | - 'event_id' => $eventId, |
|
60 | - ]; |
|
58 | + $bindings = [ |
|
59 | + 'event_id' => $eventId, |
|
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 getGithubsUpdatedSince(DateTime $datetime) |
|
69 | - { |
|
70 | - $query = " |
|
68 | + public function getGithubsUpdatedSince(DateTime $datetime) |
|
69 | + { |
|
70 | + $query = " |
|
71 | 71 | SELECT * |
72 | 72 | FROM `jpemeric_stream`.`github` |
73 | 73 | WHERE `updated_at` >= :last_update"; |
74 | - $bindings = [ |
|
75 | - 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
76 | - ]; |
|
77 | - return $this |
|
78 | - ->connections |
|
79 | - ->getRead() |
|
80 | - ->fetchAll($query, $bindings); |
|
81 | - } |
|
74 | + $bindings = [ |
|
75 | + 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
76 | + ]; |
|
77 | + return $this |
|
78 | + ->connections |
|
79 | + ->getRead() |
|
80 | + ->fetchAll($query, $bindings); |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * @param integer $eventId |
|
85 | - * @param string $eventType |
|
86 | - * @param DateTime $datetime |
|
87 | - * @param array $metadata |
|
88 | - * |
|
89 | - * @return |
|
90 | - */ |
|
91 | - public function insertEvent($eventId, $eventType, DateTime $datetime, array $metadata) |
|
92 | - { |
|
93 | - $query = " |
|
83 | + /** |
|
84 | + * @param integer $eventId |
|
85 | + * @param string $eventType |
|
86 | + * @param DateTime $datetime |
|
87 | + * @param array $metadata |
|
88 | + * |
|
89 | + * @return |
|
90 | + */ |
|
91 | + public function insertEvent($eventId, $eventType, DateTime $datetime, array $metadata) |
|
92 | + { |
|
93 | + $query = " |
|
94 | 94 | INSERT INTO `jpemeric_stream`.`github` |
95 | 95 | (`event_id`, `type`, `datetime`, `metadata`) |
96 | 96 | VALUES |
97 | 97 | (:event_id, :event_type, :datetime, :metadata)"; |
98 | 98 | |
99 | - $bindings = [ |
|
100 | - 'event_id' => $eventId, |
|
101 | - 'event_type' => $eventType, |
|
102 | - 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
103 | - 'metadata' => json_encode($metadata), |
|
104 | - ]; |
|
99 | + $bindings = [ |
|
100 | + 'event_id' => $eventId, |
|
101 | + 'event_type' => $eventType, |
|
102 | + 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
103 | + 'metadata' => json_encode($metadata), |
|
104 | + ]; |
|
105 | 105 | |
106 | - return $this |
|
107 | - ->connections |
|
108 | - ->getWrite() |
|
109 | - ->perform($query, $bindings); |
|
110 | - } |
|
106 | + return $this |
|
107 | + ->connections |
|
108 | + ->getWrite() |
|
109 | + ->perform($query, $bindings); |
|
110 | + } |
|
111 | 111 | } |
@@ -8,150 +8,150 @@ |
||
8 | 8 | class MysqlTwitterRepository implements TwitterRepositoryInterface |
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 getTwitterById($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 getTwitterById($id) |
|
28 | + { |
|
29 | + $query = " |
|
30 | 30 | SELECT * |
31 | 31 | FROM `jpemeric_stream`.`twitter` |
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 getTwitterByTweetId($tweetId) |
|
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 getTwitterByTweetId($tweetId) |
|
45 | + { |
|
46 | + $query = " |
|
47 | 47 | SELECT `id`, `tweet_id`, `datetime`, `metadata` |
48 | 48 | FROM `jpemeric_stream`.`twitter2` |
49 | 49 | WHERE `tweet_id` = :tweet_id |
50 | 50 | LIMIT 1"; |
51 | 51 | |
52 | - $bindings = [ |
|
53 | - 'tweet_id' => $tweetId, |
|
54 | - ]; |
|
55 | - |
|
56 | - return $this |
|
57 | - ->connections |
|
58 | - ->getRead() |
|
59 | - ->fetchOne($query, $bindings); |
|
60 | - } |
|
61 | - |
|
62 | - /** |
|
63 | - * @param DateTime $date |
|
64 | - * @param string $text |
|
65 | - * |
|
66 | - * @return array|false |
|
67 | - */ |
|
68 | - public function getTwitterByFields(DateTime $date, $text) |
|
69 | - { |
|
70 | - $query = " |
|
52 | + $bindings = [ |
|
53 | + 'tweet_id' => $tweetId, |
|
54 | + ]; |
|
55 | + |
|
56 | + return $this |
|
57 | + ->connections |
|
58 | + ->getRead() |
|
59 | + ->fetchOne($query, $bindings); |
|
60 | + } |
|
61 | + |
|
62 | + /** |
|
63 | + * @param DateTime $date |
|
64 | + * @param string $text |
|
65 | + * |
|
66 | + * @return array|false |
|
67 | + */ |
|
68 | + public function getTwitterByFields(DateTime $date, $text) |
|
69 | + { |
|
70 | + $query = " |
|
71 | 71 | SELECT * |
72 | 72 | FROM `jpemeric_stream`.`twitter` |
73 | 73 | WHERE `date` = :date AND `text` = :text |
74 | 74 | LIMIT 1"; |
75 | - $bindings = [ |
|
76 | - 'date' => $date->format('Y-m-d H:i:s'), |
|
77 | - 'text' => $text, |
|
78 | - ]; |
|
79 | - |
|
80 | - return $this |
|
81 | - ->connections |
|
82 | - ->getRead() |
|
83 | - ->fetchOne($query, $bindings); |
|
84 | - } |
|
85 | - |
|
86 | - /** |
|
87 | - * @return array|false |
|
88 | - */ |
|
89 | - public function getUnmappedTwitters() |
|
90 | - { |
|
91 | - $query = " |
|
75 | + $bindings = [ |
|
76 | + 'date' => $date->format('Y-m-d H:i:s'), |
|
77 | + 'text' => $text, |
|
78 | + ]; |
|
79 | + |
|
80 | + return $this |
|
81 | + ->connections |
|
82 | + ->getRead() |
|
83 | + ->fetchOne($query, $bindings); |
|
84 | + } |
|
85 | + |
|
86 | + /** |
|
87 | + * @return array|false |
|
88 | + */ |
|
89 | + public function getUnmappedTwitters() |
|
90 | + { |
|
91 | + $query = " |
|
92 | 92 | SELECT `id`, `date` |
93 | 93 | FROM `jpemeric_stream`.`twitter` |
94 | 94 | LEFT JOIN `jpemeric_stream`.`post` |
95 | 95 | ON `post`.`type_id` = `twitter`.`id` AND `post`.`id` IS NULL"; |
96 | 96 | |
97 | - return $this |
|
98 | - ->connections |
|
99 | - ->getRead() |
|
100 | - ->fetchAll($query); |
|
101 | - } |
|
97 | + return $this |
|
98 | + ->connections |
|
99 | + ->getRead() |
|
100 | + ->fetchAll($query); |
|
101 | + } |
|
102 | 102 | |
103 | - public function getTwittersUpdatedSince(DateTime $datetime) |
|
104 | - { |
|
105 | - $query = " |
|
103 | + public function getTwittersUpdatedSince(DateTime $datetime) |
|
104 | + { |
|
105 | + $query = " |
|
106 | 106 | SELECT * |
107 | 107 | FROM `jpemeric_stream`.`twitter2` |
108 | 108 | WHERE `updated_at` >= :last_update"; |
109 | 109 | |
110 | - $bindings = [ |
|
111 | - 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
112 | - ]; |
|
110 | + $bindings = [ |
|
111 | + 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
112 | + ]; |
|
113 | 113 | |
114 | - return $this |
|
115 | - ->connections |
|
116 | - ->getRead() |
|
117 | - ->fetchAll($query, $bindings); |
|
118 | - } |
|
114 | + return $this |
|
115 | + ->connections |
|
116 | + ->getRead() |
|
117 | + ->fetchAll($query, $bindings); |
|
118 | + } |
|
119 | 119 | |
120 | - public function insertTweet($tweetId, DateTime $datetime, array $metadata) |
|
121 | - { |
|
122 | - $query = " |
|
120 | + public function insertTweet($tweetId, DateTime $datetime, array $metadata) |
|
121 | + { |
|
122 | + $query = " |
|
123 | 123 | INSERT INTO `jpemeric_stream`.`twitter2` |
124 | 124 | (`tweet_id`, `datetime`, `metadata`) |
125 | 125 | VALUES |
126 | 126 | (:tweet_id, :datetime, :metadata)"; |
127 | 127 | |
128 | - $bindings = [ |
|
129 | - 'tweet_id' => $tweetId, |
|
130 | - 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
131 | - 'metadata' => json_encode($metadata), |
|
132 | - ]; |
|
133 | - |
|
134 | - return $this |
|
135 | - ->connections |
|
136 | - ->getWrite() |
|
137 | - ->perform($query, $bindings); |
|
138 | - } |
|
139 | - |
|
140 | - public function updateTweetMetadata($tweetId, array $metadata) |
|
141 | - { |
|
142 | - $query = " |
|
128 | + $bindings = [ |
|
129 | + 'tweet_id' => $tweetId, |
|
130 | + 'datetime' => $datetime->format('Y-m-d H:i:s'), |
|
131 | + 'metadata' => json_encode($metadata), |
|
132 | + ]; |
|
133 | + |
|
134 | + return $this |
|
135 | + ->connections |
|
136 | + ->getWrite() |
|
137 | + ->perform($query, $bindings); |
|
138 | + } |
|
139 | + |
|
140 | + public function updateTweetMetadata($tweetId, array $metadata) |
|
141 | + { |
|
142 | + $query = " |
|
143 | 143 | UPDATE `jpemeric_stream`.`twitter2` |
144 | 144 | SET `metadata` = :metadata |
145 | 145 | WHERE `tweet_id` = :tweet_id"; |
146 | 146 | |
147 | - $bindings = [ |
|
148 | - 'metadata' => json_encode($metadata), |
|
149 | - 'tweet_id' => $tweetId, |
|
150 | - ]; |
|
147 | + $bindings = [ |
|
148 | + 'metadata' => json_encode($metadata), |
|
149 | + 'tweet_id' => $tweetId, |
|
150 | + ]; |
|
151 | 151 | |
152 | - return $this |
|
153 | - ->connections |
|
154 | - ->getWrite() |
|
155 | - ->perform($query, $bindings); |
|
156 | - } |
|
152 | + return $this |
|
153 | + ->connections |
|
154 | + ->getWrite() |
|
155 | + ->perform($query, $bindings); |
|
156 | + } |
|
157 | 157 | } |
@@ -406,7 +406,7 @@ |
||
406 | 406 | |
407 | 407 | $messageLong = $twitterData['text']; |
408 | 408 | krsort($entityHolder); |
409 | - foreach($entityHolder as $entity) |
|
409 | + foreach ($entityHolder as $entity) |
|
410 | 410 | { |
411 | 411 | $messageLong = substr_replace( |
412 | 412 | $messageLong, |
@@ -11,58 +11,58 @@ discard block |
||
11 | 11 | |
12 | 12 | $lastBlogActivity = $activityRepository->getActivityLastUpdateByType('blog'); |
13 | 13 | if ($lastBlogActivity === false) { |
14 | - $lastBlogActivityDateTime = new DateTime('2008-05-03'); |
|
14 | + $lastBlogActivityDateTime = new DateTime('2008-05-03'); |
|
15 | 15 | } else { |
16 | - $lastBlogActivityDateTime = new DateTime($lastBlogActivity['updated_at']); |
|
17 | - $lastBlogActivityDateTime->modify('-5 days'); |
|
16 | + $lastBlogActivityDateTime = new DateTime($lastBlogActivity['updated_at']); |
|
17 | + $lastBlogActivityDateTime->modify('-5 days'); |
|
18 | 18 | } |
19 | 19 | $newBlogActivity = $blogRepository->getBlogsUpdatedSince($lastBlogActivityDateTime); |
20 | 20 | foreach ($newBlogActivity as $blog) { |
21 | - $uniqueBlogCheck = $activityRepository->getActivityByTypeId('blog', $blog['id']); |
|
22 | - if ($uniqueBlogCheck !== false) { |
|
23 | - continue; |
|
24 | - } |
|
25 | - |
|
26 | - $blogData = json_decode($blog['metadata'], true); |
|
27 | - $message = sprintf( |
|
28 | - 'Blogged about %s | %s.', |
|
29 | - str_replace('-', ' ', $blogData['category']), |
|
30 | - $blogData['title'] |
|
31 | - ); |
|
32 | - |
|
33 | - if (isset($blogData['enclosure'])) { |
|
34 | - $messageLong = sprintf( |
|
35 | - "<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" . |
|
36 | - "<img src=\"%s\" alt=\"Blog | %s\" />\n" . |
|
37 | - "<p>%s [<a href=\"%s\">read more</a></a>]</p>", |
|
38 | - $blogData['link'], |
|
39 | - $blogData['title'], |
|
40 | - $blogData['title'], |
|
41 | - $blogData['enclosure']['@attributes']['url'], |
|
42 | - $blogData['title'], |
|
43 | - htmlentities($blogData['description']), |
|
44 | - $blogData['link'] |
|
45 | - ); |
|
46 | - } else { |
|
47 | - $messageLong = sprintf( |
|
48 | - "<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" . |
|
49 | - "<p>%s [<a href=\"%s\">read more</a></a>]</p>", |
|
50 | - $blogData['link'], |
|
51 | - $blogData['title'], |
|
52 | - $blogData['title'], |
|
53 | - htmlentities($blogData['description']), |
|
54 | - $blogData['link'] |
|
55 | - ); |
|
56 | - } |
|
57 | - |
|
58 | - $activityRepository->insertActivity( |
|
59 | - $message, |
|
60 | - $messageLong, |
|
61 | - (new DateTime($blog['datetime'])), |
|
62 | - [], |
|
63 | - 'blog', |
|
64 | - $blog['id'] |
|
65 | - ); |
|
21 | + $uniqueBlogCheck = $activityRepository->getActivityByTypeId('blog', $blog['id']); |
|
22 | + if ($uniqueBlogCheck !== false) { |
|
23 | + continue; |
|
24 | + } |
|
25 | + |
|
26 | + $blogData = json_decode($blog['metadata'], true); |
|
27 | + $message = sprintf( |
|
28 | + 'Blogged about %s | %s.', |
|
29 | + str_replace('-', ' ', $blogData['category']), |
|
30 | + $blogData['title'] |
|
31 | + ); |
|
32 | + |
|
33 | + if (isset($blogData['enclosure'])) { |
|
34 | + $messageLong = sprintf( |
|
35 | + "<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" . |
|
36 | + "<img src=\"%s\" alt=\"Blog | %s\" />\n" . |
|
37 | + "<p>%s [<a href=\"%s\">read more</a></a>]</p>", |
|
38 | + $blogData['link'], |
|
39 | + $blogData['title'], |
|
40 | + $blogData['title'], |
|
41 | + $blogData['enclosure']['@attributes']['url'], |
|
42 | + $blogData['title'], |
|
43 | + htmlentities($blogData['description']), |
|
44 | + $blogData['link'] |
|
45 | + ); |
|
46 | + } else { |
|
47 | + $messageLong = sprintf( |
|
48 | + "<h4><a href=\"%s\" title=\"Jacob Emerick's Blog | %s\">%s</a></h4>\n" . |
|
49 | + "<p>%s [<a href=\"%s\">read more</a></a>]</p>", |
|
50 | + $blogData['link'], |
|
51 | + $blogData['title'], |
|
52 | + $blogData['title'], |
|
53 | + htmlentities($blogData['description']), |
|
54 | + $blogData['link'] |
|
55 | + ); |
|
56 | + } |
|
57 | + |
|
58 | + $activityRepository->insertActivity( |
|
59 | + $message, |
|
60 | + $messageLong, |
|
61 | + (new DateTime($blog['datetime'])), |
|
62 | + [], |
|
63 | + 'blog', |
|
64 | + $blog['id'] |
|
65 | + ); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | use Jacobemerick\Web\Domain\Stream\BlogComment\MysqlBlogCommentRepository as BlogCommentRepository; |
@@ -70,30 +70,30 @@ discard block |
||
70 | 70 | $blogCommentActivity = $blogCommentRepository->getBlogComments(); |
71 | 71 | $blogCommentHolder = []; |
72 | 72 | foreach ($blogCommentActivity as $blogComment) { |
73 | - $blogPermalink = $blogComment['permalink']; |
|
74 | - $blogPermalink = explode('#', $blogPermalink); |
|
75 | - $blogPermalink = current($blogPermalink); |
|
76 | - |
|
77 | - $blog = $blogRepository->getBlogByPermalink($blogPermalink); |
|
78 | - if (!array_key_exists($blog['id'], $blogCommentHolder)) { |
|
79 | - $blogCommentHolder[$blog['id']] = 1; |
|
80 | - } else { |
|
81 | - $blogCommentHolder[$blog['id']]++; |
|
82 | - } |
|
73 | + $blogPermalink = $blogComment['permalink']; |
|
74 | + $blogPermalink = explode('#', $blogPermalink); |
|
75 | + $blogPermalink = current($blogPermalink); |
|
76 | + |
|
77 | + $blog = $blogRepository->getBlogByPermalink($blogPermalink); |
|
78 | + if (!array_key_exists($blog['id'], $blogCommentHolder)) { |
|
79 | + $blogCommentHolder[$blog['id']] = 1; |
|
80 | + } else { |
|
81 | + $blogCommentHolder[$blog['id']]++; |
|
82 | + } |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | foreach ($blogCommentHolder as $blogId => $commentCount) { |
86 | - $blogActivity = $activityRepository->getActivityByTypeId('blog', $blogId); |
|
87 | - $blogActivityMetadata = json_decode($blogActivity['metadata'], true); |
|
88 | - if ( |
|
89 | - !isset($blogActivityMetadata['comments']) || |
|
90 | - $blogActivityMetadata['comments'] != $commentCount |
|
91 | - ) { |
|
92 | - $activityRepository->updateActivityMetadata( |
|
93 | - $blogActivity['id'], |
|
94 | - ['comments' => $commentCount] |
|
95 | - ); |
|
96 | - } |
|
86 | + $blogActivity = $activityRepository->getActivityByTypeId('blog', $blogId); |
|
87 | + $blogActivityMetadata = json_decode($blogActivity['metadata'], true); |
|
88 | + if ( |
|
89 | + !isset($blogActivityMetadata['comments']) || |
|
90 | + $blogActivityMetadata['comments'] != $commentCount |
|
91 | + ) { |
|
92 | + $activityRepository->updateActivityMetadata( |
|
93 | + $blogActivity['id'], |
|
94 | + ['comments' => $commentCount] |
|
95 | + ); |
|
96 | + } |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | // distance |
@@ -102,67 +102,67 @@ discard block |
||
102 | 102 | |
103 | 103 | $lastDailyMileActivity = $activityRepository->getActivityLastUpdateByType('distance'); |
104 | 104 | if ($lastDailyMileActivity === false) { |
105 | - $lastDailyMileActivityDateTime = new DateTime('2008-05-03'); |
|
105 | + $lastDailyMileActivityDateTime = new DateTime('2008-05-03'); |
|
106 | 106 | } else { |
107 | - $lastDailyMileActivityDateTime = new DateTime($lastDailyMileActivity['updated_at']); |
|
108 | - $lastDailyMileActivityDateTime->modify('-5 days'); |
|
107 | + $lastDailyMileActivityDateTime = new DateTime($lastDailyMileActivity['updated_at']); |
|
108 | + $lastDailyMileActivityDateTime->modify('-5 days'); |
|
109 | 109 | } |
110 | 110 | $newDailyMileActivity = $dailyMileRepository->getDailyMilesUpdatedSince($lastDailyMileActivityDateTime); |
111 | 111 | foreach ($newDailyMileActivity as $dailyMile) { |
112 | - $uniqueDailyMileCheck = $activityRepository->getActivityByTypeId('distance', $dailyMile['id']); |
|
113 | - if ($uniqueDailyMileCheck !== false) { |
|
114 | - continue; |
|
115 | - } |
|
116 | - |
|
117 | - $dailyMileData = json_decode($dailyMile['metadata'], true); |
|
118 | - if ($dailyMile['type'] == 'Hiking') { |
|
119 | - $message = sprintf( |
|
120 | - '%s %.2f %s and felt %s.', |
|
121 | - 'Hiked', |
|
122 | - $dailyMileData['workout']['distance']['value'], |
|
123 | - $dailyMileData['workout']['distance']['units'], |
|
124 | - $dailyMileData['workout']['felt'] |
|
125 | - ); |
|
126 | - $messageLong = "<p>{$message}</p>"; |
|
127 | - if (isset($dailyMileData['workout']['title'])) { |
|
128 | - $messageLong .= "\n<p>I was hiking up around the {$dailyMileData['workout']['title']} area.</p>"; |
|
129 | - } |
|
130 | - } else if ($dailyMile['type'] == 'Running') { |
|
131 | - $message = sprintf( |
|
132 | - '%s %.2f %s and felt %s.', |
|
133 | - 'Ran', |
|
134 | - $dailyMileData['workout']['distance']['value'], |
|
135 | - $dailyMileData['workout']['distance']['units'], |
|
136 | - $dailyMileData['workout']['felt'] |
|
137 | - ); |
|
138 | - $messageLong = "<p>{$message}</p>"; |
|
139 | - if (isset($dailyMileData['message'])) { |
|
140 | - $messageLong .= "\n<p>Afterwards, I was all like '{$dailyMileData['message']}'.</p>"; |
|
141 | - } |
|
142 | - } else if ($dailyMile['type'] == 'Walking') { |
|
143 | - $message = sprintf( |
|
144 | - '%s %.2f %s and felt %s.', |
|
145 | - 'Walked', |
|
146 | - $dailyMileData['workout']['distance']['value'], |
|
147 | - $dailyMileData['workout']['distance']['units'], |
|
148 | - $dailyMileData['workout']['felt'] |
|
149 | - ); |
|
150 | - $messageLong = "<p>{$message}</p>"; |
|
151 | - if (isset($dailyMileData['message'])) { |
|
152 | - $messageLong .= "\n<p>{$dailyMileData['message']}</p>"; |
|
153 | - } |
|
154 | - } else { |
|
155 | - continue; |
|
156 | - } |
|
157 | - |
|
158 | - $activityRepository->insertActivity( |
|
159 | - $message, |
|
160 | - $messageLong, |
|
161 | - (new DateTime($dailyMile['datetime'])), |
|
162 | - [], |
|
163 | - 'distance', |
|
164 | - $dailyMile['id'] |
|
165 | - ); |
|
112 | + $uniqueDailyMileCheck = $activityRepository->getActivityByTypeId('distance', $dailyMile['id']); |
|
113 | + if ($uniqueDailyMileCheck !== false) { |
|
114 | + continue; |
|
115 | + } |
|
116 | + |
|
117 | + $dailyMileData = json_decode($dailyMile['metadata'], true); |
|
118 | + if ($dailyMile['type'] == 'Hiking') { |
|
119 | + $message = sprintf( |
|
120 | + '%s %.2f %s and felt %s.', |
|
121 | + 'Hiked', |
|
122 | + $dailyMileData['workout']['distance']['value'], |
|
123 | + $dailyMileData['workout']['distance']['units'], |
|
124 | + $dailyMileData['workout']['felt'] |
|
125 | + ); |
|
126 | + $messageLong = "<p>{$message}</p>"; |
|
127 | + if (isset($dailyMileData['workout']['title'])) { |
|
128 | + $messageLong .= "\n<p>I was hiking up around the {$dailyMileData['workout']['title']} area.</p>"; |
|
129 | + } |
|
130 | + } else if ($dailyMile['type'] == 'Running') { |
|
131 | + $message = sprintf( |
|
132 | + '%s %.2f %s and felt %s.', |
|
133 | + 'Ran', |
|
134 | + $dailyMileData['workout']['distance']['value'], |
|
135 | + $dailyMileData['workout']['distance']['units'], |
|
136 | + $dailyMileData['workout']['felt'] |
|
137 | + ); |
|
138 | + $messageLong = "<p>{$message}</p>"; |
|
139 | + if (isset($dailyMileData['message'])) { |
|
140 | + $messageLong .= "\n<p>Afterwards, I was all like '{$dailyMileData['message']}'.</p>"; |
|
141 | + } |
|
142 | + } else if ($dailyMile['type'] == 'Walking') { |
|
143 | + $message = sprintf( |
|
144 | + '%s %.2f %s and felt %s.', |
|
145 | + 'Walked', |
|
146 | + $dailyMileData['workout']['distance']['value'], |
|
147 | + $dailyMileData['workout']['distance']['units'], |
|
148 | + $dailyMileData['workout']['felt'] |
|
149 | + ); |
|
150 | + $messageLong = "<p>{$message}</p>"; |
|
151 | + if (isset($dailyMileData['message'])) { |
|
152 | + $messageLong .= "\n<p>{$dailyMileData['message']}</p>"; |
|
153 | + } |
|
154 | + } else { |
|
155 | + continue; |
|
156 | + } |
|
157 | + |
|
158 | + $activityRepository->insertActivity( |
|
159 | + $message, |
|
160 | + $messageLong, |
|
161 | + (new DateTime($dailyMile['datetime'])), |
|
162 | + [], |
|
163 | + 'distance', |
|
164 | + $dailyMile['id'] |
|
165 | + ); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | // github |
@@ -171,127 +171,127 @@ discard block |
||
171 | 171 | |
172 | 172 | $lastGithubActivity = $activityRepository->getActivityLastUpdateByType('git'); |
173 | 173 | if ($lastGithubActivity === false) { |
174 | - $lastGithubActivityDateTime = new DateTime('2015-10-01'); |
|
174 | + $lastGithubActivityDateTime = new DateTime('2015-10-01'); |
|
175 | 175 | } else { |
176 | - $lastGithubActivityDateTime = new DateTime($lastGithubActivity['updated_at']); |
|
177 | - $lastGithubActivityDateTime->modify('-5 days'); |
|
176 | + $lastGithubActivityDateTime = new DateTime($lastGithubActivity['updated_at']); |
|
177 | + $lastGithubActivityDateTime->modify('-5 days'); |
|
178 | 178 | } |
179 | 179 | $newGithubActivity = $githubRepository->getGithubsUpdatedSince($lastGithubActivityDateTime); |
180 | 180 | foreach ($newGithubActivity as $github) { |
181 | - $uniqueGithubCheck = $activityRepository->getActivityByTypeId('git', $github['id']); |
|
182 | - if ($uniqueGithubCheck !== false) { |
|
183 | - continue; |
|
184 | - } |
|
185 | - |
|
186 | - $githubData = json_decode($github['metadata'], true); |
|
187 | - |
|
188 | - if ($github['type'] == 'CreateEvent') { |
|
189 | - if ( |
|
190 | - $githubData['payload']['ref_type'] == 'branch' || |
|
191 | - $githubData['payload']['ref_type'] == 'tag' |
|
192 | - ) { |
|
193 | - $message = sprintf( |
|
194 | - 'Created %s %s at %s.', |
|
195 | - $githubData['payload']['ref_type'], |
|
196 | - $githubData['payload']['ref'], |
|
197 | - $githubData['repo']['name'] |
|
198 | - ); |
|
199 | - $messageLong = sprintf( |
|
200 | - '<p>Created %s %s at <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>', |
|
201 | - $githubData['payload']['ref_type'], |
|
202 | - $githubData['payload']['ref'], |
|
203 | - "https://github.com/{$githubData['repo']['name']}", |
|
204 | - $githubData['repo']['name'], |
|
205 | - $githubData['repo']['name'] |
|
206 | - ); |
|
207 | - } else if ($githubData['payload']['ref_type'] == 'repository') { |
|
208 | - $message = sprintf( |
|
209 | - 'Created %s %s.', |
|
210 | - $githubData['payload']['ref_type'], |
|
211 | - $githubData['repo']['name'] |
|
212 | - ); |
|
213 | - $messageLong = sprintf( |
|
214 | - '<p>Created %s <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>', |
|
215 | - $githubData['payload']['ref_type'], |
|
216 | - "https://github.com/{$githubData['repo']['name']}", |
|
217 | - $githubData['repo']['name'], |
|
218 | - $githubData['repo']['name'] |
|
219 | - ); |
|
220 | - } else { |
|
221 | - continue; |
|
222 | - } |
|
223 | - } else if ($github['type'] == 'ForkEvent') { |
|
224 | - $message = sprintf( |
|
225 | - 'Forked %s to %s', |
|
226 | - $githubData['repo']['name'], |
|
227 | - $githubData['payload']['forkee']['full_name'] |
|
228 | - ); |
|
229 | - $messageLong = sprintf( |
|
230 | - '<p>Forked <a href="%s" target="_blank" title="Github | %s">%s</a> to <a href="%s" target="_blank" title="Github | %s">%s</a>.', |
|
231 | - "https://github.com/{$githubData['repo']['name']}", |
|
232 | - $githubData['repo']['name'], |
|
233 | - $githubData['repo']['name'], |
|
234 | - $githubData['payload']['forkee']['html_url'], |
|
235 | - $githubData['payload']['forkee']['full_name'], |
|
236 | - $githubData['payload']['forkee']['full_name'] |
|
237 | - ); |
|
238 | - } else if ($github['type'] == 'PullRequestEvent') { |
|
239 | - $message = sprintf( |
|
240 | - '%s a pull request at %s', |
|
241 | - ucwords($githubData['payload']['action']), |
|
242 | - $githubData['repo']['name'] |
|
243 | - ); |
|
244 | - $messageLong = sprintf( |
|
245 | - '<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>', |
|
246 | - ucwords($githubData['payload']['action']), |
|
247 | - $githubData['payload']['pull_request']['html_url'], |
|
248 | - $githubData['repo']['name'], |
|
249 | - $githubData['payload']['number'], |
|
250 | - $githubData['payload']['number'], |
|
251 | - "https://github.com/{$githubData['repo']['name']}", |
|
252 | - $githubData['repo']['name'], |
|
253 | - $githubData['repo']['name'] |
|
254 | - ); |
|
255 | - } else if ($github['type'] == 'PushEvent') { |
|
256 | - $message = sprintf( |
|
257 | - 'Pushed some code at %s.', |
|
258 | - $githubData['repo']['name'] |
|
259 | - ); |
|
260 | - $messageLong = sprintf( |
|
261 | - "<p>Pushed some code at <a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a>.</p>\n", |
|
262 | - $githubData['payload']['ref'], |
|
263 | - "https://github.com/{$githubData['repo']['name']}", |
|
264 | - $githubData['repo']['name'], |
|
265 | - $githubData['repo']['name'] |
|
266 | - ); |
|
267 | - $messageLong .= "<ul>\n"; |
|
268 | - foreach ($githubData['payload']['commits'] as $commit) { |
|
269 | - $messageShort = $commit['message']; |
|
270 | - $messageShort = strtok($messageShort, "\n"); |
|
271 | - if (strlen($messageShort) > 72) { |
|
272 | - $messageShort = wordwrap($messageShort, 65); |
|
273 | - $messageShort = strtok($messageShort, "\n"); |
|
274 | - $messageShort .= '...'; |
|
275 | - } |
|
276 | - $messageLong .= sprintf( |
|
277 | - "<li><a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a> %s.</p>\n", |
|
278 | - "https://github.com/{$githubData['repo']['name']}/commit/{$commit['sha']}", |
|
279 | - substr($commit['sha'], 0, 7), |
|
280 | - substr($commit['sha'], 0, 7), |
|
281 | - $messageShort |
|
282 | - ); |
|
283 | - } |
|
284 | - $messageLong .= "</ul>"; |
|
285 | - } |
|
286 | - |
|
287 | - $activityRepository->insertActivity( |
|
288 | - $message, |
|
289 | - $messageLong, |
|
290 | - (new DateTime($github['datetime'])), |
|
291 | - [], |
|
292 | - 'git', |
|
293 | - $github['id'] |
|
294 | - ); |
|
181 | + $uniqueGithubCheck = $activityRepository->getActivityByTypeId('git', $github['id']); |
|
182 | + if ($uniqueGithubCheck !== false) { |
|
183 | + continue; |
|
184 | + } |
|
185 | + |
|
186 | + $githubData = json_decode($github['metadata'], true); |
|
187 | + |
|
188 | + if ($github['type'] == 'CreateEvent') { |
|
189 | + if ( |
|
190 | + $githubData['payload']['ref_type'] == 'branch' || |
|
191 | + $githubData['payload']['ref_type'] == 'tag' |
|
192 | + ) { |
|
193 | + $message = sprintf( |
|
194 | + 'Created %s %s at %s.', |
|
195 | + $githubData['payload']['ref_type'], |
|
196 | + $githubData['payload']['ref'], |
|
197 | + $githubData['repo']['name'] |
|
198 | + ); |
|
199 | + $messageLong = sprintf( |
|
200 | + '<p>Created %s %s at <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>', |
|
201 | + $githubData['payload']['ref_type'], |
|
202 | + $githubData['payload']['ref'], |
|
203 | + "https://github.com/{$githubData['repo']['name']}", |
|
204 | + $githubData['repo']['name'], |
|
205 | + $githubData['repo']['name'] |
|
206 | + ); |
|
207 | + } else if ($githubData['payload']['ref_type'] == 'repository') { |
|
208 | + $message = sprintf( |
|
209 | + 'Created %s %s.', |
|
210 | + $githubData['payload']['ref_type'], |
|
211 | + $githubData['repo']['name'] |
|
212 | + ); |
|
213 | + $messageLong = sprintf( |
|
214 | + '<p>Created %s <a href="%s" target="_blank" title="Github | %s">%s</a>.</p>', |
|
215 | + $githubData['payload']['ref_type'], |
|
216 | + "https://github.com/{$githubData['repo']['name']}", |
|
217 | + $githubData['repo']['name'], |
|
218 | + $githubData['repo']['name'] |
|
219 | + ); |
|
220 | + } else { |
|
221 | + continue; |
|
222 | + } |
|
223 | + } else if ($github['type'] == 'ForkEvent') { |
|
224 | + $message = sprintf( |
|
225 | + 'Forked %s to %s', |
|
226 | + $githubData['repo']['name'], |
|
227 | + $githubData['payload']['forkee']['full_name'] |
|
228 | + ); |
|
229 | + $messageLong = sprintf( |
|
230 | + '<p>Forked <a href="%s" target="_blank" title="Github | %s">%s</a> to <a href="%s" target="_blank" title="Github | %s">%s</a>.', |
|
231 | + "https://github.com/{$githubData['repo']['name']}", |
|
232 | + $githubData['repo']['name'], |
|
233 | + $githubData['repo']['name'], |
|
234 | + $githubData['payload']['forkee']['html_url'], |
|
235 | + $githubData['payload']['forkee']['full_name'], |
|
236 | + $githubData['payload']['forkee']['full_name'] |
|
237 | + ); |
|
238 | + } else if ($github['type'] == 'PullRequestEvent') { |
|
239 | + $message = sprintf( |
|
240 | + '%s a pull request at %s', |
|
241 | + ucwords($githubData['payload']['action']), |
|
242 | + $githubData['repo']['name'] |
|
243 | + ); |
|
244 | + $messageLong = sprintf( |
|
245 | + '<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>', |
|
246 | + ucwords($githubData['payload']['action']), |
|
247 | + $githubData['payload']['pull_request']['html_url'], |
|
248 | + $githubData['repo']['name'], |
|
249 | + $githubData['payload']['number'], |
|
250 | + $githubData['payload']['number'], |
|
251 | + "https://github.com/{$githubData['repo']['name']}", |
|
252 | + $githubData['repo']['name'], |
|
253 | + $githubData['repo']['name'] |
|
254 | + ); |
|
255 | + } else if ($github['type'] == 'PushEvent') { |
|
256 | + $message = sprintf( |
|
257 | + 'Pushed some code at %s.', |
|
258 | + $githubData['repo']['name'] |
|
259 | + ); |
|
260 | + $messageLong = sprintf( |
|
261 | + "<p>Pushed some code at <a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a>.</p>\n", |
|
262 | + $githubData['payload']['ref'], |
|
263 | + "https://github.com/{$githubData['repo']['name']}", |
|
264 | + $githubData['repo']['name'], |
|
265 | + $githubData['repo']['name'] |
|
266 | + ); |
|
267 | + $messageLong .= "<ul>\n"; |
|
268 | + foreach ($githubData['payload']['commits'] as $commit) { |
|
269 | + $messageShort = $commit['message']; |
|
270 | + $messageShort = strtok($messageShort, "\n"); |
|
271 | + if (strlen($messageShort) > 72) { |
|
272 | + $messageShort = wordwrap($messageShort, 65); |
|
273 | + $messageShort = strtok($messageShort, "\n"); |
|
274 | + $messageShort .= '...'; |
|
275 | + } |
|
276 | + $messageLong .= sprintf( |
|
277 | + "<li><a href=\"%s\" target=\"_blank\" title=\"Github | %s\">%s</a> %s.</p>\n", |
|
278 | + "https://github.com/{$githubData['repo']['name']}/commit/{$commit['sha']}", |
|
279 | + substr($commit['sha'], 0, 7), |
|
280 | + substr($commit['sha'], 0, 7), |
|
281 | + $messageShort |
|
282 | + ); |
|
283 | + } |
|
284 | + $messageLong .= "</ul>"; |
|
285 | + } |
|
286 | + |
|
287 | + $activityRepository->insertActivity( |
|
288 | + $message, |
|
289 | + $messageLong, |
|
290 | + (new DateTime($github['datetime'])), |
|
291 | + [], |
|
292 | + 'git', |
|
293 | + $github['id'] |
|
294 | + ); |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | // books |
@@ -300,46 +300,46 @@ discard block |
||
300 | 300 | |
301 | 301 | $lastGoodreadActivity = $activityRepository->getActivityLastUpdateByType('book'); |
302 | 302 | if ($lastGoodreadActivity === false) { |
303 | - $lastGoodreadActivityDateTime = new DateTime('2010-08-28'); |
|
303 | + $lastGoodreadActivityDateTime = new DateTime('2010-08-28'); |
|
304 | 304 | } else { |
305 | - $lastGoodreadActivityDateTime = new DateTime($lastGoodreadActivity['updated_at']); |
|
306 | - $lastGoodreadActivityDateTime->modify('-5 days'); |
|
305 | + $lastGoodreadActivityDateTime = new DateTime($lastGoodreadActivity['updated_at']); |
|
306 | + $lastGoodreadActivityDateTime->modify('-5 days'); |
|
307 | 307 | } |
308 | 308 | $newGoodreadActivity = $goodreadRepository->getGoodreadsUpdatedSince($lastGoodreadActivityDateTime); |
309 | 309 | foreach ($newGoodreadActivity as $goodread) { |
310 | - $uniqueGoodreadCheck = $activityRepository->getActivityByTypeId('book', $goodread['id']); |
|
311 | - if ($uniqueGoodreadCheck !== false) { |
|
312 | - continue; |
|
313 | - } |
|
314 | - |
|
315 | - $goodreadData = json_decode($goodread['metadata'], true); |
|
316 | - |
|
317 | - if (empty($goodreadData['user_read_at'])) { |
|
318 | - continue; |
|
319 | - } |
|
320 | - |
|
321 | - $message = sprintf( |
|
322 | - 'Read %s by %s.', |
|
323 | - $goodreadData['title'], |
|
324 | - $goodreadData['author_name'] |
|
325 | - ); |
|
326 | - if (isset($goodreadData['book_large_image_url'])) { |
|
327 | - $messageLong = sprintf( |
|
328 | - "<img alt=\"Goodreads | %s\" src=\"%s\" />\n", |
|
329 | - $goodreadData['title'], |
|
330 | - $goodreadData['book_large_image_url'] |
|
331 | - ); |
|
332 | - } |
|
333 | - $messageLong .= "<p>{$message}</p>"; |
|
334 | - |
|
335 | - $activityRepository->insertActivity( |
|
336 | - $message, |
|
337 | - $messageLong, |
|
338 | - (new DateTime($goodread['datetime'])), |
|
339 | - [], |
|
340 | - 'book', |
|
341 | - $goodread['id'] |
|
342 | - ); |
|
310 | + $uniqueGoodreadCheck = $activityRepository->getActivityByTypeId('book', $goodread['id']); |
|
311 | + if ($uniqueGoodreadCheck !== false) { |
|
312 | + continue; |
|
313 | + } |
|
314 | + |
|
315 | + $goodreadData = json_decode($goodread['metadata'], true); |
|
316 | + |
|
317 | + if (empty($goodreadData['user_read_at'])) { |
|
318 | + continue; |
|
319 | + } |
|
320 | + |
|
321 | + $message = sprintf( |
|
322 | + 'Read %s by %s.', |
|
323 | + $goodreadData['title'], |
|
324 | + $goodreadData['author_name'] |
|
325 | + ); |
|
326 | + if (isset($goodreadData['book_large_image_url'])) { |
|
327 | + $messageLong = sprintf( |
|
328 | + "<img alt=\"Goodreads | %s\" src=\"%s\" />\n", |
|
329 | + $goodreadData['title'], |
|
330 | + $goodreadData['book_large_image_url'] |
|
331 | + ); |
|
332 | + } |
|
333 | + $messageLong .= "<p>{$message}</p>"; |
|
334 | + |
|
335 | + $activityRepository->insertActivity( |
|
336 | + $message, |
|
337 | + $messageLong, |
|
338 | + (new DateTime($goodread['datetime'])), |
|
339 | + [], |
|
340 | + 'book', |
|
341 | + $goodread['id'] |
|
342 | + ); |
|
343 | 343 | } |
344 | 344 | |
345 | 345 | |
@@ -348,118 +348,118 @@ discard block |
||
348 | 348 | |
349 | 349 | $lastTwitterActivity = $activityRepository->getActivityLastUpdateByType('twitter'); |
350 | 350 | if ($lastTwitterActivity === false) { |
351 | - $lastTwitterActivityDateTime = new DateTime('2010-03-10'); |
|
351 | + $lastTwitterActivityDateTime = new DateTime('2010-03-10'); |
|
352 | 352 | } else { |
353 | - $lastTwitterActivityDateTime = new DateTime($lastTwitterActivity['updated_at']); |
|
354 | - $lastTwitterActivityDateTime->modify('-5 days'); |
|
353 | + $lastTwitterActivityDateTime = new DateTime($lastTwitterActivity['updated_at']); |
|
354 | + $lastTwitterActivityDateTime->modify('-5 days'); |
|
355 | 355 | } |
356 | 356 | $newTwitterActivity = $twitterRepository->getTwittersUpdatedSince($lastTwitterActivityDateTime); |
357 | 357 | foreach ($newTwitterActivity as $twitter) { |
358 | - $twitterData = json_decode($twitter['metadata'], true); |
|
359 | - |
|
360 | - $uniqueTwitterCheck = $activityRepository->getActivityByTypeId('twitter', $twitter['id']); |
|
361 | - if ($uniqueTwitterCheck !== false) { |
|
362 | - $metadata = []; |
|
363 | - if ($twitterData['favorite_count'] > 0) { |
|
364 | - $metadata['favorites'] = $twitterData['favorite_count']; |
|
365 | - } |
|
366 | - if ($twitterData['retweet_count'] > 0) { |
|
367 | - $metadata['retweets'] = $twitterData['retweet_count']; |
|
368 | - } |
|
369 | - |
|
370 | - $activityRepository->updateActivityMetadata($twitter['id'], $metadata); |
|
371 | - continue; |
|
372 | - } |
|
373 | - |
|
374 | - if ( |
|
375 | - ($twitterData['in_reply_to_user_id'] != null || substr($twitterData['text'], 0, 1) === '@') && |
|
376 | - $twitterData['favorite_count'] == 0 && |
|
377 | - $twitterData['retweet_count'] == 0 |
|
378 | - ) { |
|
379 | - continue; |
|
380 | - } |
|
381 | - |
|
382 | - $message = "Tweeted | {$twitterData['text']}"; |
|
383 | - $message = trim(preg_replace('/\s+/', ' ', $message)); |
|
384 | - $message = mb_convert_encoding($message, 'HTML-ENTITIES', 'UTF-8'); |
|
385 | - |
|
386 | - $entityHolder = []; |
|
387 | - foreach ($twitterData['entities'] as $entityType => $entities) { |
|
388 | - foreach ($entities as $entity) { |
|
389 | - if ($entityType == 'hashtags') { |
|
390 | - $replace = sprintf( |
|
391 | - '<a href="https://twitter.com/search?q=%%23%s&src=hash" rel="nofollow" target="_blank">#%s</a>', |
|
392 | - $entity['text'], |
|
393 | - $entity['text'] |
|
394 | - ); |
|
395 | - } else if ($entityType == 'urls') { |
|
396 | - $replace = sprintf( |
|
397 | - '<a href="%s" rel="nofollow" target="_blank" title="%s">%s</a>', |
|
398 | - $entity['url'], |
|
399 | - $entity['expanded_url'], |
|
400 | - $entity['display_url'] |
|
401 | - ); |
|
402 | - } else if ($entityType == 'user_mentions') { |
|
403 | - $replace = sprintf( |
|
404 | - '<a href="https://twitter.com/%s" rel="nofollow" target="_blank" title="Twitter | %s">@%s</a>', |
|
405 | - strtolower($entity['screen_name']), |
|
406 | - $entity['name'], |
|
407 | - $entity['screen_name'] |
|
408 | - ); |
|
409 | - } else if ($entityType == 'media') { |
|
410 | - $replace = sprintf( |
|
411 | - "<a href=\"%s\" rel=\"nofollow\" target=\"_blank\" title=\"%s\">\n" . |
|
412 | - "<img src=\"%s:%s\" alt=\"%s\" height=\"%s\" width=\"%s\" />\n" . |
|
413 | - "</a>", |
|
414 | - $entity['url'], |
|
415 | - $entity['display_url'], |
|
416 | - $entity['media_url'], |
|
417 | - 'large', |
|
418 | - $entity['display_url'], |
|
419 | - $entity['sizes']['large']['h'], |
|
420 | - $entity['sizes']['large']['w'] |
|
421 | - ); |
|
422 | - } else { |
|
423 | - continue 2; |
|
424 | - } |
|
425 | - |
|
426 | - $entityHolder[$entity['indices'][0]] = [ |
|
427 | - 'start' => $entity['indices'][0], |
|
428 | - 'end' => $entity['indices'][1], |
|
429 | - 'replace' => $replace, |
|
430 | - ]; |
|
431 | - } |
|
432 | - } |
|
433 | - |
|
434 | - $messageLong = $twitterData['text']; |
|
435 | - krsort($entityHolder); |
|
436 | - foreach($entityHolder as $entity) |
|
437 | - { |
|
438 | - $messageLong = |
|
439 | - mb_substr($messageLong, 0, $entity['start']) . |
|
440 | - $entity['replace'] . |
|
441 | - mb_substr($messageLong, $entity['end'], null, 'UTF-8'); |
|
442 | - } |
|
443 | - $messageLong = mb_convert_encoding($messageLong, 'HTML-ENTITIES', 'UTF-8'); |
|
444 | - $messageLong = nl2br($messageLong, true); |
|
445 | - $messageLong = "<p>{$messageLong}</p>"; |
|
446 | - |
|
447 | - $metadata = []; |
|
448 | - if ($twitterData['favorite_count'] > 0) { |
|
449 | - $metadata['favorites'] = $twitterData['favorite_count']; |
|
450 | - } |
|
451 | - if ($twitterData['retweet_count'] > 0) { |
|
452 | - $metadata['retweets'] = $twitterData['retweet_count']; |
|
453 | - } |
|
454 | - |
|
455 | - $activityRepository->insertActivity( |
|
456 | - $message, |
|
457 | - $messageLong, |
|
458 | - (new DateTime($twitter['datetime'])), |
|
459 | - $metadata, |
|
460 | - 'twitter', |
|
461 | - $twitter['id'] |
|
462 | - ); |
|
358 | + $twitterData = json_decode($twitter['metadata'], true); |
|
359 | + |
|
360 | + $uniqueTwitterCheck = $activityRepository->getActivityByTypeId('twitter', $twitter['id']); |
|
361 | + if ($uniqueTwitterCheck !== false) { |
|
362 | + $metadata = []; |
|
363 | + if ($twitterData['favorite_count'] > 0) { |
|
364 | + $metadata['favorites'] = $twitterData['favorite_count']; |
|
365 | + } |
|
366 | + if ($twitterData['retweet_count'] > 0) { |
|
367 | + $metadata['retweets'] = $twitterData['retweet_count']; |
|
368 | + } |
|
369 | + |
|
370 | + $activityRepository->updateActivityMetadata($twitter['id'], $metadata); |
|
371 | + continue; |
|
372 | + } |
|
373 | + |
|
374 | + if ( |
|
375 | + ($twitterData['in_reply_to_user_id'] != null || substr($twitterData['text'], 0, 1) === '@') && |
|
376 | + $twitterData['favorite_count'] == 0 && |
|
377 | + $twitterData['retweet_count'] == 0 |
|
378 | + ) { |
|
379 | + continue; |
|
380 | + } |
|
381 | + |
|
382 | + $message = "Tweeted | {$twitterData['text']}"; |
|
383 | + $message = trim(preg_replace('/\s+/', ' ', $message)); |
|
384 | + $message = mb_convert_encoding($message, 'HTML-ENTITIES', 'UTF-8'); |
|
385 | + |
|
386 | + $entityHolder = []; |
|
387 | + foreach ($twitterData['entities'] as $entityType => $entities) { |
|
388 | + foreach ($entities as $entity) { |
|
389 | + if ($entityType == 'hashtags') { |
|
390 | + $replace = sprintf( |
|
391 | + '<a href="https://twitter.com/search?q=%%23%s&src=hash" rel="nofollow" target="_blank">#%s</a>', |
|
392 | + $entity['text'], |
|
393 | + $entity['text'] |
|
394 | + ); |
|
395 | + } else if ($entityType == 'urls') { |
|
396 | + $replace = sprintf( |
|
397 | + '<a href="%s" rel="nofollow" target="_blank" title="%s">%s</a>', |
|
398 | + $entity['url'], |
|
399 | + $entity['expanded_url'], |
|
400 | + $entity['display_url'] |
|
401 | + ); |
|
402 | + } else if ($entityType == 'user_mentions') { |
|
403 | + $replace = sprintf( |
|
404 | + '<a href="https://twitter.com/%s" rel="nofollow" target="_blank" title="Twitter | %s">@%s</a>', |
|
405 | + strtolower($entity['screen_name']), |
|
406 | + $entity['name'], |
|
407 | + $entity['screen_name'] |
|
408 | + ); |
|
409 | + } else if ($entityType == 'media') { |
|
410 | + $replace = sprintf( |
|
411 | + "<a href=\"%s\" rel=\"nofollow\" target=\"_blank\" title=\"%s\">\n" . |
|
412 | + "<img src=\"%s:%s\" alt=\"%s\" height=\"%s\" width=\"%s\" />\n" . |
|
413 | + "</a>", |
|
414 | + $entity['url'], |
|
415 | + $entity['display_url'], |
|
416 | + $entity['media_url'], |
|
417 | + 'large', |
|
418 | + $entity['display_url'], |
|
419 | + $entity['sizes']['large']['h'], |
|
420 | + $entity['sizes']['large']['w'] |
|
421 | + ); |
|
422 | + } else { |
|
423 | + continue 2; |
|
424 | + } |
|
425 | + |
|
426 | + $entityHolder[$entity['indices'][0]] = [ |
|
427 | + 'start' => $entity['indices'][0], |
|
428 | + 'end' => $entity['indices'][1], |
|
429 | + 'replace' => $replace, |
|
430 | + ]; |
|
431 | + } |
|
432 | + } |
|
433 | + |
|
434 | + $messageLong = $twitterData['text']; |
|
435 | + krsort($entityHolder); |
|
436 | + foreach($entityHolder as $entity) |
|
437 | + { |
|
438 | + $messageLong = |
|
439 | + mb_substr($messageLong, 0, $entity['start']) . |
|
440 | + $entity['replace'] . |
|
441 | + mb_substr($messageLong, $entity['end'], null, 'UTF-8'); |
|
442 | + } |
|
443 | + $messageLong = mb_convert_encoding($messageLong, 'HTML-ENTITIES', 'UTF-8'); |
|
444 | + $messageLong = nl2br($messageLong, true); |
|
445 | + $messageLong = "<p>{$messageLong}</p>"; |
|
446 | + |
|
447 | + $metadata = []; |
|
448 | + if ($twitterData['favorite_count'] > 0) { |
|
449 | + $metadata['favorites'] = $twitterData['favorite_count']; |
|
450 | + } |
|
451 | + if ($twitterData['retweet_count'] > 0) { |
|
452 | + $metadata['retweets'] = $twitterData['retweet_count']; |
|
453 | + } |
|
454 | + |
|
455 | + $activityRepository->insertActivity( |
|
456 | + $message, |
|
457 | + $messageLong, |
|
458 | + (new DateTime($twitter['datetime'])), |
|
459 | + $metadata, |
|
460 | + 'twitter', |
|
461 | + $twitter['id'] |
|
462 | + ); |
|
463 | 463 | } |
464 | 464 | |
465 | 465 | // youtube |
@@ -468,39 +468,39 @@ discard block |
||
468 | 468 | |
469 | 469 | $lastYouTubeActivity = $activityRepository->getActivityLastUpdateByType('youtube'); |
470 | 470 | if ($lastYouTubeActivity === false) { |
471 | - $lastYouTubeActivityDateTime = new DateTime('2010-08-28'); |
|
471 | + $lastYouTubeActivityDateTime = new DateTime('2010-08-28'); |
|
472 | 472 | } else { |
473 | - $lastYouTubeActivityDateTime = new DateTime($lastYouTubeActivity['updated_at']); |
|
474 | - $lastYouTubeActivityDateTime->modify('-5 days'); |
|
473 | + $lastYouTubeActivityDateTime = new DateTime($lastYouTubeActivity['updated_at']); |
|
474 | + $lastYouTubeActivityDateTime->modify('-5 days'); |
|
475 | 475 | } |
476 | 476 | $newYouTubeActivity = $youTubeRepository->getYouTubesUpdatedSince($lastYouTubeActivityDateTime); |
477 | 477 | foreach ($newYouTubeActivity as $youTube) { |
478 | - $uniqueYouTubeCheck = $activityRepository->getActivityByTypeId('youtube', $youTube['id']); |
|
479 | - if ($uniqueYouTubeCheck !== false) { |
|
480 | - continue; |
|
481 | - } |
|
482 | - |
|
483 | - $youTubeData = json_decode($youTube['metadata'], true); |
|
484 | - |
|
485 | - $message = sprintf( |
|
486 | - 'Favorited %s on YouTube.', |
|
487 | - $youTubeData['snippet']['title'] |
|
488 | - ); |
|
489 | - $messageLong = sprintf( |
|
490 | - "<iframe src=\"%s\" frameborder=\"0\" allowfullscreen></iframe>\n" . |
|
491 | - "<p>Favorited <a href=\"%s\" target=\"_blank\" title=\"YouTube | %s\">%s</a> on YouTube.</p>", |
|
492 | - "https://www.youtube.com/embed/{$youTubeData['contentDetails']['videoId']}", |
|
493 | - "https://youtu.be/{$youTubeData['contentDetails']['videoId']}", |
|
494 | - $youTubeData['snippet']['title'], |
|
495 | - $youTubeData['snippet']['title'] |
|
496 | - ); |
|
497 | - |
|
498 | - $activityRepository->insertActivity( |
|
499 | - $message, |
|
500 | - $messageLong, |
|
501 | - (new DateTime($youTube['datetime'])), |
|
502 | - [], |
|
503 | - 'youtube', |
|
504 | - $youTube['id'] |
|
505 | - ); |
|
478 | + $uniqueYouTubeCheck = $activityRepository->getActivityByTypeId('youtube', $youTube['id']); |
|
479 | + if ($uniqueYouTubeCheck !== false) { |
|
480 | + continue; |
|
481 | + } |
|
482 | + |
|
483 | + $youTubeData = json_decode($youTube['metadata'], true); |
|
484 | + |
|
485 | + $message = sprintf( |
|
486 | + 'Favorited %s on YouTube.', |
|
487 | + $youTubeData['snippet']['title'] |
|
488 | + ); |
|
489 | + $messageLong = sprintf( |
|
490 | + "<iframe src=\"%s\" frameborder=\"0\" allowfullscreen></iframe>\n" . |
|
491 | + "<p>Favorited <a href=\"%s\" target=\"_blank\" title=\"YouTube | %s\">%s</a> on YouTube.</p>", |
|
492 | + "https://www.youtube.com/embed/{$youTubeData['contentDetails']['videoId']}", |
|
493 | + "https://youtu.be/{$youTubeData['contentDetails']['videoId']}", |
|
494 | + $youTubeData['snippet']['title'], |
|
495 | + $youTubeData['snippet']['title'] |
|
496 | + ); |
|
497 | + |
|
498 | + $activityRepository->insertActivity( |
|
499 | + $message, |
|
500 | + $messageLong, |
|
501 | + (new DateTime($youTube['datetime'])), |
|
502 | + [], |
|
503 | + 'youtube', |
|
504 | + $youTube['id'] |
|
505 | + ); |
|
506 | 506 | } |
@@ -14,22 +14,22 @@ discard block |
||
14 | 14 | $statement = $pdo->prepare($query); |
15 | 15 | $statement->execute(); |
16 | 16 | while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { |
17 | - $query = " |
|
17 | + $query = " |
|
18 | 18 | SELECT `activity`.`id` |
19 | 19 | FROM `jpemeric_stream`.`activity` |
20 | 20 | INNER JOIN `jpemeric_stream`.`blog2` ON `blog2`.`id` = `activity`.`type_id` AND |
21 | 21 | `blog2`.`permalink` LIKE '{$row['url']}%' |
22 | 22 | WHERE `type` = 'blog'"; |
23 | - $updateRecords = $pdo->fetchAll($query); |
|
24 | - if (count($updateRecords) !== 1) { |
|
25 | - if ($row['url'] == 'http://blog.jacobemerick.com/hiking/slightly-shuffled/') { |
|
26 | - continue; |
|
27 | - } |
|
28 | - var_dump($updateRecords); |
|
29 | - var_dump($row); |
|
30 | - exit('problem with blog uniqueness'); |
|
31 | - } |
|
32 | - $idMap[current($updateRecords)['id']] = $row['id']; |
|
23 | + $updateRecords = $pdo->fetchAll($query); |
|
24 | + if (count($updateRecords) !== 1) { |
|
25 | + if ($row['url'] == 'http://blog.jacobemerick.com/hiking/slightly-shuffled/') { |
|
26 | + continue; |
|
27 | + } |
|
28 | + var_dump($updateRecords); |
|
29 | + var_dump($row); |
|
30 | + exit('problem with blog uniqueness'); |
|
31 | + } |
|
32 | + $idMap[current($updateRecords)['id']] = $row['id']; |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | $query = " |
@@ -40,17 +40,17 @@ discard block |
||
40 | 40 | $statement = $pdo->prepare($query); |
41 | 41 | $statement->execute(); |
42 | 42 | while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { |
43 | - $query = " |
|
43 | + $query = " |
|
44 | 44 | SELECT `activity`.`id` |
45 | 45 | FROM `jpemeric_stream`.`activity` |
46 | 46 | INNER JOIN `jpemeric_stream`.`goodread` ON `goodread`.`id` = `activity`.`type_id` AND |
47 | 47 | `goodread`.`permalink` = :url |
48 | 48 | WHERE `type` = 'book'"; |
49 | - $updateRecords = $pdo->fetchAll($query, ['url' => $row['link']]); |
|
50 | - if (count($updateRecords) !== 1) { |
|
51 | - exit('problem with book uniqueness'); |
|
52 | - } |
|
53 | - $idMap[current($updateRecords)['id']] = $row['id']; |
|
49 | + $updateRecords = $pdo->fetchAll($query, ['url' => $row['link']]); |
|
50 | + if (count($updateRecords) !== 1) { |
|
51 | + exit('problem with book uniqueness'); |
|
52 | + } |
|
53 | + $idMap[current($updateRecords)['id']] = $row['id']; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | $query = " |
@@ -61,20 +61,20 @@ discard block |
||
61 | 61 | $statement = $pdo->prepare($query); |
62 | 62 | $statement->execute(); |
63 | 63 | while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { |
64 | - $query = " |
|
64 | + $query = " |
|
65 | 65 | SELECT `activity`.`id` |
66 | 66 | FROM `jpemeric_stream`.`activity` |
67 | 67 | INNER JOIN `jpemeric_stream`.`dailymile` ON `dailymile`.`id` = `activity`.`type_id` AND |
68 | 68 | `dailymile`.`entry_id` = :entry_id |
69 | 69 | WHERE `activity`.`type` = 'distance'"; |
70 | - $entryId = $row['url']; |
|
71 | - $entryId = explode('/', $entryId); |
|
72 | - $entryId = end($entryId); |
|
73 | - $updateRecords = $pdo->fetchAll($query, ['entry_id' => $entryId]); |
|
74 | - if (count($updateRecords) !== 1) { |
|
75 | - exit('problem with distance uniqueness'); |
|
76 | - } |
|
77 | - $idMap[current($updateRecords)['id']] = $row['id']; |
|
70 | + $entryId = $row['url']; |
|
71 | + $entryId = explode('/', $entryId); |
|
72 | + $entryId = end($entryId); |
|
73 | + $updateRecords = $pdo->fetchAll($query, ['entry_id' => $entryId]); |
|
74 | + if (count($updateRecords) !== 1) { |
|
75 | + exit('problem with distance uniqueness'); |
|
76 | + } |
|
77 | + $idMap[current($updateRecords)['id']] = $row['id']; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | $query = " |
@@ -85,21 +85,21 @@ discard block |
||
85 | 85 | $statement = $pdo->prepare($query); |
86 | 86 | $statement->execute(); |
87 | 87 | while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { |
88 | - $query = " |
|
88 | + $query = " |
|
89 | 89 | SELECT `activity`.`id` |
90 | 90 | FROM `jpemeric_stream`.`activity` |
91 | 91 | INNER JOIN `jpemeric_stream`.`twitter2` ON `twitter2`.`id` = `activity`.`type_id` AND |
92 | 92 | `twitter2`.`tweet_id` = :tweet_id |
93 | 93 | WHERE `type` = 'twitter'"; |
94 | - $updateRecords = $pdo->fetchAll($query, ['tweet_id' => $row['twitter_id']]); |
|
95 | - if (count($updateRecords) !== 1) { |
|
96 | - if (count($updateRecords) === 0) { |
|
97 | - echo 'Could not find match for id: ', $row['twitter_id'], PHP_EOL; |
|
98 | - continue; |
|
99 | - } |
|
100 | - exit('problem with twitter uniqueness'); |
|
101 | - } |
|
102 | - $idMap[current($updateRecords)['id']] = $row['id']; |
|
94 | + $updateRecords = $pdo->fetchAll($query, ['tweet_id' => $row['twitter_id']]); |
|
95 | + if (count($updateRecords) !== 1) { |
|
96 | + if (count($updateRecords) === 0) { |
|
97 | + echo 'Could not find match for id: ', $row['twitter_id'], PHP_EOL; |
|
98 | + continue; |
|
99 | + } |
|
100 | + exit('problem with twitter uniqueness'); |
|
101 | + } |
|
102 | + $idMap[current($updateRecords)['id']] = $row['id']; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | $query = " |
@@ -109,26 +109,26 @@ discard block |
||
109 | 109 | $statement = $pdo->prepare($query); |
110 | 110 | $statement->execute(); |
111 | 111 | while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { |
112 | - $query = " |
|
112 | + $query = " |
|
113 | 113 | SELECT `activity`.`id` |
114 | 114 | FROM `jpemeric_stream`.`activity` |
115 | 115 | WHERE `activity`.`type` = 'youtube' AND `activity`.`type_id` = :type_id"; |
116 | - $updateRecords = $pdo->fetchAll($query, ['type_id' => $row['type_id']]); |
|
117 | - if (count($updateRecords) != 1) { |
|
118 | - if (count($updateRecords) === 0) { |
|
119 | - echo "could not find match for youtube {$row['type_id']}", PHP_EOL; |
|
120 | - continue; |
|
121 | - } |
|
122 | - exit('problem with youtube uniqueness'); |
|
123 | - } |
|
124 | - $idMap[current($updateRecords)['id']] = $row['id']; |
|
116 | + $updateRecords = $pdo->fetchAll($query, ['type_id' => $row['type_id']]); |
|
117 | + if (count($updateRecords) != 1) { |
|
118 | + if (count($updateRecords) === 0) { |
|
119 | + echo "could not find match for youtube {$row['type_id']}", PHP_EOL; |
|
120 | + continue; |
|
121 | + } |
|
122 | + exit('problem with youtube uniqueness'); |
|
123 | + } |
|
124 | + $idMap[current($updateRecords)['id']] = $row['id']; |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | foreach ($idMap as $currentId => $newId) { |
128 | - $query = " |
|
128 | + $query = " |
|
129 | 129 | UPDATE `activity` SET `id` = :new_id WHERE `id` = :current_id"; |
130 | - $update = $pdo->perform($query, ['new_id' => $newId, 'current_id' => $currentId]); |
|
131 | - if ($update === false) { |
|
132 | - exit('problem with update'); |
|
133 | - } |
|
130 | + $update = $pdo->perform($query, ['new_id' => $newId, 'current_id' => $currentId]); |
|
131 | + if ($update === false) { |
|
132 | + exit('problem with update'); |
|
133 | + } |
|
134 | 134 | } |
@@ -14,21 +14,21 @@ |
||
14 | 14 | ORDER BY `hulu`.`date` DESC"; |
15 | 15 | $huluActivities = $pdo->fetchAll($query); |
16 | 16 | foreach ($huluActivities as $huluActivity) { |
17 | - $query = " |
|
17 | + $query = " |
|
18 | 18 | INSERT INTO `jpemeric_stream`.`activity` |
19 | 19 | (`id`, `message`, `message_long`, `datetime`, `metadata`, `type`, `type_id`) |
20 | 20 | VALUES |
21 | 21 | (:id, :message, :message_long, :datetime, :metadata, :type, :type_id)"; |
22 | 22 | |
23 | - $bindings = [ |
|
24 | - 'id' => $huluActivity['id'], |
|
25 | - 'message' => "Watched {$huluActivity['title']} on Hulu.", |
|
26 | - 'message_long' => "<p>Watched {$huluActivity['title']} on Hulu.</p>", |
|
27 | - 'datetime' => (new DateTime($huluActivity['date'], $container['default_timezone']))->format('Y-m-d H:i:s'), |
|
28 | - 'metadata' => json_encode([]), |
|
29 | - 'type' => 'hulu', |
|
30 | - 'type_id' => $huluActivity['type_id'], |
|
31 | - ]; |
|
23 | + $bindings = [ |
|
24 | + 'id' => $huluActivity['id'], |
|
25 | + 'message' => "Watched {$huluActivity['title']} on Hulu.", |
|
26 | + 'message_long' => "<p>Watched {$huluActivity['title']} on Hulu.</p>", |
|
27 | + 'datetime' => (new DateTime($huluActivity['date'], $container['default_timezone']))->format('Y-m-d H:i:s'), |
|
28 | + 'metadata' => json_encode([]), |
|
29 | + 'type' => 'hulu', |
|
30 | + 'type_id' => $huluActivity['type_id'], |
|
31 | + ]; |
|
32 | 32 | |
33 | - $pdo->perform($query, $bindings); |
|
33 | + $pdo->perform($query, $bindings); |
|
34 | 34 | } |