Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 03:20:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14233 from annando/media-scrolling

Browse source 
Fix paging on media pages
This commit is contained in:
Tobias Diekershoff 2024-06-15 13:47:10 +02:00 committed by GitHub
commit 86f238f379
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Model/Contact.php
View file

@ -1547,24 +1547,25 @@ class Contact
/** /**
* Returns posts from a given contact url * Returns posts from a given contact url
* *
* @param string $contact_url Contact URL * @param string $contact_url Contact URL
* @param bool $thread_mode * @param int $uid User ID
* @param int $update Update mode * @param bool $only_media Only display media content
* @param int $parent Item parent ID for the update mode * @param string $last_created Newest creation date, used for paging
* @param bool $only_media Only display media content
* @return string posts in HTML * @return string posts in HTML
* @throws \Exception * @throws \Exception
*/ */
public static function getPostsFromUrl(string $contact_url, int $uid, bool $only_media = false): string public static function getPostsFromUrl(string $contact_url, int $uid, bool $only_media = false, string $last_created = null): string
{ {
return self::getPostsFromId(self::getIdForURL($contact_url), $uid, $only_media); return self::getPostsFromId(self::getIdForURL($contact_url), $uid, $only_media, $last_created);
} }
/** /**
* Returns posts from a given contact id * Returns posts from a given contact id
* *
* @param int $cid Contact ID * @param int $cid Contact ID
* @param bool $only_media Only display media content * @param int $uid User ID
* @param bool $only_media Only display media content
* @param string $last_created Newest creation date, used for paging
* @return string posts in HTML * @return string posts in HTML
* @throws \Exception * @throws \Exception
*/ */

2
src/Module/Contact/Media.php
View file

@ -65,7 +65,7 @@ class Media extends BaseModule
$o = Contact::getTabsHTML($contact, Contact::TAB_MEDIA); $o = Contact::getTabsHTML($contact, Contact::TAB_MEDIA);
$o .= ModelContact::getPostsFromUrl($contact['url'], $this->userSession->getLocalUserId(), true); $o .= ModelContact::getPostsFromUrl($contact['url'], $this->userSession->getLocalUserId(), true, $request['last_created'] ?? '');
return $o; return $o;
} }

2
src/Module/Profile/Media.php
View file

@ -64,7 +64,7 @@ class Media extends BaseProfile
$o = self::getTabsHTML('media', $is_owner, $profile['nickname'], $profile['hide-friends']); $o = self::getTabsHTML('media', $is_owner, $profile['nickname'], $profile['hide-friends']);
$o .= Contact::getPostsFromUrl($profile['url'], $this->userSession->getLocalUserId(), true); $o .= Contact::getPostsFromUrl($profile['url'], $this->userSession->getLocalUserId(), true, $request['last_created'] ?? '');
return $o; return $o;
} }