Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Prefill some metadata for report abuse link in review comments #2074

Merged
merged 3 commits into from
Apr 17, 2019
Merged

Prefill some metadata for report abuse link in review comments #2074

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bdaca9
When reporting a comment, fill in some info for the user via query st…
vanessayuenn Apr 15, 2019
0051b99
clean up and standardize the author checks throughout the file
vanessayuenn Apr 16, 2019
f858cc5
missed one
vanessayuenn Apr 16, 2019
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
19 changes: 11 additions & 8 deletions lib/views/reviews-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,15 +260,15 @@ export default class ReviewsView extends React.Component {
return null;
}

const reviewAuthor = review.author ? review.author.login : '';
const reviewAuthor = {avatarUrl: '', login: '', ...review.author};
return (
<div className="github-ReviewSummary" key={review.id}>
<header className="github-ReviewSummary-header">
<span className={`github-ReviewSummary-icon icon ${icon}`} />
<img className="github-ReviewSummary-avatar"
src={review.author ? review.author.avatarUrl : ''} alt={reviewAuthor}
src={reviewAuthor.avatarUrl} alt={reviewAuthor.login}
/>
<a className="github-ReviewSummary-username" href={`https://github.com/${reviewAuthor}`}>{reviewAuthor}</a>
<a className="github-ReviewSummary-username" href={`https://github.com/${reviewAuthor.login}`}>{reviewAuthor.login}</a>
<span className="github-ReviewSummary-type">{copy}</span>
{this.renderEditedLink(review)}
<Timeago className="github-ReviewSummary-timeAgo" time={review.submittedAt} displayStyle="short" />
Expand Down Expand Up @@ -370,6 +370,8 @@ export default class ReviewsView extends React.Component {
}
};

const rootCommentAuthor = {avatarUrl: '', login: '', ...rootComment.author};

return (
<details
ref={threadHolder.setter}
Expand All @@ -383,7 +385,7 @@ export default class ReviewsView extends React.Component {
<span className="github-Review-file">{dir ? path.sep : ''}{base}</span>
<span className="github-Review-lineNr">{positionText}</span>
<img className="github-Review-referenceAvatar"
src={rootComment.author ? rootComment.author.avatarUrl : ''} alt={rootComment.author.login}
src={rootCommentAuthor.avatarUrl} alt={rootCommentAuthor.login}
/>
<Timeago className="github-Review-referenceTimeAgo" time={rootComment.createdAt} displayStyle="short" />
</summary>
Expand Down Expand Up @@ -519,15 +521,16 @@ export default class ReviewsView extends React.Component {
}

const commentClass = cx('github-Review-comment', {'github-Review-comment--pending': comment.state === 'PENDING'});
const commentAuthor = {avatarUrl: '', login: '', ...comment.author};
return (
<div className={commentClass} key={comment.id}>
<header className="github-Review-header">
<div className="github-Review-header-authorData">
<img className="github-Review-avatar"
src={comment.author ? comment.author.avatarUrl : ''} alt={comment.author.login}
src={commentAuthor.avatarUrl} alt={commentAuthor.login}
/>
<a className="github-Review-username" href={`https://github.com/${comment.author.login}`}>
{comment.author.login}
<a className="github-Review-username" href={`https://github.com/${commentAuthor.login}`}>
{commentAuthor.login}
</a>
<a className="github-Review-timeAgo" href={comment.url}>
<Timeago displayStyle="long" time={comment.createdAt} />
Expand All @@ -537,7 +540,7 @@ export default class ReviewsView extends React.Component {
<span className="github-Review-pendingBadge badge badge-warning">pending</span>
)}
</div>
<a className="github-Review-reportAbuseLink" title="report abuse" href="https://github.com/contact/report-content">
<a className="github-Review-reportAbuseLink" title="report abuse" href={`https://github.com/contact/report-content?report=${commentAuthor.login}&content_url=${encodeURIComponent(comment.url)}`}>
<Octicon icon="alert" />
</a>
</header>
Expand Down