<!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>[BuddyPress][13180] trunk: Remove a `new_avatar` activity when an avatar was deleted from history</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://buddypress.trac.wordpress.org/changeset/13180">13180</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13180","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-11 19:40:10 +0000 (Sat, 11 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'>Remove a `new_avatar` activity when an avatar was deleted from history
Once the user removed an item from their avatars story, the corresponding `new_avatar` also needs to be deleted.
Props vapvarun, oztaser
See <a href="http://buddypress.trac.wordpress.org/ticket/8581">#8581</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmembersactivityphp">trunk/src/bp-members/bp-members-activity.php</a></li>
<li><a href="#trunktestsphpunittestcasesmembersactivityphp">trunk/tests/phpunit/testcases/members/activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmembersactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-activity.php 2021-12-11 18:52:01 UTC (rev 13179)
+++ trunk/src/bp-members/bp-members-activity.php 2021-12-11 19:40:10 UTC (rev 13180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,3 +250,39 @@
</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"> add_action( 'bp_members_avatar_uploaded', 'bp_members_new_avatar_activity', 10, 4 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Remove the `new_avatar` activity corresponding to the deleted previous avatar.
+ *
+ * @since 10.0.0
+ *
+ * @param int $user_id The user ID.
+ * @param int $timestamp The timestamp when the activity was created.
+ * @return bool True on success. False otherwise.
+ */
+function bp_members_remove_previous_avatar_activity( $user_id = 0, $timestamp = 0 ) {
+ if ( ! $user_id || ! $timestamp || ! bp_is_active( 'activity' ) ) {
+ return false;
+ }
+
+ // Look for a `new_avatar` activity corresponding to the date and user.
+ $activity_id = BP_Activity_Activity::get_id(
+ array(
+ 'user_id' => $user_id,
+ 'component' => buddypress()->members->id,
+ 'type' => 'new_avatar',
+ 'date_recorded' => date( 'Y-m-d H:i:s', $timestamp ),
+ )
+ );
+
+ if ( $activity_id ) {
+ return bp_activity_delete(
+ array(
+ 'id' => $activity_id,
+ )
+ );
+ }
+
+ return false;
+}
+add_action( 'bp_previous_user_avatar_deleted', 'bp_members_remove_previous_avatar_activity', 10, 2 );
</ins></span></pre></div>
<a id="trunktestsphpunittestcasesmembersactivityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/members/activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/members/activity.php 2021-12-11 18:52:01 UTC (rev 13179)
+++ trunk/tests/phpunit/testcases/members/activity.php 2021-12-11 19:40:10 UTC (rev 13180)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,4 +149,44 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 2, $new_avatar_activities['total'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group bp_members_remove_previous_avatar_activity
+ */
+ public function test_bp_members_remove_previous_avatar_activity() {
+ $u = self::factory()->user->create();
+ $timestamp = strtotime( bp_core_current_time() );
+ $prev_timestamp = $timestamp - ( 121 * HOUR_IN_SECONDS );
+ $date_recorded = date( 'Y-m-d H:i:s', $timestamp );
+ $prev_time = date( 'Y-m-d H:i:s', $prev_timestamp );
+
+ $a1 = self::factory()->activity->create( array(
+ 'component' => buddypress()->members->id,
+ 'type' => 'new_avatar',
+ 'user_id' => $u,
+ 'recorded_time' => $prev_time,
+ ) );
+
+ $a2 = self::factory()->activity->create(
+ array(
+ 'component' => buddypress()->members->id,
+ 'type' => 'new_avatar',
+ 'user_id' => $u,
+ 'recorded_time' => $date_recorded,
+ )
+ );
+
+ $this->assertTrue( bp_members_remove_previous_avatar_activity( $u, $prev_timestamp ) );
+
+ $new_avatar_activities = bp_activity_get( array(
+ 'filter' => array(
+ 'object' => buddypress()->members->id,
+ 'user_id' => $u,
+ 'action' => 'new_avatar',
+ ),
+ 'count_total' => 'count_query',
+ ) );
+
+ $this->assertEquals( 1, $new_avatar_activities['total'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>