<!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>[2312] 2013/merty: Fixes, small additions and enhancements.</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 { 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">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2312">2312</a></dd>
<dt>Author</dt> <dd>merty</dd>
<dt>Date</dt> <dd>2013-09-15 00:40:06 +0000 (Sun, 15 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes, small additions and enhancements. Props coffee2code</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013mertybbpressbbpluginsnewpluginnotifierphp">2013/merty/bbpress/bb-plugins/new-plugin-notifier.php</a></li>
<li><a href="#2013mertybbpressbbpluginsnewpostnotifierphp">2013/merty/bbpress/bb-plugins/new-post-notifier.php</a></li>
<li><a href="#2013mertybbpressbbpluginsnewthemenotifierphp">2013/merty/bbpress/bb-plugins/new-theme-notifier.php</a></li>
<li><a href="#2013mertytracpluginsActivityStreamNotifierpy">2013/merty/trac/plugins/ActivityStreamNotifier.py</a></li>
<li><a href="#2013mertywpwpcontentmupluginsdotorgactivityhandlerphp">2013/merty/wp/wp-content/mu-plugins/dotorg-activity-handler.php</a></li>
<li><a href="#2013mertywpwpcontentthemesprofileswordpressorgmemberssingleprofilephp">2013/merty/wp/wp-content/themes/profiles.wordpress.org/members/single/profile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013mertybbpressbbpluginsnewpluginnotifierphp"></a>
<div class="modfile"><h4>Modified: 2013/merty/bbpress/bb-plugins/new-plugin-notifier.php (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/merty/bbpress/bb-plugins/new-plugin-notifier.php 2013-09-14 19:01:09 UTC (rev 2311)
+++ 2013/merty/bbpress/bb-plugins/new-plugin-notifier.php 2013-09-15 00:40:06 UTC (rev 2312)
</span><span class="lines">@@ -10,8 +10,6 @@
</span><span class="cx">
</span><span class="cx"> function dotorg_notify_new_plugin($topic_id) {
</span><span class="cx">
</span><del>- global $bb_current_user;
-
</del><span class="cx"> $url = 'http://localbp.com/wp-admin/admin-ajax.php';
</span><span class="cx">
</span><span class="cx"> $topic = get_topic($topic_id);
</span><span class="lines">@@ -22,7 +20,7 @@
</span><span class="cx"> 'body' => array(
</span><span class="cx"> 'action' => 'dotorg_handle_activity',
</span><span class="cx"> 'source' => 'plugin',
</span><del>- 'user' => get_user_name($bb_current_user->ID),
</del><ins>+ 'user' => bb_get_current_user_info('user_login'),
</ins><span class="cx"> 'title' => $topic->topic_title,
</span><span class="cx"> 'url' => 'http://wordpress.org/plugins/' . $topic->topic_slug . '/'
</span><span class="cx"> ));
</span></span></pre></div>
<a id="2013mertybbpressbbpluginsnewpostnotifierphp"></a>
<div class="modfile"><h4>Modified: 2013/merty/bbpress/bb-plugins/new-post-notifier.php (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/merty/bbpress/bb-plugins/new-post-notifier.php 2013-09-14 19:01:09 UTC (rev 2311)
+++ 2013/merty/bbpress/bb-plugins/new-post-notifier.php 2013-09-15 00:40:06 UTC (rev 2312)
</span><span class="lines">@@ -10,8 +10,11 @@
</span><span class="cx">
</span><span class="cx"> function dotorg_notify_new_post($post_id) {
</span><span class="cx">
</span><del>- global $bbdb, $topic_id, $bb_current_user;
</del><ins>+ global $bbdb, $topic_id;
</ins><span class="cx">
</span><ins>+ // Name of the bbPress installation
+ $site = 'Support Forums';
+
</ins><span class="cx"> $url = 'http://localbp.com/wp-admin/admin-ajax.php';
</span><span class="cx">
</span><span class="cx"> $topic = get_topic($topic_id);
</span><span class="lines">@@ -21,12 +24,13 @@
</span><span class="cx"> 'body' => array(
</span><span class="cx"> 'action' => 'dotorg_handle_activity',
</span><span class="cx"> 'source' => 'bbpress',
</span><del>- 'user' => get_user_name($bb_current_user->ID),
</del><ins>+ 'user' => bb_get_current_user_info('user_login'),
</ins><span class="cx"> 'topic' => $topic_id,
</span><span class="cx"> 'title' => $topic->topic_title,
</span><span class="cx"> 'url' => get_topic_link($topic_id),
</span><span class="cx"> 'message' => $post->post_text,
</span><del>- 'newTopic' => bb_is_first($post_id)
</del><ins>+ 'newTopic' => bb_is_first($post_id),
+ 'site' => $site
</ins><span class="cx"> ));
</span><span class="cx">
</span><span class="cx"> wp_remote_post($url, $args);
</span></span></pre></div>
<a id="2013mertybbpressbbpluginsnewthemenotifierphp"></a>
<div class="modfile"><h4>Modified: 2013/merty/bbpress/bb-plugins/new-theme-notifier.php (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/merty/bbpress/bb-plugins/new-theme-notifier.php 2013-09-14 19:01:09 UTC (rev 2311)
+++ 2013/merty/bbpress/bb-plugins/new-theme-notifier.php 2013-09-15 00:40:06 UTC (rev 2312)
</span><span class="lines">@@ -10,8 +10,6 @@
</span><span class="cx">
</span><span class="cx"> function dotorg_notify_new_theme($topic_id) {
</span><span class="cx">
</span><del>- global $bb_current_user;
-
</del><span class="cx"> $url = 'http://localbp.com/wp-admin/admin-ajax.php';
</span><span class="cx">
</span><span class="cx"> $topic = get_topic($topic_id);
</span><span class="lines">@@ -22,7 +20,7 @@
</span><span class="cx"> 'body' => array(
</span><span class="cx"> 'action' => 'dotorg_handle_activity',
</span><span class="cx"> 'source' => 'theme',
</span><del>- 'user' => get_user_name($bb_current_user->ID),
</del><ins>+ 'user' => bb_get_current_user_info('user_login'),
</ins><span class="cx"> 'title' => $topic->topic_title,
</span><span class="cx"> 'url' => 'http://wordpress.org/themes/' . $topic->topic_slug . '/'
</span><span class="cx"> ));
</span></span></pre></div>
<a id="2013mertytracpluginsActivityStreamNotifierpy"></a>
<div class="modfile"><h4>Modified: 2013/merty/trac/plugins/ActivityStreamNotifier.py (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/merty/trac/plugins/ActivityStreamNotifier.py 2013-09-14 19:01:09 UTC (rev 2311)
+++ 2013/merty/trac/plugins/ActivityStreamNotifier.py 2013-09-15 00:40:06 UTC (rev 2312)
</span><span class="lines">@@ -18,8 +18,10 @@
</span><span class="cx">
</span><span class="cx"> implements(IRepositoryChangeListener, ITicketChangeListener)
</span><span class="cx">
</span><ins>+ url = 'http://localbp.com/wp-admin/admin-ajax.php'
+
</ins><span class="cx"> def ticket_created(self, ticket):
</span><del>- url = 'http://localbp.com/wp-admin/admin-ajax.php'
</del><ins>+
</ins><span class="cx"> payload = urllib.urlencode(
</span><span class="cx"> {'action': 'dotorg_handle_activity',
</span><span class="cx"> 'source': 'trac',
</span><span class="lines">@@ -29,11 +31,14 @@
</span><span class="cx"> 'title': ticket['summary'],
</span><span class="cx"> 'description': ticket['description']}
</span><span class="cx"> )
</span><del>- req = urllib2.Request(url, payload)
</del><ins>+ req = urllib2.Request(ActivityStreamNotifier.url, payload)
</ins><span class="cx"> urllib2.urlopen(req)
</span><span class="cx">
</span><span class="cx"> def ticket_changed(self, ticket, comment, author, old_values):
</span><del>- url = 'http://localbp.com/wp-admin/admin-ajax.php'
</del><ins>+ if len(comment) == 0 and ticket['status'] != 'closed':
+ return
+ if not('status' in old_values):
+ ticket['status'] = ''
</ins><span class="cx"> payload = urllib.urlencode(
</span><span class="cx"> {'action': 'dotorg_handle_activity',
</span><span class="cx"> 'source': 'trac',
</span><span class="lines">@@ -41,24 +46,25 @@
</span><span class="cx"> 'user': author,
</span><span class="cx"> 'id': ticket.id,
</span><span class="cx"> 'title': ticket['summary'],
</span><del>- 'comment': comment}
</del><ins>+ 'comment': comment,
+ 'status': ticket['status']}
</ins><span class="cx"> )
</span><del>- req = urllib2.Request(url, payload)
</del><ins>+ req = urllib2.Request(ActivityStreamNotifier.url, payload)
</ins><span class="cx"> urllib2.urlopen(req)
</span><span class="cx">
</span><span class="cx"> def ticket_deleted(self, ticket):
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> def changeset_added(self, repos, changeset):
</span><del>- url = 'http://localbp.com/wp-admin/admin-ajax.php'
</del><span class="cx"> payload = urllib.urlencode(
</span><span class="cx"> {'action': 'dotorg_handle_activity',
</span><span class="cx"> 'source': 'trac',
</span><span class="cx"> 'trac': self.env.project_name,
</span><span class="cx"> 'changeset': changeset.rev,
</span><del>- 'message': changeset.message}
</del><ins>+ 'message': changeset.message,
+ 'user': changeset.author}
</ins><span class="cx"> )
</span><del>- req = urllib2.Request(url, payload)
</del><ins>+ req = urllib2.Request(ActivityStreamNotifier.url, payload)
</ins><span class="cx"> urllib2.urlopen(req)
</span><span class="cx">
</span><span class="cx"> def changeset_modified(self, repos, changeset, old_changeset):
</span></span></pre></div>
<a id="2013mertywpwpcontentmupluginsdotorgactivityhandlerphp"></a>
<div class="modfile"><h4>Modified: 2013/merty/wp/wp-content/mu-plugins/dotorg-activity-handler.php (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/merty/wp/wp-content/mu-plugins/dotorg-activity-handler.php 2013-09-14 19:01:09 UTC (rev 2311)
+++ 2013/merty/wp/wp-content/mu-plugins/dotorg-activity-handler.php 2013-09-15 00:40:06 UTC (rev 2312)
</span><span class="lines">@@ -57,11 +57,11 @@
</span><span class="cx"> $user = get_user_by('login', $_POST['user']);
</span><span class="cx">
</span><span class="cx"> if ( $_POST['newTopic'] ) {
</span><del>- $action = 'Created a new topic in Support Forums';
</del><ins>+ $action = 'Created a new topic in ' . $_POST['site'];
</ins><span class="cx"> $content = $_POST['title'];
</span><span class="cx"> $type = 'new_topic';
</span><span class="cx"> } else {
</span><del>- $action = 'Posted a reply to ' . $_POST['title'] . ' in Support Forums';
</del><ins>+ $action = 'Posted a reply to ' . $_POST['title'] . ' in ' . $_POST['site'];
</ins><span class="cx"> $content = $_POST['message'];
</span><span class="cx"> $type = 'new_post';
</span><span class="cx"> }
</span><span class="lines">@@ -135,10 +135,15 @@
</span><span class="cx"> );
</span><span class="cx"> bp_activity_add($args);
</span><span class="cx"> } else if ( ! empty( $_POST['comment'] ) ) {
</span><ins>+ if ( $_POST['status'] == 'closed' ) {
+ $action = 'Closed the ticket ' . $_POST['title'] . ' in ' . $_POST['trac'] . ' Trac';
+ } else {
+ $action = 'Posted a reply to ' . $_POST['title'] . ' in ' . $_POST['trac'] . ' Trac';
+ }
</ins><span class="cx"> $user = get_user_by('login', $_POST['user']);
</span><span class="cx"> $args = array(
</span><span class="cx"> 'user_id' => $user->ID,
</span><del>- 'action' => 'Posted a reply to ' . $_POST['title'] . ' in ' . $_POST['trac'] . ' Trac',
</del><ins>+ 'action' => $action,
</ins><span class="cx"> 'content' => $_POST['comment'],
</span><span class="cx"> 'component' => 'dotorg_activities',
</span><span class="cx"> 'type' => 'new_comment',
</span><span class="lines">@@ -148,6 +153,19 @@
</span><span class="cx"> );
</span><span class="cx"> bp_activity_add($args);
</span><span class="cx"> } else {
</span><ins>+ $user = get_user_by('login', $_POST['user']);
+ $args = array(
+ 'user_id' => $user->ID,
+ 'action' => 'Committed in ' . $_POST['trac'] . ' Trac',
+ 'content' => $_POST['message'],
+ 'component' => 'dotorg_activities',
+ 'type' => 'new_commit',
+ 'item_id' => $user->ID,
+ 'secondary_item_id' => $_POST['changeset'],
+ 'hide_sitewide' => false
+ );
+ bp_activity_add($args);
+
</ins><span class="cx"> $regex = '/props\s+((?:(?:\w+\b(?<!\bfixes))(?:[,][ ]*)?)+)/i';
</span><span class="cx"> preg_match_all( $regex, $_POST['message'], $matches );
</span><span class="cx"> $usernames = explode( ',', $matches[1][0] );
</span><span class="lines">@@ -158,7 +176,7 @@
</span><span class="cx"> if ( empty( $user ) ) continue;
</span><span class="cx"> $args = array(
</span><span class="cx"> 'user_id' => $user->ID,
</span><del>- 'action' => 'Received props in ' . $_POST['trac'],
</del><ins>+ 'action' => 'Received props in ' . $_POST['trac'] . ' Trac',
</ins><span class="cx"> 'content' => $_POST['message'],
</span><span class="cx"> 'component' => 'dotorg_activities',
</span><span class="cx"> 'type' => 'new_props',
</span></span></pre></div>
<a id="2013mertywpwpcontentthemesprofileswordpressorgmemberssingleprofilephp"></a>
<div class="modfile"><h4>Modified: 2013/merty/wp/wp-content/themes/profiles.wordpress.org/members/single/profile.php (2311 => 2312)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/merty/wp/wp-content/themes/profiles.wordpress.org/members/single/profile.php 2013-09-14 19:01:09 UTC (rev 2311)
+++ 2013/merty/wp/wp-content/themes/profiles.wordpress.org/members/single/profile.php 2013-09-15 00:40:06 UTC (rev 2312)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> $plugins = $wporg_profiles->get_plugins();
</span><span class="cx"> $themes = $wporg_profiles->get_themes();
</span><span class="cx"> $favorites = $wporg_profiles->get_favorites();
</span><del>- $code = $wporg_profiles->get_code();
</del><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( count ( $themes['items'] ) ) { ?>
</span><span class="cx"> <div class="info-group plugin-theme main-themes">
</span><del>- <h4><?php printf( __( "Themes (4)", 'buddypress'), count( $themes['items'] ) ); ?></h4>
</del><ins>+ <h4><?php printf( __( "Themes (%d)", 'buddypress'), count( $themes['items'] ) ); ?></h4>
</ins><span class="cx"> <ul>
</span><span class="cx"> <?php foreach( $themes['items'] as $theme ) { ?>
</span><span class="cx"> <li>
</span></span></pre>
</div>
</div>
</body>
</html>