mirror of
https://github.com/friendica/friendica
synced 2024-11-14 03:42:53 +00:00
We can now pin our own posts
This commit is contained in:
parent
48ab31f451
commit
cf56992444
11 changed files with 97 additions and 8 deletions
|
@ -1,6 +1,6 @@
|
||||||
-- ------------------------------------------
|
-- ------------------------------------------
|
||||||
-- Friendica 2019.09-rc (Dalmatian Bellflower)
|
-- Friendica 2019.12-dev (Dalmatian Bellflower)
|
||||||
-- DB_UPDATE_VERSION 1322
|
-- DB_UPDATE_VERSION 1324
|
||||||
-- ------------------------------------------
|
-- ------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
@ -1281,6 +1281,7 @@ CREATE TABLE IF NOT EXISTS `user-item` (
|
||||||
`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
|
`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
|
||||||
`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Marker to hide an item from the user',
|
`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Marker to hide an item from the user',
|
||||||
`ignored` boolean COMMENT 'Ignore this thread if set',
|
`ignored` boolean COMMENT 'Ignore this thread if set',
|
||||||
|
`pinned` boolean COMMENT 'The item is pinned on the profile page',
|
||||||
PRIMARY KEY(`uid`,`iid`)
|
PRIMARY KEY(`uid`,`iid`)
|
||||||
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific item data';
|
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific item data';
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ class Item extends BaseObject
|
||||||
'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
|
'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
|
||||||
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
|
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
|
||||||
'contact-id', 'contact-uid', 'contact-link', 'contact-name', 'contact-avatar',
|
'contact-id', 'contact-uid', 'contact-link', 'contact-name', 'contact-avatar',
|
||||||
'writable', 'self', 'cid', 'alias',
|
'writable', 'self', 'cid', 'alias', 'pinned',
|
||||||
'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
|
'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
|
||||||
'event-summary', 'event-desc', 'event-location', 'event-type',
|
'event-summary', 'event-desc', 'event-location', 'event-type',
|
||||||
'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
|
'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
|
||||||
|
@ -114,6 +114,35 @@ class Item extends BaseObject
|
||||||
return self::$legacy_mode;
|
return self::$legacy_mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the pinned state of an item
|
||||||
|
*
|
||||||
|
* @param integer $iid Item ID
|
||||||
|
* @param integer $uid User ID
|
||||||
|
* @param boolean $pinned Pinned state
|
||||||
|
*/
|
||||||
|
public static function setPinned(int $iid, int $uid, bool $pinned)
|
||||||
|
{
|
||||||
|
DBA::update('user-item', ['pinned' => $pinned], ['iid' => $iid, 'uid' => $uid], true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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)
|
||||||
|
{
|
||||||
|
$useritem = DBA::selectFirst('user-item', ['pinned'], ['iid' => $iid, 'uid' => $uid]);
|
||||||
|
if (!DBA::isResult($useritem)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return (bool)$useritem['pinned'];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief returns an activity index from an activity string
|
* @brief returns an activity index from an activity string
|
||||||
*
|
*
|
||||||
|
@ -585,7 +614,7 @@ class Item extends BaseObject
|
||||||
'iaid' => 'internal-iaid'];
|
'iaid' => 'internal-iaid'];
|
||||||
|
|
||||||
if ($usermode) {
|
if ($usermode) {
|
||||||
$fields['user-item'] = ['ignored' => 'internal-user-ignored'];
|
$fields['user-item'] = ['pinned', 'ignored' => 'internal-user-ignored'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
|
$fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
|
||||||
|
|
|
@ -140,8 +140,10 @@ class Post extends BaseObject
|
||||||
$sparkle = '';
|
$sparkle = '';
|
||||||
$buttons = '';
|
$buttons = '';
|
||||||
$dropping = false;
|
$dropping = false;
|
||||||
|
$pin = false;
|
||||||
$star = false;
|
$star = false;
|
||||||
$ignore = false;
|
$ignore = false;
|
||||||
|
$ispinned = "unpinned";
|
||||||
$isstarred = "unstarred";
|
$isstarred = "unstarred";
|
||||||
$indent = '';
|
$indent = '';
|
||||||
$shiny = '';
|
$shiny = '';
|
||||||
|
@ -284,6 +286,19 @@ class Post extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
|
if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
|
||||||
|
if ($origin) {
|
||||||
|
$ispinned = ($item['pinned'] ? 'pinned' : 'unpinned');
|
||||||
|
|
||||||
|
$pin = [
|
||||||
|
'do' => L10n::t('pin'),
|
||||||
|
'undo' => L10n::t('unpin'),
|
||||||
|
'toggle' => L10n::t('toggle pin status'),
|
||||||
|
'classdo' => $item['pinned'] ? 'hidden' : '',
|
||||||
|
'classundo' => $item['pinned'] ? '' : 'hidden',
|
||||||
|
'pinned' => L10n::t('pinned'),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
||||||
|
|
||||||
$star = [
|
$star = [
|
||||||
|
@ -407,6 +422,8 @@ class Post extends BaseObject
|
||||||
'owner_name' => $owner_name_e,
|
'owner_name' => $owner_name_e,
|
||||||
'plink' => Item::getPlink($item),
|
'plink' => Item::getPlink($item),
|
||||||
'edpost' => $edpost,
|
'edpost' => $edpost,
|
||||||
|
'ispinned' => $ispinned,
|
||||||
|
'pin' => $pin,
|
||||||
'isstarred' => $isstarred,
|
'isstarred' => $isstarred,
|
||||||
'star' => $star,
|
'star' => $star,
|
||||||
'ignore' => $ignore,
|
'ignore' => $ignore,
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
|
||||||
if (!defined('DB_UPDATE_VERSION')) {
|
if (!defined('DB_UPDATE_VERSION')) {
|
||||||
define('DB_UPDATE_VERSION', 1323);
|
define('DB_UPDATE_VERSION', 1324);
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
@ -1384,7 +1384,8 @@ return [
|
||||||
"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
|
"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
|
||||||
"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
|
"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
|
||||||
"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide an item from the user"],
|
"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide an item from the user"],
|
||||||
"ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"]
|
"ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"],
|
||||||
|
"pinned" => ["type" => "boolean", "comment" => "The item is pinned on the profile page"]
|
||||||
],
|
],
|
||||||
"indexes" => [
|
"indexes" => [
|
||||||
"PRIMARY" => ["uid", "iid"]
|
"PRIMARY" => ["uid", "iid"]
|
||||||
|
|
|
@ -179,6 +179,7 @@ return [
|
||||||
'/{type}/{customize}/{name}' => [Module\Photo::class, [R::GET]],
|
'/{type}/{customize}/{name}' => [Module\Photo::class, [R::GET]],
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'/pinned/{item:\d+}' => [Module\Pinned::class, [R::GET]],
|
||||||
'/pretheme' => [Module\ThemeDetails::class, [R::GET]],
|
'/pretheme' => [Module\ThemeDetails::class, [R::GET]],
|
||||||
'/probe' => [Module\Debug\Probe::class, [R::GET]],
|
'/probe' => [Module\Debug\Probe::class, [R::GET]],
|
||||||
|
|
||||||
|
|
|
@ -626,6 +626,25 @@ function dostar(ident) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function dopin(ident) {
|
||||||
|
ident = ident.toString();
|
||||||
|
$('#like-rotator-' + ident).show();
|
||||||
|
$.get('pinned/' + ident, function(data) {
|
||||||
|
if (data.match(/1/)) {
|
||||||
|
$('#pinned-' + ident).addClass('pinned');
|
||||||
|
$('#pinned-' + ident).removeClass('unpinned');
|
||||||
|
$('#pin-' + ident).addClass('hidden');
|
||||||
|
$('#unpin-' + ident).removeClass('hidden');
|
||||||
|
} else {
|
||||||
|
$('#pinned-' + ident).addClass('unpinned');
|
||||||
|
$('#pinned-' + ident).removeClass('pinned');
|
||||||
|
$('#pin-' + ident).removeClass('hidden');
|
||||||
|
$('#unpin-' + ident).addClass('hidden');
|
||||||
|
}
|
||||||
|
$('#like-rotator-' + ident).hide();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function doignore(ident) {
|
function doignore(ident) {
|
||||||
ident = ident.toString();
|
ident = ident.toString();
|
||||||
$('#like-rotator-' + ident).show();
|
$('#like-rotator-' + ident).show();
|
||||||
|
|
|
@ -90,6 +90,9 @@
|
||||||
<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
|
<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
{{if $item.pin}}
|
||||||
|
<a href="#" id="pinned-{{$item.id}}" onclick="dopin({{$item.id}}); return false;" class="pin-item icon {{$item.ispinned}}" title="{{$item.pin.toggle}}"></a>
|
||||||
|
{{/if}}
|
||||||
{{if $item.star}}
|
{{if $item.star}}
|
||||||
<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
|
<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -118,6 +118,13 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
{{if $item.pin}}
|
||||||
|
<li role="menuitem">
|
||||||
|
<button type="button" id="pin-{{$item.id}}" onclick="dopin({{$item.id}});" class="btn-link {{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="fa fa-check-square-o" aria-hidden="true"></i> {{$item.pin.do}}</button>
|
||||||
|
<button type="button" id="unpin-{{$item.id}}" onclick="dopin({{$item.id}});" class="btn-link {{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="fa fa-check-square" aria-hidden="true"></i> {{$item.pin.undo}}</button>
|
||||||
|
</li>
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
{{if $item.star}}
|
{{if $item.star}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i> {{$item.star.do}}</button>
|
<button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i> {{$item.star.do}}</button>
|
||||||
|
|
|
@ -93,6 +93,10 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="wall-item-actions-social">
|
<div class="wall-item-actions-social">
|
||||||
|
{{if $item.pin}}
|
||||||
|
<a href="#" id="pin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;" class="{{$item.pin.classdo}}" title="{{$item.pin.do}}">{{$item.pin.do}}</a>
|
||||||
|
<a href="#" id="unpin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;" class="{{$item.pin.classundo}}" title="{{$item.pin.undo}}">{{$item.pin.undo}}</a>
|
||||||
|
{{/if}}
|
||||||
{{if $item.star}}
|
{{if $item.star}}
|
||||||
<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}">{{$item.star.do}}</a>
|
<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}">{{$item.star.do}}</a>
|
||||||
<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}">{{$item.star.undo}}</a>
|
<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}">{{$item.star.undo}}</a>
|
||||||
|
|
|
@ -107,6 +107,9 @@
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
{{if $item.pin}}
|
||||||
|
<a href="#" id="pinned-{{$item.id}}" onclick="dopin({{$item.id}}); return false;" class="pin-item icon {{$item.ispinned}}" title="{{$item.pin.toggle}}"></a>
|
||||||
|
{{/if}}
|
||||||
{{if $item.star}}
|
{{if $item.star}}
|
||||||
<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
|
<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -122,6 +122,10 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
{{if $item.pin}}
|
||||||
|
<a role="button" id="pin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;" class="{{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="icon-pin icon-large"><span class="sr-only">{{$item.pin.do}}</span></i></a>
|
||||||
|
<a role="button" id="unpin-{{$item.id}}" onclick="dopin({{$item.id}}); return false;" class="{{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="icon-pin-empty icon-large"><span class="sr-only">{{$item.pin.undo}}</span></i></a>
|
||||||
|
{{/if}}
|
||||||
{{if $item.star}}
|
{{if $item.star}}
|
||||||
<a role="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="icon-star icon-large"><span class="sr-only">{{$item.star.do}}</span></i></a>
|
<a role="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="icon-star icon-large"><span class="sr-only">{{$item.star.do}}</span></i></a>
|
||||||
<a role="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"><span class="sr-only">{{$item.star.undo}}</span></i></a>
|
<a role="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"><span class="sr-only">{{$item.star.undo}}</span></i></a>
|
||||||
|
|
Loading…
Reference in a new issue