precise attributes and move logic

Signed-off-by: dartcafe <[email protected]>
nextcloud · Aug 12, 2023 · bd51f23 · bd51f23
1 parent c189300
commit bd51f23
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/lib/Event/BaseEvent.php b/lib/Event/BaseEvent.php
@@ -35,7 +35,7 @@
 use OCP\IUserSession;
 
 abstract class BaseEvent extends Event {
-	protected ?string $activityObject = null;
+	protected ?string $activityObjectType = null;
 	protected ?string $eventId = null;
 	protected array $activitySubjectParams = [];
 	protected bool $log = true;
@@ -98,18 +98,18 @@ public function getNotification(): array {
 		return [];
 	}
 
-	public function getActivityObject(): ?string {
-		return $this->activityObject;
+	public function getActivityObjectType(): ?string {
+		return $this->activityObjectType;
 	}
 
 	public function getActivityObjectId(): int {
-		if ($this->activityObject === 'poll') {
+		if ($this->activityObjectType === 'poll') {
 			return $this->eventObject->getPollId();
 		}
 		return $this->eventObject->getId();
 	}
 
-	public function getActivitySubject(): ?string {
+	public function getActivityType(): ?string {
 		return $this->eventId;
 	}
 

diff --git a/lib/Listener/BaseListener.php b/lib/Listener/BaseListener.php
@@ -170,7 +170,7 @@ protected function addActivity() : void {
 		if (!($this->event instanceof BaseEvent)) {
 			return;
 		}
-		if ($this->event->getActivitySubject() && $this->event->getActivityObject()) {
+		if ($this->event->getActivityType() && $this->event->getActivityObjectType()) {
 			$activityEvent = $this->activityService->createActivityEvent($this->event);
 			$this->activityService->publishActivityEvent($activityEvent, $this->event->getActor());
 			if ($this->event->getActor() !== $this->event->getPollOwner()) {

diff --git a/lib/Provider/ActivityProvider.php b/lib/Provider/ActivityProvider.php
@@ -37,7 +37,6 @@
 use OCP\L10N\IFactory;
 
 class ActivityProvider implements IProvider {
-	// protected IL10N $l10n;
 
 	public function __construct(
 		protected ActivityManager $activityManager,

diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php
@@ -57,10 +57,10 @@ public function __construct(
 	public function createActivityEvent(BaseEvent $event): ActivityEvent {
 		$activityEvent = $this->activityManager->generateEvent();
 		$activityEvent->setApp('polls')
-			->setType($event->getActivitySubject())
+			->setType($event->getActivityType())
 			->setAuthor($event->getActor())
-			->setObject($event->getActivityObject(), $event->getActivityObjectId())
-			->setSubject($event->getActivitySubject(), $event->getActivitySubjectParams())
+			->setObject($event->getActivityObjectType(), $event->getActivityObjectId())
+			->setSubject($event->getActivityType(), $event->getActivitySubjectParams())
 			->setTimestamp(time());
 		return $activityEvent;
 	}
@@ -176,7 +176,6 @@ private function getMatchedMessages(): array {
 				self::FIRST_PERSON_FILTERED => $this->l10n->t('You have reordered the options'),
 				self::THIRD_PERSON_FILTERED => $this->l10n->t('{actor} has reordered the options'),
 			],
-
 			ShareEvent::CHANGE_EMAIL => [
 				self::FIRST_PERSON_FULL => $this->l10n->t('You have changed your email address'),
 				self::THIRD_PERSON_FULL => $this->l10n->t('{sharee} has changed the email address'),