Merge pull request #977 from nextcloud/fix/noid/dm-on-unknown-recipient

fix mention based on content
nextcloud · Aug 22, 2020 · f876c25 · f876c25
2 parents 2194c11 + 0da568f
commit f876c25
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 10 deletions.
diff --git a/lib/Model/ActivityPub/Item.php b/lib/Model/ActivityPub/Item.php
@@ -411,7 +411,9 @@ public function getToAll(): array {
  * @return Item
  */
  public function addToArray(string $to): Item {
- $this->toArray[] = $to;
+ if (!in_array($to, $this->toArray)) {
+ $this->toArray[] = $to;
+ }
 
  return $this;
  }

diff --git a/lib/Model/ActivityPub/Object/Note.php b/lib/Model/ActivityPub/Object/Note.php
@@ -113,7 +113,7 @@ public function fillHashtags() {
  if (substr($hashtag, 0, 1) === '#') {
  $hashtag = substr($hashtag, 1);
  }
- $hashtags[] = $hashtag;
+ $hashtags[] = trim($hashtag);
  }
 
  $this->setHashtags($hashtags);

diff --git a/lib/Model/Post.php b/lib/Model/Post.php
@@ -94,7 +94,8 @@ public function getActor(): Person {
  * @return Post
  */
  public function addTo(string $to): Post {
- if ($to !== '') {
+ $to = trim($to);
+ if ($to !== '' && !in_array($to, $this->to)) {
  $this->to[] = $to;
  }
 
@@ -175,6 +176,14 @@ public function setHashtags(array $hashtags): Post {
  return $this;
  }
 
+ public function addHashtag(string $hashtag): Post {
+ $hashtag = trim($hashtag);
+ if ($hashtag !== '' && !in_array($hashtag, $this->hashtags)) {
+ $this->hashtags[] = $hashtag;
+ }
+
+ return $this;
+ }
 
  /**
  * @return string[]

diff --git a/lib/Service/PostService.php b/lib/Service/PostService.php
@@ -31,18 +31,18 @@
 
 
 use daita\MySmallPhpTools\Exceptions\MalformedArrayException;
+use daita\MySmallPhpTools\Exceptions\RequestContentException;
+use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
+use daita\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
+use daita\MySmallPhpTools\Exceptions\RequestResultSizeException;
+use daita\MySmallPhpTools\Exceptions\RequestServerException;
 use Exception;
 use OCA\Social\AP;
 use OCA\Social\Exceptions\CacheContentMimeTypeException;
 use OCA\Social\Exceptions\InvalidOriginException;
 use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\RedundancyLimitException;
-use daita\MySmallPhpTools\Exceptions\RequestContentException;
-use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
-use daita\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
-use daita\MySmallPhpTools\Exceptions\RequestResultSizeException;
-use daita\MySmallPhpTools\Exceptions\RequestServerException;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Exceptions\StreamNotFoundException;
 use OCA\Social\Exceptions\UnauthorizedFediverseException;
@@ -119,6 +119,8 @@ public function __construct(
  * @throws UnauthorizedFediverseException
  */
  public function createPost(Post $post, &$token = ''): ACore {
+ $this->fixRecipientAndHashtags($post);
+
  $note = new Note();
  $actor = $post->getActor();
  $this->streamService->assignItem($note, $actor, $post->getType());
@@ -192,5 +194,22 @@ private function generateDocumentFromAttachment(Note $note, string $attachment):
  }
 
 
+ /**
+ * @param Post $post
+ */
+ public function fixRecipientAndHashtags(Post $post) {
+ preg_match_all('/(?!\b)@([^\s]+)/', $post->getContent(), $matchesTo);
+ preg_match_all('/(?!\b)#([^\s]+)/', $post->getContent(), $matchesHash);
+
+ foreach ($matchesTo[1] as $to) {
+ $post->addTo($to);
+ }
+
+ foreach ($matchesHash[1] as $hash) {
+ $post->addHashtag($hash);
+ }
+
+ }
+
 }
 
diff --git a/lib/Service/StreamService.php b/lib/Service/StreamService.php
@@ -242,7 +242,7 @@ public function addRecipient(Stream $stream, string $type, string $account) {
  }
 
  try {
- $actor = $this->cacheActorService->getFromAccount($account);
+ $actor = $this->cacheActorService->getFromAccount($account, true);
  } catch (Exception $e) {
  return;
  }
@@ -253,7 +253,7 @@ public function addRecipient(Stream $stream, string $type, string $account) {
  if ($type === Stream::TYPE_DIRECT) {
  $instancePath->setPriority(InstancePath::PRIORITY_HIGH);
  $stream->addToArray($actor->getId());
- $stream->setFilterDuplicate(true);
+ $stream->setFilterDuplicate(true); // TODO: really needed ?
  } else {
  $stream->addCc($actor->getId());
  }