| @@ -3,9 +3,9 @@ | ||
| 3 | 3 | /* |
| 4 | 4 | Plugin Name: Github Embed |
| 5 | 5 | Plugin URI: http://www.leewillis.co.uk/wordpress-plugins |
| 6 | 6 | Description: Paste the URL to a Github project into your posts or pages, and have the project information pulled in and displayed automatically |
| 7 | -Version: 1.2 | |
| 7 | +Version: 1.1 | |
| 8 | 8 | Author: Lee Willis |
| 9 | 9 | Author URI: http://www.leewillis.co.uk/ |
| 10 | 10 | */ |
| 11 | 11 | |
| @@ -30,30 +30,17 @@ | ||
| 30 | 30 | * GNU General Public License for more details. |
| 31 | 31 | * ********************************************************************** |
| 32 | 32 | */ |
| 33 | 33 | |
| 34 | -/** | |
| 35 | - * This class handles being the oEmbed provider in terms of registering the URLs that | |
| 36 | - * we can embed, and handling the actual oEmbed calls. It relies on the github_api | |
| 37 | - * class to retrieve the information from the GitHub API. | |
| 38 | - * @uses class github_api | |
| 39 | - */ | |
| 40 | 34 | class github_embed { |
| 41 | 35 | |
| 42 | 36 | |
| 43 | 37 | |
| 44 | - private $api; | |
| 45 | - | |
| 46 | - | |
| 47 | - | |
| 48 | 38 | /** |
| 49 | 39 | * Constructor. Registers hooks and filters |
| 50 | - * @param class $api An instance of the github_api classs | |
| 51 | 40 | */ |
| 52 | - public function __construct ( $api ) { | |
| 41 | + public function __construct() { | |
| 53 | 42 | |
| 54 | - $this->api = $api; | |
| 55 | - | |
| 56 | 43 | add_action ( 'init', array ( $this, 'register_oembed_handler' ) ); |
| 57 | 44 | add_action ( 'init', array ( $this, 'maybe_handle_oembed' ) ); |
| 58 | 45 | add_action ( 'wp_enqueue_scripts', array ( $this, 'enqueue_styles' ) ); |
| 59 | 46 | |
| @@ -153,31 +140,12 @@ | ||
| 153 | 140 | header ( 'HTTP/1.0 404 Not Found' ); |
| 154 | 141 | die ( 'Octocat is lost, and afraid' ); |
| 155 | 142 | } |
| 156 | 143 | |
| 157 | - // Issues / Milestones | |
| 158 | - if ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/graphs/contributors/?$#i', $url, $matches ) && ! empty ( $matches[2] ) ) { | |
| 144 | + if ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/?$#i', $url, $matches ) && ! empty ( $matches[2] ) ) { | |
| 159 | 145 | |
| 160 | - $this->oembed_github_repo_contributors ( $matches[1], $matches[2] ); | |
| 161 | - | |
| 162 | - } elseif ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/issues.*$#i', $url, $matches ) && ! empty ( $matches[2] ) ) { | |
| 163 | - | |
| 164 | - if ( preg_match ( '#issues.?milestone=([0-9]*)#i', $url, $milestones ) ) { | |
| 165 | - $milestone = $milestones[1]; | |
| 166 | - } else { | |
| 167 | - $milestone = null; | |
| 168 | - } | |
| 169 | - | |
| 170 | - if ( $milestone ) { | |
| 171 | - $this->oembed_github_repo_milestone_summary ( $matches[1], $matches[2], $milestone ); | |
| 172 | - } | |
| 173 | - | |
| 174 | - // Repository | |
| 175 | - } elseif ( preg_match ( '#https?://github.com/([^/]*)/([^/]*)/?$#i', $url, $matches ) && ! empty ( $matches[2] ) ) { | |
| 176 | - | |
| 177 | 146 | $this->oembed_github_repo ( $matches[1], $matches[2] ); |
| 178 | 147 | |
| 179 | - // User | |
| 180 | 148 | } elseif ( preg_match ( '#https?://github.com/([^/]*)/?$#i', $url, $matches ) ) { |
| 181 | 149 | |
| 182 | 150 | $this->oembed_github_author ( $matches[1] ); |
| 183 | 151 | |
| @@ -187,114 +155,39 @@ | ||
| 187 | 155 | |
| 188 | 156 | |
| 189 | 157 | |
| 190 | 158 | /** |
| 191 | - * Retrieve a list of contributors for a project | |
| 192 | - * @param string $owner The owner of the repository | |
| 193 | - * @param string $repository The repository name | |
| 159 | + * Retrieve the information from github for a repo, and | |
| 160 | + * output it as an oembed response | |
| 194 | 161 | */ |
| 195 | - private function oembed_github_repo_contributors ( $owner, $repository ) { | |
| 162 | + private function oembed_github_repo ( $owner, $repository ) { | |
| 196 | 163 | |
| 197 | - $repo = $this->api->get_repo ( $owner, $repository ); | |
| 198 | - $contributors = $this->api->get_repo_contributors ( $owner, $repository ); | |
| 164 | + $repository = trim ( $repository, '/' ); | |
| 199 | 165 | |
| 200 | - $response = new stdClass(); | |
| 201 | - $response->type = 'rich'; | |
| 202 | - $response->width = '10'; | |
| 203 | - $response->height = '10'; | |
| 204 | - $response->version = '1.0'; | |
| 205 | - $response->title = $repo->description; | |
| 166 | + $results = wp_remote_get( "https://api.github.com/repos/$owner/$repository", $args = array ( | |
| 167 | + 'user-agent' => 'WordPress Github oEmbed plugin - https://github.com/leewillis77/wp-github-oembed' ) ); | |
| 206 | 168 | |
| 207 | - $gravatar_size = apply_filters ( 'github_oembed_gravatar_size', 64 ); | |
| 208 | - | |
| 209 | - // @TODO This should all be templated | |
| 210 | - $response->html = '<div class="github-embed github-embed-repo-contributors">'; | |
| 211 | - $response->html .= '<p><a href="'.esc_attr($repo->html_url).'" target="_blank"><strong>'.esc_html($repo->description)."</strong></a><br/>"; | |
| 212 | - | |
| 213 | - $response->html .= '<span class="github-heading">Contributors: </span>'; | |
| 214 | - | |
| 215 | - $response->html .= '<ul class="github-repo-contributors">'; | |
| 216 | - | |
| 217 | - foreach ( $contributors as $contributor ) { | |
| 218 | - | |
| 219 | - $details = $this->api->get_user ($contributor->login); | |
| 220 | - $response->html .= '<li class="github-repo-contributor">'; | |
| 221 | - $response->html .= '<img class="github-repo-contributor-avatar" src="'; | |
| 222 | - $response->html .= esc_url(add_query_arg(array('s'=>$gravatar_size), $contributor->avatar_url)); | |
| 223 | - $response->html .= '" alt="Picture of '.esc_attr($contributor->login).'">'; | |
| 224 | - if ( ! empty ( $details->name ) ) { | |
| 225 | - $response->html .= '<span class="github-repo-contributor-name">'.esc_html($details->name)."</span><br>"; | |
| 226 | - } | |
| 227 | - $response->html .= '<span class="github-repo-contributor-login">'; | |
| 228 | - $response->html .= '<a href="https://github.com/'.esc_attr($contributor->login).'">'.esc_attr($contributor->login).'</a></span>'; | |
| 169 | + if ( is_wp_error( $results ) || | |
| 170 | + ! isset ( $results['response']['code'] ) || | |
| 171 | + $results['response']['code'] != '200' ) { | |
| 172 | + header ( 'HTTP/1.0 404 Not Found' ); | |
| 173 | + die ( 'Octocat is lost, and afraid' ); | |
| 229 | 174 | } |
| 230 | 175 | |
| 231 | - $response->html .= '</ul>'; | |
| 232 | - $response->html .= '<div style="clear: both;"></div>'; | |
| 233 | - $response->html .= '</div>'; | |
| 176 | + $repo = json_decode ( $results['body'] ); | |
| 234 | 177 | |
| 235 | - header ( 'Content-Type: application/json' ); | |
| 236 | - echo json_encode ( $response ); | |
| 237 | - die(); | |
| 178 | + $results = wp_remote_get( "https://api.github.com/repos/$owner/$repository/commits", $args = array ( | |
| 179 | + 'user-agent' => 'WordPress Github oEmbed plugin - https://github.com/leewillis77/wp-github-oembed' ) ); | |
| 238 | 180 | |
| 239 | - } | |
| 240 | - | |
| 241 | - | |
| 242 | - | |
| 243 | - /** | |
| 244 | - * Retrieve the summary information for a repo's milestone, and | |
| 245 | - * output it as an oembed response | |
| 246 | - */ | |
| 247 | - private function oembed_github_repo_milestone_summary ( $owner, $repository, $milestone ) { | |
| 248 | - | |
| 249 | - $repo = $this->api->get_repo ( $owner, $repository ); | |
| 250 | - $summary = $this->api->get_repo_milestone_summary ( $owner, $repository, $milestone ); | |
| 251 | - | |
| 252 | - $response = new stdClass(); | |
| 253 | - $response->type = 'rich'; | |
| 254 | - $response->width = '10'; | |
| 255 | - $response->height = '10'; | |
| 256 | - $response->version = '1.0'; | |
| 257 | - $response->title = $repo->description; | |
| 258 | - | |
| 259 | - // @TODO This should all be templated | |
| 260 | - $response->html = '<div class="github-embed github-embed-milestone-summary">'; | |
| 261 | - $response->html .= '<p><a href="'.esc_attr($repo->html_url).'" target="_blank"><strong>'.esc_html($repo->description)."</strong></a><br/>"; | |
| 262 | - | |
| 263 | - $response->html .= '<span class="github-heading">Milestone: </span>'; | |
| 264 | - $response->html .= '<span class="github-milestone-title">'.esc_html($summary->title)."</span><br>"; | |
| 265 | - | |
| 266 | - $response->html .= '<span class="github-heading">Issues: </span>'; | |
| 267 | - $response->html .= '<span class="github-milestone-issues">'; | |
| 268 | - $response->html .= esc_html($summary->open_issues)." open, "; | |
| 269 | - $response->html .= esc_html($summary->closed_issues)." closed.</span><br>"; | |
| 270 | - | |
| 271 | - if ( ! empty ( $summary->due_on ) ) { | |
| 272 | - $response->html .= '<span class="github-heading">Due: </span>'; | |
| 273 | - $due_date = date_format ( date_create ( $summary->due_on ), 'jS F Y' ); | |
| 274 | - $response->html .= '<span class="github-milestone-due-date">'.esc_html($due_date).'</span><br>'; | |
| 181 | + if ( is_wp_error( $results ) || | |
| 182 | + ! isset ( $results['response']['code'] ) || | |
| 183 | + $results['response']['code'] != '200' ) { | |
| 184 | + header ( 'HTTP/1.0 404 Not Found' ); | |
| 185 | + die ( 'Octocat is lost, and afraid' ); | |
| 275 | 186 | } |
| 276 | - | |
| 277 | - $response->html .= '<p class="github-milestone-description">'.nl2br(esc_html($summary->description))."</p><br>"; | |
| 278 | - $response->html .= '</div>'; | |
| 279 | 187 | |
| 280 | - header ( 'Content-Type: application/json' ); | |
| 281 | - echo json_encode ( $response ); | |
| 282 | - die(); | |
| 188 | + $commits = json_decode ( $results['body'] ); | |
| 283 | 189 | |
| 284 | - } | |
| 285 | - | |
| 286 | - | |
| 287 | - | |
| 288 | - /** | |
| 289 | - * Retrieve the information from github for a repo, and | |
| 290 | - * output it as an oembed response | |
| 291 | - */ | |
| 292 | - private function oembed_github_repo ( $owner, $repository ) { | |
| 293 | - | |
| 294 | - $repo = $this->api->get_repo ( $owner, $repository ); | |
| 295 | - $commits =$this->api->get_repo_commits ( $owner, $repository ); | |
| 296 | - | |
| 297 | 190 | $response = new stdClass(); |
| 298 | 191 | $response->type = 'rich'; |
| 299 | 192 | $response->width = '10'; |
| 300 | 193 | $response->height = '10'; |
| @@ -347,10 +240,22 @@ | ||
| 347 | 240 | * it as an oembed response |
| 348 | 241 | */ |
| 349 | 242 | private function oembed_github_author ( $owner ) { |
| 350 | 243 | |
| 351 | - $owner_info = $this->api->get_user ( $owner ); | |
| 244 | + $owner = trim ( $owner, '/' ); | |
| 352 | 245 | |
| 246 | + $results = wp_remote_get( "https://api.github.com/users/$owner", $args = array ( | |
| 247 | + 'user-agent' => 'WordPress Github oEmbed plugin - https://github.com/leewillis77/wp-github-oembed' ) ); | |
| 248 | + | |
| 249 | + if ( is_wp_error( $results ) || | |
| 250 | + ! isset ( $results['response']['code'] ) || | |
| 251 | + $results['response']['code'] != '200' ) { | |
| 252 | + header ( 'HTTP/1.0 404 Not Found' ); | |
| 253 | + die ( 'Octocat is lost, and afraid' ); | |
| 254 | + } | |
| 255 | + | |
| 256 | + $owner_info = json_decode ( $results['body'] ); | |
| 257 | + | |
| 353 | 258 | $response = new stdClass(); |
| 354 | 259 | $response->type = 'rich'; |
| 355 | 260 | $response->width = '10'; |
| 356 | 261 | $response->height = '10'; |
| @@ -371,8 +276,5 @@ | ||
| 371 | 276 | } |
| 372 | 277 | |
| 373 | 278 | } |
| 374 | 279 | |
| 375 | -require_once ( 'github-api.php' ); | |
| 376 | - | |
| 377 | -$github_api = new github_api(); | |
| 378 | -$github_embed = new github_embed ( $github_api ); | |
| 280 | +$github_embed = new github_embed(); | |
