From b22b7eae8532613b3ee84f84d4e036089b01047e Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 12 Jun 2014 00:08:14 +0200
Subject: [PATCH] Added ability to toggle recent activity filter

---
 .../templates/dashboardBoxRecentActivity.tpl  |  2 ++
 com.woltlab.wcf/userOption.xml                |  5 ++++
 wcfsetup/install/files/js/WCF.User.js         | 29 +++++++++++++++++--
 .../event/UserActivityEventAction.class.php   | 16 ++++++++++
 .../box/RecentActivityDashboardBox.class.php  | 29 ++++++++++++-------
 wcfsetup/install/lang/de.xml                  |  2 ++
 wcfsetup/install/lang/en.xml                  |  2 ++
 7 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
index 3b981ef57a..c4e0287030 100644
--- a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
@@ -1,6 +1,8 @@
 <header class="boxHeadline boxSubHeadline">
 	<h2>{lang}wcf.user.recentActivity{/lang}</h2>
 	{if $filteredByFollowedUsers}<p>{lang}wcf.user.recentActivity.filteredByFollowedUsers{/lang}</p>{/if}
+	{* TODO: styling *}
+	{if $canFilterByFollowedUsers}<a class="jsOnly jsRecentActivitySwitchContext" style="float: right">{lang}wcf.user.recentActivity.scope.{if $filteredByFollowedUsers}all{else}followedUsers{/if}{/lang}</a>{/if}
 </header>
 
 <div class="container marginTop">
diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index 1edad995a0..98948aa4be 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -178,6 +178,11 @@
 			<!-- /profile -->
 			
 			<!-- settings -->
+			<option name="recentActivitiesFilterByFollowing">
+				<categoryname>hidden</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
 			<option name="timezone">
 				<categoryname>settings.general.date</categoryname>
 				<optiontype>timezone</optiontype>
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 82fe229764..d23e4046e9 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -1569,8 +1569,17 @@ WCF.User.RecentActivityLoader = Class.extend({
 			success: $.proxy(this._success, this)
 		});
 		
-		this._loadButton = $('<li class="recentActivitiesMore"><button class="small">' + WCF.Language.get('wcf.user.recentActivity.more') + '</button></li>').appendTo(this._container);
-		this._loadButton = this._loadButton.children('button').click($.proxy(this._click, this));
+		if (this._container.children('li').length) {
+			this._loadButton = $('<li class="recentActivitiesMore"><button class="small">' + WCF.Language.get('wcf.user.recentActivity.more') + '</button></li>').appendTo(this._container);
+			this._loadButton = this._loadButton.children('button').click($.proxy(this._click, this));
+		}
+		else {
+			$('<li class="recentActivitiesMore"><small>' + WCF.Language.get('wcf.user.recentActivity.noMoreEntries') + '</small></li>').appendTo(this._container);
+		}
+		
+		if (WCF.User.userID) {
+			$('.jsRecentActivitySwitchContext').click($.proxy(this._switchContext, this));
+		}
 	},
 	
 	/**
@@ -1597,6 +1606,22 @@ WCF.User.RecentActivityLoader = Class.extend({
 		this._proxy.sendRequest();
 	},
 	
+	/**
+	 * Switches recent activity context.
+	 */
+	_switchContext: function() {
+		new WCF.Action.Proxy({
+			autoSend: true,
+			data: {
+				actionName: 'switchContext',
+				className: 'wcf\\data\\user\\activity\\event\\UserActivityEventAction'
+			},
+			success: function() {
+				window.location.reload();
+			}
+		});
+	},
+	
 	/**
 	 * Handles successful AJAX requests.
 	 * 
diff --git a/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEventAction.class.php b/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEventAction.class.php
index 0cc2c5d8ce..8d0705f937 100644
--- a/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEventAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEventAction.class.php
@@ -3,6 +3,8 @@ namespace wcf\data\user\activity\event;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\user\activity\event\UserActivityEventHandler;
 use wcf\system\WCF;
+use wcf\data\user\UserAction;
+use wcf\data\user\User;
 
 /**
  * Executes user activity event-related actions.
@@ -66,4 +68,18 @@ class UserActivityEventAction extends AbstractDatabaseObjectAction {
 			'template' => WCF::getTPL()->fetch('recentActivityListItem')
 		);
 	}
+	
+	/**
+	 * Does nothing.
+	 */
+	public function validateSwitchContext() { }
+	
+	public function switchContext() {
+		$userAction = new UserAction(array(WCF::getUser()), 'update', array(
+			'options' => array(
+				User::getUserOptionID('recentActivitiesFilterByFollowing') => (WCF::getUser()->recentActivitiesFilterByFollowing ? 0 : 1)
+			)
+		));
+		$userAction->executeAction();
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php b/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php
index fee6f556e9..6a9bbc0cbf 100644
--- a/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php
+++ b/wcfsetup/install/files/lib/system/dashboard/box/RecentActivityDashboardBox.class.php
@@ -17,6 +17,12 @@ use wcf\system\WCF;
  * @category	Community Framework
  */
 class RecentActivityDashboardBox extends AbstractContentDashboardBox {
+	/**
+	 * true, if user can filter by followed users
+	 * @var	boolean
+	 */
+	public $canFilterByFollowedUsers = false;
+	
 	/**
 	 * recent activity list
 	 * @var	\wcf\data\user\activity\event\ViewableUserActivityEventList
@@ -41,8 +47,12 @@ class RecentActivityDashboardBox extends AbstractContentDashboardBox {
 	public function init(DashboardBox $box, IPage $page) {
 		parent::init($box, $page);
 		
+		if (WCF::getUser()->userID && count(WCF::getUserProfileHandler()->getFollowingUsers())) {
+			$this->canFilterByFollowedUsers = true;
+		}
+		
 		$this->eventList = new ViewableUserActivityEventList();
-		if (count(WCF::getUserProfileHandler()->getFollowingUsers())) {
+		if ($this->canFilterByFollowedUsers && WCF::getUser()->recentActivitiesFilterByFollowing) {
 			$this->filteredByFollowedUsers = true;
 			$this->eventList->getConditionBuilder()->add('user_activity_event.userID IN (?)', array(WCF::getUserProfileHandler()->getFollowingUsers()));
 		}
@@ -60,14 +70,13 @@ class RecentActivityDashboardBox extends AbstractContentDashboardBox {
 	 * @see	\wcf\system\dashboard\box\AbstractContentDashboardBox::render()
 	 */
 	protected function render() {
-		if (count($this->eventList)) {
-			WCF::getTPL()->assign(array(
-				'eventList' => $this->eventList,
-				'lastEventTime' => $this->lastEventTime,
-				'filteredByFollowedUsers' => $this->filteredByFollowedUsers
-			));
-			
-			return WCF::getTPL()->fetch('dashboardBoxRecentActivity');
-		}
+		WCF::getTPL()->assign(array(
+			'canFilterByFollowedUsers' => $this->canFilterByFollowedUsers,
+			'eventList' => $this->eventList,
+			'lastEventTime' => $this->lastEventTime,
+			'filteredByFollowedUsers' => $this->filteredByFollowedUsers
+		));
+		
+		return WCF::getTPL()->fetch('dashboardBoxRecentActivity');
 	}
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 8e01e62e07..72d677c8b7 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2681,6 +2681,8 @@ Sollten Sie sich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben,
 		<item name="wcf.user.recentActivity.com.woltlab.wcf.user.recentActivityEvent.follow"><![CDATA[Folgen]]></item>
 		<item name="wcf.user.recentActivity.com.woltlab.wcf.user.profileComment.recentActivityEvent"><![CDATA[Pinnwand-Kommentar]]></item>
 		<item name="wcf.user.recentActivity.com.woltlab.wcf.user.profileComment.response.recentActivityEvent"><![CDATA[Pinnwand-Antwort]]></item>
+		<item name="wcf.user.recentActivity.scope.all"><![CDATA[Zeige Aktivitäten aller Benutzer]]></item>
+		<item name="wcf.user.recentActivity.scope.followedUsers"><![CDATA[Zeige Aktivitäten von Benutzeren, denen Sie folgen]]></item>
 	</category>
 	
 	<category name="wcf.user.3rdparty">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 9fe7095955..184844b571 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2536,6 +2536,8 @@ You can safely ignore this email if you did not register with the website: {@PAG
 		<item name="wcf.user.recentActivity.com.woltlab.wcf.user.recentActivityEvent.follow"><![CDATA[Follow]]></item>
 		<item name="wcf.user.recentActivity.com.woltlab.wcf.user.profileComment.recentActivityEvent"><![CDATA[Wall Comment]]></item>
 		<item name="wcf.user.recentActivity.com.woltlab.wcf.user.profileComment.response.recentActivityEvent"><![CDATA[Wall Reply]]></item>
+		<item name="wcf.user.recentActivity.scope.all"><![CDATA[All activities]]></item>
+		<item name="wcf.user.recentActivity.scope.followedUsers"><![CDATA[Filter by followed users]]></item>
 	</category>
 	
 	<category name="wcf.user.3rdparty">
-- 
2.20.1