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

manage notification on unboost/unlike 

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
pull/531/head
Maxence Lange 2019-07-03 14:46:09 -01:00
rodzic 9d27b85c88
commit dce161e62e
7 zmienionych plików z 220 dodań i 38 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
lib/Db/ActionsRequest.php
Wyświetl plik

@ -34,7 +34,7 @@ namespace OCA\Social\Db;
use daita\MySmallPhpTools\Traits\TArrayTools;
use DateTime;
use Exception;
use OCA\Social\Exceptions\LikeDoesNotExistException;
use OCA\Social\Exceptions\ActionDoesNotExistException;
use OCA\Social\Model\ActivityPub\ACore;
use OCA\Social\Model\ActivityPub\Object\Like;
use OCP\DB\QueryBuilder\IQueryBuilder;
@ -84,7 +84,7 @@ class ActionsRequest extends ActionsRequestBuilder {
* @param string $type
*
* @return ACore
* @throws LikeDoesNotExistException
* @throws ActionDoesNotExistException
*/
public function getAction(string $actorId, string $objectId, string $type): ACore {
$qb = $this->getActionsSelectSql();
@ -96,7 +96,7 @@ class ActionsRequest extends ActionsRequestBuilder {
$data = $cursor->fetch();
$cursor->closeCursor();
if ($data === false) {
throw new LikeDoesNotExistException();
throw new ActionDoesNotExistException();
}
return $this->parseActionsSelectSql($data);
@ -144,11 +144,11 @@ class ActionsRequest extends ActionsRequestBuilder {
/**
* @param Like $like
* @param ACore $item
*/
public function delete(Like $like) {
public function delete(ACore $item) {
$qb = $this->getActionsDeleteSql();
$this->limitToIdString($qb, $like->getId());
$this->limitToIdString($qb, $item->getId());
$qb->execute();
}

2
lib/Exceptions/LikeDoesNotExistException.php → lib/Exceptions/ActionDoesNotExistException.php
Wyświetl plik

@ -34,7 +34,7 @@ namespace OCA\Social\Exceptions;
use Exception;
class LikeDoesNotExistException extends Exception {
class ActionDoesNotExistException extends Exception {
}

3
lib/Interfaces/Internal/SocialAppNotificationInterface.php
Wyświetl plik

@ -36,6 +36,7 @@ use OCA\Social\Exceptions\ItemNotFoundException;
use OCA\Social\Interfaces\IActivityPubInterface;
use OCA\Social\Model\ActivityPub\ACore;
use OCA\Social\Model\ActivityPub\Internal\SocialAppNotification;
use OCA\Social\Model\ActivityPub\Stream;
use OCA\Social\Service\ConfigService;
use OCA\Social\Service\CurlService;
use OCA\Social\Service\MiscService;
@ -144,6 +145,8 @@ class SocialAppNotificationInterface implements IActivityPubInterface {
* @param ACore $item
*/
public function delete(ACore $item) {
/** @var Stream $item */
$this->streamRequest->deleteStreamById($item->getId(), SocialAppNotification::TYPE);
}

81
lib/Interfaces/Object/AnnounceInterface.php
Wyświetl plik

@ -38,6 +38,7 @@ use Exception;
use OCA\Social\AP;
use OCA\Social\Db\ActionsRequest;
use OCA\Social\Db\StreamRequest;
use OCA\Social\Exceptions\ActionDoesNotExistException;
use OCA\Social\Exceptions\InvalidOriginException;
use OCA\Social\Exceptions\InvalidResourceException;
use OCA\Social\Exceptions\ItemNotFoundException;
@ -116,7 +117,7 @@ class AnnounceInterface implements IActivityPubInterface {
/**
* @param ACore $activity
* @param ACore $item
* @param ACore $announce
*
* @throws InvalidOriginException
* @throws InvalidResourceException
@ -129,12 +130,14 @@ class AnnounceInterface implements IActivityPubInterface {
* @throws RequestServerException
* @throws UnauthorizedFediverseException
*/
public function activity(Acore $activity, ACore $item) {
$item->checkOrigin($activity->getId());
public function activity(Acore $activity, ACore $announce) {
/** @var Announce $announce */
if ($activity->getType() === Undo::TYPE) {
$item->checkOrigin($item->getId());
$this->delete($item);
$activity->checkOrigin($announce->getId());
$activity->checkOrigin($announce->getActorId());
$this->undoAnnounceAction($announce);
$this->delete($announce);
}
}
@ -202,7 +205,7 @@ class AnnounceInterface implements IActivityPubInterface {
}
$this->updateDetails($post);
$this->updateNotification($post, $actor);
$this->generateNotification($post, $actor);
} catch (StreamNotFoundException $e) {
$objectId = $item->getObjectId();
$item->addCacheItem($objectId);
@ -292,7 +295,7 @@ class AnnounceInterface implements IActivityPubInterface {
$post = $this->streamRequest->getStreamById($item->getObjectId());
$this->updateDetails($post);
$this->updateNotification($post, $actor);
$this->generateNotification($post, $actor);
} catch (Exception $e) {
}
@ -301,6 +304,33 @@ class AnnounceInterface implements IActivityPubInterface {
}
/**
* @param Announce $announce
*/
private function undoAnnounceAction(Announce $announce) {
try {
$this->actionsRequest->getAction(
$announce->getActorId(), $announce->getObjectId(), Announce::TYPE
);
$this->actionsRequest->delete($announce);
} catch (ActionDoesNotExistException $e) {
}
try {
if ($announce->hasActor()) {
$actor = $announce->getActor();
} else {
$actor = $this->cacheActorService->getFromId($announce->getActorId());
}
$post = $this->streamRequest->getStreamById($announce->getObjectId());
$this->updateDetails($post);
$this->cancelNotification($post, $actor);
} catch (Exception $e) {
}
}
/**
* @param Stream $post
*/
@ -323,7 +353,7 @@ class AnnounceInterface implements IActivityPubInterface {
* @throws ItemUnknownException
* @throws SocialAppConfigException
*/
private function updateNotification(Stream $post, Person $author) {
private function generateNotification(Stream $post, Person $author) {
if (!$post->isLocal()) {
return;
}
@ -358,5 +388,38 @@ class AnnounceInterface implements IActivityPubInterface {
}
}
/**
* @param Stream $post
* @param Person $author
*
* @throws ItemUnknownException
* @throws SocialAppConfigException
*/
private function cancelNotification(Stream $post, Person $author) {
if (!$post->isLocal()) {
return;
}
/** @var SocialAppNotificationInterface $notificationInterface */
$notificationInterface =
AP::$activityPub->getInterfaceFromType(SocialAppNotification::TYPE);
try {
$notification = $this->streamRequest->getStreamByObjectId(
$post->getId(), SocialAppNotification::TYPE, Announce::TYPE
);
$notification->removeDetail('accounts', $author->getAccount());
if (empty($notification->getDetails('accounts'))) {
$notificationInterface->delete($notification);
} else {
$notificationInterface->update($notification);
}
} catch (StreamNotFoundException $e) {
}
}
}

93
lib/Interfaces/Object/LikeInterface.php
Wyświetl plik

@ -38,7 +38,7 @@ use OCA\Social\Db\StreamRequest;
use OCA\Social\Exceptions\InvalidOriginException;
use OCA\Social\Exceptions\ItemNotFoundException;
use OCA\Social\Exceptions\ItemUnknownException;
use OCA\Social\Exceptions\LikeDoesNotExistException;
use OCA\Social\Exceptions\ActionDoesNotExistException;
use OCA\Social\Exceptions\SocialAppConfigException;
use OCA\Social\Exceptions\StreamNotFoundException;
use OCA\Social\Interfaces\IActivityPubInterface;
@ -103,7 +103,7 @@ class LikeInterface implements IActivityPubInterface {
try {
$this->actionsRequest->getAction($like->getActorId(), $like->getObjectId(), Like::TYPE);
} catch (LikeDoesNotExistException $e) {
} catch (ActionDoesNotExistException $e) {
$this->actionsRequest->save($like);
try {
@ -113,20 +113,32 @@ class LikeInterface implements IActivityPubInterface {
$actor = $this->cacheActorService->getFromId($like->getActorId());
}
try {
$post = $this->streamRequest->getStreamById($like->getObjectId());
$this->updateDetails($post);
$this->generateNotification($post, $actor);
} catch (StreamNotFoundException $e) {
return; // should not happens.
}
$post = $this->streamRequest->getStreamById($like->getObjectId());
$this->updateDetails($post);
$this->generateNotification($post, $actor);
} catch (Exception $e) {
}
}
}
/**
* @param ACore $activity
* @param ACore $like
*
* @throws InvalidOriginException
*/
public function activity(ACore $activity, ACore $like) {
/** @var Like $like */
if ($activity->getType() === Undo::TYPE) {
$activity->checkOrigin($like->getId());
$activity->checkOrigin($like->getActorId());
$this->undoLike($like);
}
}
/**
* @param ACore $item
*/
@ -175,17 +187,26 @@ class LikeInterface implements IActivityPubInterface {
/**
* @param ACore $activity
* @param ACore $item
*
* @throws InvalidOriginException
* @param Like $like
*/
public function activity(ACore $activity, ACore $item) {
/** @var Like $item */
if ($activity->getType() === Undo::TYPE) {
$activity->checkOrigin($item->getId());
$activity->checkOrigin($item->getActorId());
$this->actionsRequest->delete($item);
private function undoLike(Like $like) {
try {
$this->actionsRequest->getAction($like->getActorId(), $like->getObjectId(), Like::TYPE);
$this->actionsRequest->delete($like);
} catch (ActionDoesNotExistException $e) {
}
try {
if ($like->hasActor()) {
$actor = $like->getActor();
} else {
$actor = $this->cacheActorService->getFromId($like->getActorId());
}
$post = $this->streamRequest->getStreamById($like->getObjectId());
$this->updateDetails($post);
$this->cancelNotification($post, $actor);
} catch (Exception $e) {
}
}
@ -247,5 +268,37 @@ class LikeInterface implements IActivityPubInterface {
$notificationInterface->save($notification);
}
}
/**
* @param Stream $post
* @param Person $author
*
* @throws ItemUnknownException
* @throws SocialAppConfigException
*/
private function cancelNotification(Stream $post, Person $author) {
if (!$post->isLocal()) {
return;
}
/** @var SocialAppNotificationInterface $notificationInterface */
$notificationInterface =
AP::$activityPub->getInterfaceFromType(SocialAppNotification::TYPE);
try {
$notification = $this->streamRequest->getStreamByObjectId(
$post->getId(), SocialAppNotification::TYPE, Like::TYPE
);
$notification->removeDetail('accounts', $author->getAccount());
if (empty($notification->getDetails('accounts'))) {
$notificationInterface->delete($notification);
} else {
$notificationInterface->update($notification);
}
} catch (StreamNotFoundException $e) {
}
}
}

63
lib/Traits/TDetails.php
Wyświetl plik

@ -59,6 +59,7 @@ trait TDetails {
$this->details = $details;
}
/**
* @param string $detail
* @param string $value
@ -100,6 +101,20 @@ trait TDetails {
}
/**
* @param string $detail
*
* @return array
*/
public function getDetails(string $detail): array {
if (!array_key_exists($detail, $this->details) || !is_array($this->details[$detail])) {
return [];
}
return $this->details[$detail];
}
/**
* @param string $detail
* @param string $value
@ -149,5 +164,53 @@ trait TDetails {
}
/**
* @param string $detail
* @param string $value
*/
public function removeDetail(string $detail, string $value) {
if (!array_key_exists($detail, $this->details) || !is_array($this->details[$detail])) {
return;
}
$this->details[$detail] = array_diff($this->details[$detail], [$value]);
}
/**
* @param string $detail
* @param int $value
*/
public function removeDetailInt(string $detail, int $value) {
if (!array_key_exists($detail, $this->details) || !is_array($this->details[$detail])) {
return;
}
$this->details[$detail] = array_diff($this->details, [$value]);
}
/**
* @param string $detail
* @param array $value
*/
public function removeDetailArray(string $detail, array $value) {
if (!array_key_exists($detail, $this->details) || !is_array($this->details[$detail])) {
return;
}
$this->details[$detail] = array_diff($this->details, [$value]);
}
/**
* @param string $detail
* @param bool $value
*/
public function removeDetailBool(string $detail, bool $value) {
if (!array_key_exists($detail, $this->details) || !is_array($this->details[$detail])) {
return;
}
$this->details[$detail] = array_diff($this->details, [$value]);
}
}

4
src/components/TimelineEntry.vue
Wyświetl plik

@ -59,10 +59,10 @@ export default {
return t('social', 'boosted')
},
actionSummary() {
let summary
let summary = this.item.summary
for (var key in this.item.details) {
let keyword = '{' + key + '}'
summary = this.item.summary.replace(keyword, JSON.stringify(this.item.details[key]))
summary = summary.replace(keyword, JSON.stringify(this.item.details[key]))
}
return summary
}