kopia lustrzana https://github.com/nextcloud/social
small fixes
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>pull/1573/head
rodzic
e019eb10cc
commit
1e05ef508d
|
@ -194,9 +194,8 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
|
||||||
*/
|
*/
|
||||||
public function getFromLocalAccount(string $account): Person {
|
public function getFromLocalAccount(string $account): Person {
|
||||||
$qb = $this->getCacheActorsSelectSql();
|
$qb = $this->getCacheActorsSelectSql();
|
||||||
$this->limitToPreferredUsername($qb, $account);
|
$qb->limitToPreferredUsername($account);
|
||||||
$this->limitToLocal($qb, true);
|
$qb->limitToLocal(true);
|
||||||
/** @var SocialQueryBuilder $qb */
|
|
||||||
$qb->leftJoinCacheDocuments('icon_id');
|
$qb->leftJoinCacheDocuments('icon_id');
|
||||||
$this->leftJoinDetails($qb);
|
$this->leftJoinDetails($qb);
|
||||||
|
|
||||||
|
|
|
@ -664,7 +664,7 @@ class Person extends ACore implements IQueryRow, JsonSerializable {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$deletedValue = $this->get('deleted', $data);
|
$deletedValue = $this->get('deleted', $data);
|
||||||
if ($deletedValue === '') {
|
if ($deletedValue === '' || $deletedValue === '0000-00-00 00:00:00') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$dTime = new DateTime();
|
$dTime = new DateTime();
|
||||||
|
|
|
@ -325,7 +325,7 @@ class AccountService {
|
||||||
/**
|
/**
|
||||||
* @param Person $actor
|
* @param Person $actor
|
||||||
*/
|
*/
|
||||||
public function addLocalActorDetailCount(Person &$actor) {
|
public function addLocalActorDetailCount(Person $actor) {
|
||||||
$lastPostCreation = '';
|
$lastPostCreation = '';
|
||||||
try {
|
try {
|
||||||
$lastPost = $this->streamRequest->lastNoteFromActorId($actor->getId());
|
$lastPost = $this->streamRequest->lastNoteFromActorId($actor->getId());
|
||||||
|
|
Ładowanie…
Reference in New Issue