Skip to content

Show user avatars in comments #7910

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

Open
mod242 wants to merge 3 commits into
base: main
Choose a base branch
from
+21 −5
Open

Show user avatars in comments #7910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c3cbbd
Add authorPictureUrl to CommentPost schema
mod242 Jan 23, 2026
693dab7
Resolve authorPictureUrl for comment list and single
mod242 Jan 23, 2026
0fdcc78
Render comment avatars with fallback to initials
mod242 Jan 23, 2026
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
10 changes: 8 additions & 2 deletions client/components/comments.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
)
template(v-slot:icon)
v-avatar(color='blue-grey')
//- v-img(src='http://i.pravatar.cc/64')
span.white--text.title {{cm.initials}}
v-img(v-if='cm.pictureUrl', :src='cm.pictureUrl')
span.white--text.title(v-else) {{cm.initials}}
v-card.elevation-1
v-card-text
.comments-post-actions(v-if='permissions.manage && !isBusy && commentEditId === 0')
Expand Down Expand Up @@ -182,7 +182,9 @@ export default {
list(locale: $locale, path: $path) {
id
render
authorId
authorName
authorPictureUrl
createdAt
updatedAt
}
Expand All @@ -201,6 +203,10 @@ export default {
if (nameParts.length > 1) {
initials += _.last(nameParts).charAt(0)
}
const pictureUrl = (c.authorPictureUrl === 'internal')
? `/_userav/${c.authorId}`
: c.authorPictureUrl
c.pictureUrl = pictureUrl
c.initials = initials
return c
})
Expand Down
15 changes: 12 additions & 3 deletions server/graph/resolvers/comment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,19 @@ module.exports = {
})
if (page) {
if (WIKI.auth.checkAccess(context.req.user, ['read:comments'], { tags: page.tags, ...args })) {
const comments = await WIKI.models.comments.query().where('pageId', page.id).orderBy('createdAt')
const comments = await WIKI.models.comments.query()
.where('pageId', page.id)
.withGraphJoined('author')
.modifyGraph('author', builder => {
builder.select('id', 'pictureUrl')
})
.orderBy('createdAt')
return comments.map(c => ({
...c,
authorName: c.name,
authorEmail: c.email,
authorIP: c.ip
authorIP: c.ip,
authorPictureUrl: _.get(c, 'author.pictureUrl', '')
}))
} else {
throw new WIKI.Error.CommentViewForbidden()
Expand All @@ -69,6 +76,7 @@ module.exports = {
if (!cm || !cm.pageId) {
throw new WIKI.Error.CommentNotFound()
}
const author = await WIKI.models.users.query().select('pictureUrl').findById(cm.authorId)
const page = await WIKI.models.pages.query().select('localeCode', 'path').findById(cm.pageId)
.withGraphJoined('tags')
.modifyGraph('tags', builder => {
Expand All @@ -84,7 +92,8 @@ module.exports = {
...cm,
authorName: cm.name,
authorEmail: cm.email,
authorIP: cm.ip
authorIP: cm.ip,
authorPictureUrl: _.get(author, 'pictureUrl', '')
}
} else {
throw new WIKI.Error.CommentViewForbidden()
Expand Down
1 change: 1 addition & 0 deletions server/graph/schemas/comment.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ type CommentPost {
render: String!
authorId: Int!
authorName: String!
authorPictureUrl: String
authorEmail: String! @auth(requires: ["manage:system"])
authorIP: String! @auth(requires: ["manage:system"])
createdAt: Date!
Expand Down