bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

show pinned items

Browse source
This commit is contained in:
Michael 2019-11-07 06:53:18 +00:00
commit ed58af25a5
10 changed files with 41 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Model/Item.php
View file

@ -116,7 +116,7 @@ class Item extends BaseObject
/**
* Set the pinned state of an item
*
*
* @param integer $iid Item ID
* @param integer $uid User ID
* @param boolean $pinned Pinned state
@ -128,10 +128,10 @@ class Item extends BaseObject
/**
* Get the pinned state
*
*
* @param integer $iid Item ID
* @param integer $uid User ID
*
*
* @return boolean pinned state
*/
public static function getPinned(int $iid, int $uid)
@ -143,6 +143,22 @@ class Item extends BaseObject
return (bool)$useritem['pinned'];
}
public static function selectPinned(int $uid, array $selected = [])
{
$useritems = DBA::select('user-item', ['iid'], ['uid' => $uid, 'pinned' => true]);
if (!DBA::isResult($useritems)) {
return $useritems;
}
$pinned = [];
while ($useritem = self::fetch($useritems)) {
$pinned[] = $useritem['iid'];
}
DBA::close($useritems);
return self::selectThreadForUser($uid, $selected, ['iid' => $pinned]);
}
/**
* @brief returns an activity index from an activity string
*

8
src/Module/Profile.php
View file

@ -177,7 +177,7 @@ class Profile extends BaseModule
}
if (!$update) {
$tab = Strings::escapeTags(trim($_GET['tab'] ?? ''));
$tab = Strings::escapeTags(trim($_GET['tab'] ?? ''));
$o .= ProfileModel::getTabs($a, $tab, $is_owner, $a->profile['nickname']);
@ -349,6 +349,12 @@ class Profile extends BaseModule
$items = DBA::toArray($items_stmt);
if ($pager->getStart() == 0) {
$pinned_items = Item::selectPinned($a->profile['profile_uid'], ['uri']);
$pinned = Item::inArray($pinned_items);
$items = array_merge($items, $pinned);
}
$o .= conversation($a, $items, $pager, 'profile', $update, false, 'received', $a->profile['profile_uid']);
if (!$update) {

6
src/Object/Post.php
View file

@ -140,6 +140,7 @@ class Post extends BaseObject
$sparkle = '';
$buttons = '';
$dropping = false;
$pinned = '';
$pin = false;
$star = false;
$ignore = false;
@ -287,6 +288,10 @@ class Post extends BaseObject
if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
if ($origin) {
if ($item['pinned']) {
$pinned = L10n::t('pinned item');
}
$ispinned = ($item['pinned'] ? 'pinned' : 'unpinned');
$pin = [
@ -424,6 +429,7 @@ class Post extends BaseObject
'edpost' => $edpost,
'ispinned' => $ispinned,
'pin' => $pin,
'pinned' => $pinned,
'isstarred' => $isstarred,
'star' => $star,
'ignore' => $ignore,