Skip to content

Commit

Permalink
Merge pull request #1744 from nextcloud/bugfix/noid/fix-federated-users
Browse files Browse the repository at this point in the history
fix(stream): Don't render avatar for federated users
  • Loading branch information
nickvergessen authored Aug 1, 2024
2 parents 24665d2 + f1f5c81 commit 290e43f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion js/Activity.chunk.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/Activity.chunk.mjs.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/vendor.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ version: 2.1.0
license: GPL-3.0-or-later

@nextcloud/l10n
version: 2.2.0
version: 3.1.0
license: GPL-3.0-or-later

@nextcloud/logger
Expand Down
11 changes: 11 additions & 0 deletions src/utils/richObjects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ export function mapRichObjectToRichArgument(richObject: IRichObject) {
props: richObject,
}
case 'user':
if (richObject.server) {
return {
component: NcUserBubble,
props: {
avatarImage: 'icon-user',
displayName: richObject.name,
user: richObject.id,
url: richObject.link,
},
}
}
return {
component: NcUserBubble,
props: { displayName: richObject.name, user: richObject.id, url: richObject.link },
Expand Down

0 comments on commit 290e43f

Please sign in to comment.