clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New functions for the post-view view

This commit is contained in:
Michael 2021-06-16 10:16:01 +00:00
parent 5211c12b0c
commit 11d2440425
5 changed files with 105 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Factory/Api/Mastodon/Status.php
View File

@ -72,9 +72,9 @@ class Status extends BaseFactory
$account = DI::mstdnAccount()->createFromContactId($item['author-id']); $account = DI::mstdnAccount()->createFromContactId($item['author-id']);
$counts = new \Friendica\Object\Api\Mastodon\Status\Counts( $counts = new \Friendica\Object\Api\Mastodon\Status\Counts(
Post::count(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_COMMENT, 'deleted' => false], [], false), Post::countPosts(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_COMMENT, 'deleted' => false], []),
Post::count(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE), 'deleted' => false], [], false), Post::countPosts(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE), 'deleted' => false], []),
Post::count(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE), 'deleted' => false], [], false) Post::countPosts(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE), 'deleted' => false], [])
); );
$userAttributes = new \Friendica\Object\Api\Mastodon\Status\UserAttributes( $userAttributes = new \Friendica\Object\Api\Mastodon\Status\UserAttributes(

125
src/Model/Post.php
View File

@ -124,24 +124,22 @@ class Post
} }
/** /**
* Check if post data exists * Check if post-user-view records exists
* *
* @param array $condition array of fields for condition * @param array $condition array of fields for condition
* @param bool $user_mode true = post-user-view, false = post-view
* *
* @return boolean Are there rows for that condition? * @return boolean Are there rows for that condition?
* @throws \Exception * @throws \Exception
*/ */
public static function exists($condition, bool $user_mode = true) { public static function exists($condition) {
return DBA::exists($user_mode ? 'post-user-view' : 'post-view', $condition); return DBA::exists('post-user-view', $condition);
} }
/** /**
* Counts the posts satisfying the provided condition * Counts the post-user-view records satisfying the provided condition
* *
* @param array $condition array of fields for condition * @param array $condition array of fields for condition
* @param array $params Array of several parameters * @param array $params Array of several parameters
* @param bool $user_mode true = post-user-view, false = post-view
* *
* @return int * @return int
* *
@ -153,13 +151,34 @@ class Post
* $count = Post::count($condition); * $count = Post::count($condition);
* @throws \Exception * @throws \Exception
*/ */
public static function count(array $condition = [], array $params = [], bool $user_mode = true) public static function count(array $condition = [], array $params = [])
{ {
return DBA::count($user_mode ? 'post-user-view' : 'post-view', $condition, $params); return DBA::count('post-user-view', $condition, $params);
} }
/** /**
* Retrieve a single record from the post table and returns it in an associative array * Counts the post-view records satisfying the provided condition
*
* @param array $condition array of fields for condition
* @param array $params Array of several parameters
*
* @return int
*
* Example:
* $condition = ["network" => 'dspr'];
* or:
* $condition = ["`network` IN (?, ?)", 1, 'dfrn', 'dspr'];
*
* $count = Post::count($condition);
* @throws \Exception
*/
public static function countPosts(array $condition = [], array $params = [])
{
return DBA::count('post-view', $condition, $params);
}
/**
* Retrieve a single record from the post-user-view view and returns it in an associative array
* *
* @param array $fields * @param array $fields
* @param array $condition * @param array $condition
@ -169,11 +188,11 @@ class Post
* @throws \Exception * @throws \Exception
* @see DBA::select * @see DBA::select
*/ */
public static function selectFirst(array $fields = [], array $condition = [], $params = [], bool $user_mode = true) public static function selectFirst(array $fields = [], array $condition = [], $params = [])
{ {
$params['limit'] = 1; $params['limit'] = 1;
$result = self::select($fields, $condition, $params, $user_mode); $result = self::select($fields, $condition, $params);
if (is_bool($result)) { if (is_bool($result)) {
return $result; return $result;
@ -185,7 +204,32 @@ class Post
} }
/** /**
* Retrieve a single record from the post-thread table and returns it in an associative array * Retrieve a single record from the post-view view and returns it in an associative array
*
* @param array $fields
* @param array $condition
* @param array $params
* @return bool|array
* @throws \Exception
* @see DBA::select
*/
public static function selectFirstPost(array $fields = [], array $condition = [], $params = [])
{
$params['limit'] = 1;
$result = self::selectPosts($fields, $condition, $params);
if (is_bool($result)) {
return $result;
} else {
$row = self::fetch($result);
DBA::close($result);
return $row;
}
}
/**
* Retrieve a single record from the post-thread-user-view view and returns it in an associative array
* *
* @param array $fields * @param array $fields
* @param array $condition * @param array $condition
@ -210,7 +254,7 @@ class Post
} }
/** /**
* Select rows from the post table and returns them as an array * Select rows from the post-user-view view and returns them as an array
* *
* @param array $selected Array of selected fields, empty for all * @param array $selected Array of selected fields, empty for all
* @param array $condition Array of fields for condition * @param array $condition Array of fields for condition
@ -263,23 +307,37 @@ class Post
} }
/** /**
* Select rows from the post table * Select rows from the post-user-view view
* *
* @param array $selected Array of selected fields, empty for all * @param array $selected Array of selected fields, empty for all
* @param array $condition Array of fields for condition * @param array $condition Array of fields for condition
* @param array $params Array of several parameters * @param array $params Array of several parameters
* @param bool $user_mode true = post-user-view, false = post-view
* *
* @return boolean|object * @return boolean|object
* @throws \Exception * @throws \Exception
*/ */
public static function select(array $selected = [], array $condition = [], $params = [], bool $user_mode = true) public static function select(array $selected = [], array $condition = [], $params = [])
{ {
return self::selectView($user_mode ? 'post-user-view' : 'post-view', $selected, $condition, $params); return self::selectView('post-user-view', $selected, $condition, $params);
} }
/** /**
* Select rows from the post table * Select rows from the post-view view
*
* @param array $selected Array of selected fields, empty for all
* @param array $condition Array of fields for condition
* @param array $params Array of several parameters
*
* @return boolean|object
* @throws \Exception
*/
public static function selectPosts(array $selected = [], array $condition = [], $params = [])
{
return self::selectView('post-view', $selected, $condition, $params);
}
/**
* Select rows from the post-thread-user-view view
* *
* @param array $selected Array of selected fields, empty for all * @param array $selected Array of selected fields, empty for all
* @param array $condition Array of fields for condition * @param array $condition Array of fields for condition
@ -336,24 +394,39 @@ class Post
} }
/** /**
* Select rows from the post view for a given user * Select rows from the post-user-view view for a given user
* *
* @param integer $uid User ID * @param integer $uid User ID
* @param array $selected Array of selected fields, empty for all * @param array $selected Array of selected fields, empty for all
* @param array $condition Array of fields for condition * @param array $condition Array of fields for condition
* @param array $params Array of several parameters * @param array $params Array of several parameters
* @param bool $user_mode true = post-user-view, false = post-view
* *
* @return boolean|object * @return boolean|object
* @throws \Exception * @throws \Exception
*/ */
public static function selectForUser($uid, array $selected = [], array $condition = [], $params = [], bool $user_mode = true) public static function selectForUser($uid, array $selected = [], array $condition = [], $params = [])
{ {
return self::selectViewForUser($user_mode ? 'post-user-view' : 'post-view', $uid, $selected, $condition, $params); return self::selectViewForUser('post-user-view', $uid, $selected, $condition, $params);
} }
/** /**
* Select rows from the post view for a given user * Select rows from the post-view view for a given user
*
* @param integer $uid User ID
* @param array $selected Array of selected fields, empty for all
* @param array $condition Array of fields for condition
* @param array $params Array of several parameters
*
* @return boolean|object
* @throws \Exception
*/
public static function selectPostsForUser($uid, array $selected = [], array $condition = [], $params = [])
{
return self::selectViewForUser('post-view', $uid, $selected, $condition, $params);
}
/**
* Select rows from the post-thread-user-view view for a given user
* *
* @param integer $uid User ID * @param integer $uid User ID
* @param array $selected Array of selected fields, empty for all * @param array $selected Array of selected fields, empty for all
@ -369,7 +442,7 @@ class Post
} }
/** /**
* Retrieve a single record from the post view for a given user and returns it in an associative array * Retrieve a single record from the post-user-view view for a given user and returns it in an associative array
* *
* @param integer $uid User ID * @param integer $uid User ID
* @param array $selected * @param array $selected
@ -395,7 +468,7 @@ class Post
} }
/** /**
* Select pinned rows from the item table for a given user * Select pinned rows from the post-thread-user table for a given user
* *
* @param integer $uid User ID * @param integer $uid User ID
* @param array $selected Array of selected fields, empty for all * @param array $selected Array of selected fields, empty for all

2
src/Module/Api/Mastodon/Statuses/FavouritedBy.php
View File

@ -49,7 +49,7 @@ class FavouritedBy extends BaseApi
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();
} }
$activities = Post::select(['author-id'], ['thr-parent-id' => $id, 'gravity' => GRAVITY_ACTIVITY, 'verb' => Activity::LIKE], [], false); $activities = Post::selectPosts(['author-id'], ['thr-parent-id' => $id, 'gravity' => GRAVITY_ACTIVITY, 'verb' => Activity::LIKE]);
$accounts = []; $accounts = [];

2
src/Module/Api/Mastodon/Statuses/RebloggedBy.php
View File

@ -49,7 +49,7 @@ class RebloggedBy extends BaseApi
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();
} }
$activities = Post::select(['author-id'], ['thr-parent-id' => $id, 'gravity' => GRAVITY_ACTIVITY, 'verb' => Activity::ANNOUNCE], [], false); $activities = Post::selectPosts(['author-id'], ['thr-parent-id' => $id, 'gravity' => GRAVITY_ACTIVITY, 'verb' => Activity::ANNOUNCE]);
$accounts = []; $accounts = [];

2
src/Module/Api/Mastodon/Timelines/PublicTimeline.php
View File

@ -95,7 +95,7 @@ class PublicTimeline extends BaseApi
["NOT EXISTS (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `parent-author-id` AND (`blocked` OR `ignored`))", $uid]); ["NOT EXISTS (SELECT `cid` FROM `user-contact` WHERE `uid` = ? AND `cid` = `parent-author-id` AND (`blocked` OR `ignored`))", $uid]);
} }
$items = Post::selectForUser($uid, ['uri-id'], $condition, $params, false); $items = Post::selectPostsForUser($uid, ['uri-id'], $condition, $params);
$statuses = []; $statuses = [];
while ($item = Post::fetch($items)) { while ($item = Post::fetch($items)) {