Merge pull request #393 from tortuetorche/patch-fix-activities

Fix Parsing error in activities when user request to join a circle
nextcloud · Apr 9, 2020 · e1167c8 · e1167c8
2 parents 902a706 + 13218f7
commit e1167c8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/Activity/ProviderParser.php b/lib/Activity/ProviderParser.php
@@ -299,7 +299,7 @@ protected function generateViewerParameter(Circle $circle) {
 	 */
 	protected function generateExternalMemberParameter(Member $member) {
 		return [
-			'type'    => 'user',
+			'type'    => $member->getTypeName(),
 			'id'      => $member->getUserId(),
 			'name'    => $member->getDisplayName() . ' (' . $member->getTypeString() . ')',
 			'_parsed' => $member->getDisplayName()

diff --git a/lib/Model/BaseMember.php b/lib/Model/BaseMember.php
@@ -439,4 +439,17 @@ public function getTypeString() {
 
 		return 'none';
 	}
+
+	public function getTypeName() {
+		switch ($this->getType()) {
+			case self::TYPE_USER:
+			case self::TYPE_MAIL:
+			case self::TYPE_CONTACT:
+				return 'user';
+			case self::TYPE_GROUP:
+				return 'user-group';
+		}
+
+		return 'none';
+	}
 }