Add expiration event for shares

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

apps/files_sharing/lib/Activity/Providers/Groups.php

@@ -35,9 +35,12 @@ class Groups extends Base {
 
  const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
  const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
+
  const SUBJECT_UNSHARED_GROUP_SELF = 'unshared_group_self';
  const SUBJECT_UNSHARED_GROUP_BY = 'unshared_group_by';
 
+ const SUBJECT_EXPIRED_GROUP = 'expired_group_by';
+
  /** @var IGroupManager */
  protected $groupManager;
 
@@ -73,6 +76,8 @@ public function parseShortVersion(IEvent $event) {
  $subject = $this->l->t('{actor} shared with group {group}');
  } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
  $subject = $this->l->t('{actor} removed share for group {group}');
+ } else if ($event->getSubject() === self::SUBJECT_EXPIRED_GROUP) {
+ $subject = $this->l->t('Share for group {group} expired');
  } else {
  throw new \InvalidArgumentException();
  }
@@ -104,6 +109,8 @@ public function parseLongVersion(IEvent $event) {
  $subject = $this->l->t('{actor} shared {file} with group {group}');
  } else if ($event->getSubject() === self::SUBJECT_UNSHARED_GROUP_BY) {
  $subject = $this->l->t('{actor} removed group {group} from {file}');
+ } else if ($event->getSubject() === self::SUBJECT_EXPIRED_GROUP) {
+ $subject = $this->l->t('Shared file {file} with group {group} expired');
  } else {
  throw new \InvalidArgumentException();
  }
@@ -132,6 +139,8 @@ protected function getParsedParameters(IEvent $event) {
  ];
  case self::SUBJECT_SHARED_GROUP_SELF:
  case self::SUBJECT_UNSHARED_GROUP_SELF:
+ case self::SUBJECT_UNSHARED_GROUP_BY:
+ case self::SUBJECT_EXPIRED_GROUP:
  return [
  'file' => $this->getFile($parameters[0], $event),
  'group' => $this->generateGroupParameter($parameters[1]),

apps/files_sharing/lib/Activity/Providers/Users.php

@@ -38,6 +38,9 @@ class Users extends Base {
  const SUBJECT_SELF_UNSHARED = 'self_unshared';
  const SUBJECT_SELF_UNSHARED_BY = 'self_unshared_by';
 
+ const SUBJECT_EXPIRED_USER = 'expired_user_by';
+ const SUBJECT_EXPIRED_BY = 'expired_by';
+
  /**
  * @param IEvent $event
  * @return IEvent
@@ -63,7 +66,10 @@ public function parseShortVersion(IEvent $event) {
  $subject = $this->l->t('Shared by {actor}');
  } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
  $subject = $this->l->t('{actor} removed share');
-
+ } else if ($event->getSubject() === self::SUBJECT_EXPIRED_USER) {
+ $subject = $this->l->t('Share for {user} expired');
+ } else if ($event->getSubject() === self::SUBJECT_EXPIRED_BY) {
+ $subject = $this->l->t('Share expired');
  } else {
  throw new \InvalidArgumentException();
  }
@@ -103,6 +109,10 @@ public function parseLongVersion(IEvent $event) {
  $subject = $this->l->t('{actor} shared {file} with you');
  } else if ($event->getSubject() === self::SUBJECT_UNSHARED_BY) {
  $subject = $this->l->t('{actor} removed you from the share named {file}');
+ } else if ($event->getSubject() === self::SUBJECT_EXPIRED_USER) {
+ $subject = $this->l->t('Shared file {file} with {user} expired');
+ } else if ($event->getSubject() === self::SUBJECT_EXPIRED_BY) {
+ $subject = $this->l->t('Shared file {file} expired');
 
  } else {
  throw new \InvalidArgumentException();
@@ -125,6 +135,8 @@ protected function getParsedParameters(IEvent $event) {
  switch ($subject) {
  case self::SUBJECT_SHARED_USER_SELF:
  case self::SUBJECT_UNSHARED_USER_SELF:
+ case self::SUBJECT_EXPIRED_USER:
+ case self::SUBJECT_EXPIRED_BY:
  return [
  'file' => $this->getFile($parameters[0], $event),
  'user' => $this->getUser($parameters[1]),

lib/private/Share20/Manager.php

@@ -1313,8 +1313,7 @@ public function getShareByToken($token) {
  }
 
  protected function checkExpireDate($share) {
- if ($share->getExpirationDate() !== null &&
- $share->getExpirationDate() <= new \DateTime()) {
+ if ($share->isExpired()) {
  $this->deleteShare($share);
  throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
  }

lib/private/Share20/Share.php

@@ -368,6 +368,14 @@ public function getExpirationDate() {
  return $this->expireDate;
  }
 
+ /**
+ * @inheritdoc
+ */
+ public function isExpired() {
+ return $this->getExpirationDate() !== null &&
+ $this->getExpirationDate() <= new \DateTime();
+ }
+
  /**
  * @inheritdoc
  */

lib/public/Share/IShare.php

@@ -257,6 +257,14 @@ public function setExpirationDate($expireDate);
  */
  public function getExpirationDate();
 
+ /**
+ * Is the share expired ?
+ *
+ * @return boolean
+ * @since 18.0.0
+ */
+ public function isExpired();
+
  /**
  * set a label for a share, some shares, e.g. public links can have a label
  *