<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12678] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite: Make: GitHub Invite Tool: Allow specifying a GitHub user URL, and if the user is a member of the org already, just add them to the team(s).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12678">12678</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12678","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-28 02:11:16 +0000 (Wed, 28 Jun 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Make: GitHub Invite Tool: Allow specifying a GitHub user URL, and if the user is a member of the org already, just add them to the team(s).
See <a href="http://meta.trac.wordpress.org/ticket/7082">#7082</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggithubinviteadminpostphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin-post.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggithubinviteadminphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggithubinviteapiphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggithubinviteadminpostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin-post.php 2023-06-26 08:52:54 UTC (rev 12677)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin-post.php 2023-06-28 02:11:16 UTC (rev 12678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,45 +20,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $team_ids = array_intersect( $team_ids, get_allowed_teams() );
</span><span class="cx" style="display: block; padding: 0 10px"> $team_ids = array_map( 'intval', $team_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $updated = 'success';
- $message = null;
- $invite = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $updated = 'success';
+ $message = null;
+ $invite = false;
+ $github_username = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $team_ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $updated = 'error';
</span><span class="cx" style="display: block; padding: 0 10px"> $message = 'No teams selected';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif (
- preg_match( '!^https://profiles.wordpress.org/(?<slug>[^/]+)!i', $input, $m ) ||
- ! is_email( $input )
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_email( $input ) ) {
+ $invite = $input;
+ } elseif ( preg_match( '!^https://github.com/(?<slug>[^/]+)!i', $input, $m ) ) {
+ $gh_user = api( '/users/' . $m['slug'] );
+ $github_username = $gh_user->login ?? false;
+ $invite = $gh_user->id ?? 0;
+ } else {
+ preg_match( '!^https://profiles.wordpress.org/(?<slug>[^/]+)!i', $input, $m );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'slug', $m['slug'] ?? $input );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $github_details = json_decode( $wpdb->get_var( $wpdb->prepare(
- 'SELECT user_details FROM wporg_github_users WHERE user_id = %d',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $github_details = $wpdb->get_row( $wpdb->prepare(
+ 'SELECT github_user, user_details FROM wporg_github_users WHERE user_id = %d',
</ins><span class="cx" style="display: block; padding: 0 10px"> $user->ID
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) );
+ if ( $github_details ) {
+ $github_details->user_details = json_decode( $github_details->user_details );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $user || ! $github_details ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user || ! $github_details || ! $github_details->user_details ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $updated = 'no-github';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $invite = $github_details->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $invite = $github_details->user_details->id;
+ $github_username = $github_details->github_user;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( is_email( $input ) ) {
- $invite = $input;
- } else {
- $updated = 'error';
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $invite ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = invite_member( $invite, $team_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $result->id ) {
- // Note that it was invited via this site..
- $invited_gh_users = get_option( 'invited_gh_users', [] );
- $invited_gh_users[] = $result->id;
- update_option( 'invited_gh_users', $invited_gh_users );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ is_wp_error( $result ) &&
+ $github_username &&
+ 'Invitee is already a part of this org' === $result->get_error_data( 'api_error' )->errors[0]->message ?? ''
+ ) {
+ // Already a GitHub member, just add them to the team.
+ $result = add_to_team( $github_username, $team_ids );
+ $message = 'User already a GitHub member, Added to team(s).';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete_site_transient( 'gh_invites' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_wp_error( $result ) ) {
+ if ( ! empty( $result->id ) ) {
+ // Note that it was invited via this site..
+ $invited_gh_users = get_option( 'invited_gh_users', [] );
+ $invited_gh_users[] = $result->id;
+ update_option( 'invited_gh_users', $invited_gh_users );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete_site_transient( 'gh_invites' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Log it to Slack.
</span><span class="cx" style="display: block; padding: 0 10px"> $teams = get_teams();
</span><span class="cx" style="display: block; padding: 0 10px"> $readable_teams = array_map( static function( $id ) use( $teams ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggithubinviteadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin.php 2023-06-26 08:52:54 UTC (rev 12677)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/admin.php 2023-06-28 02:11:16 UTC (rev 12678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'github_invite' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th scope="row"><label for="invite">GitHub Email, WordPress.org user slug, or WordPress.org Profile URL</label></th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th scope="row"><label for="invite">GitHub Email, GitHub URL, WordPress.org user slug, or WordPress.org Profile URL</label></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><input type="text" name="invite" id="invite" class="regular-text" placeholder="https://profiles.wordpress.org/<?php echo wp_get_current_user()->user_nicename; ?>/"></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggithubinviteapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/api.php 2023-06-26 08:52:54 UTC (rev 12677)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-github-invite/api.php 2023-06-28 02:11:16 UTC (rev 12678)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,6 +82,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add an organisation member to a team.
+ *
+ * @param int|string $who The GitHub user login.
+ * @param array $team_ids The team IDs to add the user to.
+ */
+function add_to_team( $who, array $team_ids ) {
+ $error = new WP_Error;
+
+ foreach ( $team_ids as $team_id ) {
+ $response = api(
+ "/orgs/{ORG}/team/{$team_id}/memberships/{$who}",
+ false,
+ 'PUT'
+ );
+
+ if ( is_wp_error( $response ) ) {
+ $error->merge_from( $response );
+ }
+ }
+
+ if ( $error->get_error_code() ) {
+ return $error;
+ }
+
+ return $response;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Cancel an invitation by ID
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function cancel_invite( $id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +120,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Quick GitHub API method.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>