<!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>[11363] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher: SVN Watching: Some tweaks to the matching rules.</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/11363">11363</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/11363","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>2021-12-13 07:06:14 +0000 (Mon, 13 Dec 2021)</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'>SVN Watching: Some tweaks to the matching rules.
See <a href="http://meta.trac.wordpress.org/ticket/5978">#5978</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcherpropsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/props.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatchersvnphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/svn.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatcherpropsphp"></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-trac-watcher/props.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-trac-watcher/props.php 2021-12-13 05:41:15 UTC (rev 11362)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/props.php 2021-12-13 07:06:14 UTC (rev 11363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,12 +18,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'once' => [
</span><span class="cx" style="display: block; padding: 0 10px"> "^props(?! to ) {$props_greedy}.?$", // Super basic initial primary matcher, trumps even the next one.
</span><span class="cx" style="display: block; padding: 0 10px"> "{$real_sol}props(?! to ) {$props_greedy}{$real_eol}", // Primary matcher, "Props abc, def". Excludes "props to "
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "([,.] )props{$props}([,.] )", // Simple inline props matcher, ". props abc." / ", props abc, fixes ..."
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "([,.] )props {$props_greedy}{$eol}", // Simple inline props matcher, ". props abc." / ", props abc, fixes ..."
</ins><span class="cx" style="display: block; padding: 0 10px"> "{$sol}props([:]| to ) {$props_greedy}{$eol}",
</span><span class="cx" style="display: block; padding: 0 10px"> "([0-9]|\pP)\s+props([:]|\s+to)? {$props_one}( in .+)?(,|{$eol})",
</span><span class="cx" style="display: block; padding: 0 10px"> "{$sol}(h/t|hat tip:) {$props_short}{$eol}",
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // These are starting to get real old... like three-digit core commit old..
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "with help from {$props}{$real_eol}",
</ins><span class="cx" style="display: block; padding: 0 10px"> "\S\sprops([:]|\s+to)? {$props_short}{$eol}", // Inline props
</span><span class="cx" style="display: block; padding: 0 10px"> "\scredit(?! card)([:]|\sto)? {$props_short}", // Credit: ... or Credit to ...
</span><span class="cx" style="display: block; padding: 0 10px"> "\s(diff|patch|patches|fix|fixes) from {$props_short}{$eol}", // Fixes from Ryan
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // These matchers apply no matter which ones above have matched.
</span><span class="cx" style="display: block; padding: 0 10px"> // They're intended to catch additional inline mentions.
</span><span class="cx" style="display: block; padding: 0 10px"> 'multiple' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "\sunprops {$props_one}",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "{$sol}unprops:? {$props_greedy}{$eol}",
</ins><span class="cx" style="display: block; padding: 0 10px"> "{$sol}(dev)?reviewed[- ]by {$props}{$eol}",
</span><span class="cx" style="display: block; padding: 0 10px"> "\sthanks {$props_one}",
</span><span class="cx" style="display: block; padding: 0 10px"> ]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $u = preg_replace( '!((' . implode( '|', $words ) . ')\s+)*!i', '', $u );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Trim trailing punctuation (if it starts without punctuation)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = preg_replace( '!^([a-z0-9].{4,})[\pP\s]+$!iu', '$1', $u );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = preg_replace( '!^([a-z0-9].{4,}?)[\pP\s]+?$!iu', '$1', $u );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Does it start with a expected character, but have space followed by rand punctuation?
</span><span class="cx" style="display: block; padding: 0 10px"> $u = preg_replace( '!^([a-z0-9]\S+)\s\pP.*$!i', '$1', $u );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,12 +218,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Find a user ID for the user being prop'd.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function find_user_id( $prop, $svn = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function find_user_id( $prop ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $prop ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Profile URL - This is primarily used via the Admin UI to assign ownership of a prop.
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match( '!^https?://profiles.wordpress.org/(?P<user>[^/]+)/?$!', $user, $m ) &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match( '!^https?://profiles.wordpress.org/(?P<user>[^/]+)/?$!', $prop, $m ) &&
</ins><span class="cx" style="display: block; padding: 0 10px"> ( $user = get_user_by( 'slug', $m['user'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $user->ID;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,10 +262,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // previous props?
</span><span class="cx" style="display: block; padding: 0 10px"> // This works great to catch typo's, correct it manually once and it'll be caught next time.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_svns() as $svn ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $props_table = ['props_table'] ?? false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $svn['props_table'] ) ) {
+ continue;
+ }
+ $props_table = $svn['props_table'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> $props_table &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $id = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM {$props_table} WHERE prop_name = %s LIMIT 1", $prop ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $id = $wpdb->get_var( $sql = $wpdb->prepare( "SELECT user_id FROM {$props_table} WHERE prop_name = %s AND user_id IS NOT NULL LIMIT 1", $prop ) ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return (int) $id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,10 +275,28 @@
</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"> // GitHub?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $github = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM wporg_github_users WHERE github_user = %s LIMIt 1", $prop ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $github = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM wporg_github_users WHERE github_user = %s LIMIT 1", $prop ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $github ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return (int) $github;
</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">+ // Last resort, full name of someone who has been prop'd before?
+ // Display_Name isn't indexed, so can't be queried without a user list to reference against.
+ foreach ( get_svns() as $svn ) {
+ if ( empty( $svn['props_table'] ) ) {
+ continue;
+ }
+
+ $props_table = $svn['props_table'];
+ $user_id = $wpdb->get_var( $sql = $wpdb->prepare(
+ "SELECT u.ID FROM {$props_table} p JOIN {$wpdb->users} u ON p.user_id = u.ID WHERE u.display_name = %s LIMIT 1",
+ $prop
+ ) );
+
+ if ( $user_id ) {
+ return $user_id;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgtracwatchersvnphp"></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-trac-watcher/svn.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-trac-watcher/svn.php 2021-12-13 05:41:15 UTC (rev 11362)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-trac-watcher/svn.php 2021-12-13 07:06:14 UTC (rev 11363)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'prop_name' => $prop,
</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">- $user_id = find_user_id( $prop, $svn );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = find_user_id( $prop );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['user_id'] = $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>