Skip to content

Fix Parsing error in activities when user request to join a circle #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Apr 9, 2020
Merged

Fix Parsing error in activities when user request to join a circle #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix Parsing error in activities when user request to join a circle 
Fix #243

Signed-off-by: Tortue Torche <[email protected]>
  • Loading branch information
@tortuetorche
tortuetorche committed Apr 9, 2020
commit 13218f7fdde585a2d466d22a1785a318cc618d6c
2 changes: 1 addition & 1 deletion lib/Activity/ProviderParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
13 changes: 13 additions & 0 deletions lib/Model/BaseMember.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
}