Merge pull request #9293 from annando/issue-9288

Issue 9288: Endless scrolling on the community page

src/Module/Conversation/Community.php

@@ -26,6 +26,7 @@ use Friendica\BaseModule;
 use Friendica\Content\BoundariesPager;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
+use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget\TrendingTags;
 use Friendica\Core\ACL;
 use Friendica\Core\Renderer;
@@ -49,6 +50,14 @@ class Community extends BaseModule
 	{
 		self::parseRequest($parameters);
 
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			$tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+			$o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
+		} else {
+			$o = '';
+		}
+
+		if (empty($_GET['mode']) || ($_GET['mode'] != 'raw')) {
 			$tabs = [];
 
 			if ((Session::isAuthenticated() || in_array(self::$page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(DI::config()->get('system', 'singleuser'))) {
@@ -74,45 +83,10 @@ class Community extends BaseModule
 			}
 
 			$tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl');
-		$o = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
+			$o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]);
 
 			Nav::setSelected('community');
 
-		$items = self::getItems();
-
-		if (!DBA::isResult($items)) {
-			notice(DI::l10n()->t('No results.'));
-			return $o;
-		}
-
-		// We need the editor here to be able to reshare an item.
-		if (Session::isAuthenticated()) {
-			$x = [
-				'is_owner' => true,
-				'allow_location' => DI::app()->user['allow_location'],
-				'default_location' => DI::app()->user['default-location'],
-				'nickname' => DI::app()->user['nickname'],
-				'lockstate' => (is_array(DI::app()->user) && (strlen(DI::app()->user['allow_cid']) || strlen(DI::app()->user['allow_gid']) || strlen(DI::app()->user['deny_cid']) || strlen(DI::app()->user['deny_gid'])) ? 'lock' : 'unlock'),
-				'acl' => ACL::getFullSelectorHTML(DI::page(), DI::app()->user, true),
-				'bang' => '',
-				'visitor' => 'block',
-				'profile_uid' => local_user(),
-			];
-			$o .= status_editor(DI::app(), $x, 0, true);
-		}
-
-		$o .= conversation(DI::app(), $items, 'community', false, false, 'commented', local_user());
-
-		$pager = new BoundariesPager(
-			DI::l10n(),
-			DI::args()->getQueryString(),
-			$items[0]['commented'],
-			$items[count($items) - 1]['commented'],
-			self::$itemsPerPage
-		);
-
-		$o .= $pager->renderMinimal(count($items));
-
 			DI::page()['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/community_accounts.tpl'), [
 				'$title'        => DI::l10n()->t('Accounts'),
 				'$content'      => self::$content,
@@ -134,6 +108,9 @@ class Community extends BaseModule
 				if (!empty($_GET['max_id'])) {
 					$query_parameters['max_id'] = $_GET['max_id'];
 				}
+				if (!empty($_GET['last_commented'])) {
+					$query_parameters['max_id'] = $_GET['last_commented'];
+				}
 		
 				$path_all = $path . (!empty($query_parameters) ? '?' . http_build_query($query_parameters) : '');
 				$path_no_sharer = $path . '?' . http_build_query(array_merge($query_parameters, ['no_sharer' => true]));
@@ -151,6 +128,46 @@ class Community extends BaseModule
 				DI::page()['aside'] .= TrendingTags::getHTML(self::$content);
 			}
 
+			// We need the editor here to be able to reshare an item.
+			if (Session::isAuthenticated()) {
+				$x = [
+					'is_owner' => true,
+					'allow_location' => DI::app()->user['allow_location'],
+					'default_location' => DI::app()->user['default-location'],
+					'nickname' => DI::app()->user['nickname'],
+					'lockstate' => (is_array(DI::app()->user) && (strlen(DI::app()->user['allow_cid']) || strlen(DI::app()->user['allow_gid']) || strlen(DI::app()->user['deny_cid']) || strlen(DI::app()->user['deny_gid'])) ? 'lock' : 'unlock'),
+					'acl' => ACL::getFullSelectorHTML(DI::page(), DI::app()->user, true),
+					'bang' => '',
+					'visitor' => 'block',
+					'profile_uid' => local_user(),
+				];
+				$o .= status_editor(DI::app(), $x, 0, true);
+			}
+		}
+
+		$items = self::getItems();
+
+		if (!DBA::isResult($items)) {
+			notice(DI::l10n()->t('No results.'));
+			return $o;
+		}
+
+		$o .= conversation(DI::app(), $items, 'community', false, false, 'commented', local_user());
+
+		$pager = new BoundariesPager(
+			DI::l10n(),
+			DI::args()->getQueryString(),
+			$items[0]['commented'],
+			$items[count($items) - 1]['commented'],
+			self::$itemsPerPage
+		);
+
+		if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+			$o .= HTML::scrollLoader();
+		} else {
+			$o .= $pager->renderMinimal(count($items));
+		}
+
 		$t = Renderer::getMarkupTemplate("community.tpl");
 		return Renderer::replaceMacros($t, [
 			'$content' => $o,
@@ -245,6 +262,7 @@ class Community extends BaseModule
 
 		self::$since_id = $_GET['since_id'] ?? null;
 		self::$max_id   = $_GET['max_id']   ?? null;
+		self::$max_id   = $_GET['last_commented'] ?? self::$max_id;
 	}
 
 	/**