mirror
/
social
kopia lustrzana https://github.com/nextcloud/social
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

add icon to actor 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/1663/head
Maxence Lange 2023-03-15 19:06:31 -01:00
rodzic 3b2e834dc3
commit 9ae0c19dfa
3 zmienionych plików z 38 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
lib/Db/CacheActorsRequestBuilder.php
Wyświetl plik

@ -58,9 +58,9 @@ class CacheActorsRequestBuilder extends CoreRequestBuilder {
/** /**
* Base of the Sql Update request * Base of the Sql Update request
* *
* @return IQueryBuilder * @return SocialQueryBuilder
*/ */
protected function getCacheActorsUpdateSql(): IQueryBuilder { protected function getCacheActorsUpdateSql(): SocialQueryBuilder {
$qb = $this->getQueryBuilder(); $qb = $this->getQueryBuilder();
$qb->update(self::TABLE_CACHE_ACTORS); $qb->update(self::TABLE_CACHE_ACTORS);

2
lib/Db/SocialCrossQueryBuilder.php
Wyświetl plik

@ -170,8 +170,6 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder {
} }
$expr = $this->expr(); $expr = $this->expr();
$func = $this->func();
$pf = (($alias === '') ? $this->getDefaultSelectAlias() : $alias); $pf = (($alias === '') ? $this->getDefaultSelectAlias() : $alias);
$this->selectAlias('cd.id', 'cachedocument_id') $this->selectAlias('cd.id', 'cachedocument_id')
->selectAlias('cd.type', 'cachedocument_type') ->selectAlias('cd.type', 'cachedocument_type')

55
lib/Model/ActivityPub/Actor/Person.php
Wyświetl plik

@ -697,6 +697,12 @@ class Person extends ACore implements IQueryRow, JsonSerializable {
->setFeatured($this->validate(self::AS_URL, 'featured', $data, '')) ->setFeatured($this->validate(self::AS_URL, 'featured', $data, ''))
->setDetailsAll($this->getArray('details', $data, [])); ->setDetailsAll($this->getArray('details', $data, []));
if ($this->hasIcon()) {
$this->setAvatar($this->getIcon()->getUrl());
} else {
$this->setAvatar($this->getAvatar());
}
try { try {
$cTime = new DateTime($this->get('creation', $data, 'yesterday')); $cTime = new DateTime($this->get('creation', $data, 'yesterday'));
$this->setCreation($cTime->getTimestamp()); $this->setCreation($cTime->getTimestamp());
@ -722,27 +728,38 @@ class Person extends ACore implements IQueryRow, JsonSerializable {
* @return array * @return array
*/ */
public function exportAsActivityPub(): array { public function exportAsActivityPub(): array {
$data = [
'aliases' => [
$this->getUrlSocial() . '@' . $this->getPreferredUsername(),
$this->getUrlSocial() . 'users/' . $this->getPreferredUsername()
],
'preferredUsername' => $this->getPreferredUsername(),
'name' => $this->getName(),
'inbox' => $this->getInbox(),
'outbox' => $this->getOutbox(),
'account' => $this->getAccount(),
'following' => $this->getFollowing(),
'followers' => $this->getFollowers(),
'endpoints' => ['sharedInbox' => $this->getSharedInbox()],
'publicKey' => [
'id' => $this->getId() . '#main-key',
'owner' => $this->getId(),
'publicKeyPem' => $this->getPublicKey()
]
];
if ($this->hasIcon()) {
$icon = $this->getIcon();
$data['icon'] = [
'type' => $icon->getType(),
'mediaType' => $icon->getMediaType(),
'url' => $icon->getUrl()
];
}
$result = array_merge( $result = array_merge(
parent::exportAsActivityPub(), parent::exportAsActivityPub(),
[ $data
'aliases' => [
$this->getUrlSocial() . '@' . $this->getPreferredUsername(),
$this->getUrlSocial() . 'users/' . $this->getPreferredUsername()
],
'preferredUsername' => $this->getPreferredUsername(),
'name' => $this->getName(),
'inbox' => $this->getInbox(),
'outbox' => $this->getOutbox(),
'account' => $this->getAccount(),
'following' => $this->getFollowing(),
'followers' => $this->getFollowers(),
'endpoints' => ['sharedInbox' => $this->getSharedInbox()],
'publicKey' => [
'id' => $this->getId() . '#main-key',
'owner' => $this->getId(),
'publicKeyPem' => $this->getPublicKey()
]
]
); );
if ($this->isCompleteDetails()) { if ($this->isCompleteDetails()) {