Skip to content

fix: add null checks and correct API method for activity plugin #1781

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
endavis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: add null checks and correct API method for activity plugin #1781

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
22 changes: 18 additions & 4 deletions source/plugins/activity/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ export default async function({login, data, rest, q, account, imports}, {enabled
try {
for (let page = 1; page <= pages; page++) {
console.debug(`metrics/compute/${login}/plugins > activity > loading page ${page}/${pages}`)
events.push(...(context.mode === "repository" ? await rest.activity.listRepoEvents({owner: context.owner, repo: context.repo}) : await rest.activity.listEventsForAuthenticatedUser({username: login, per_page: 100, page})).data)
events.push(...(context.mode === "repository" ? await rest.activity.listRepoEvents({owner: context.owner, repo: context.repo, per_page: 100, page}) : await rest.activity.listPublicEventsForUser({username: login, per_page: 100, page})).data)
}
}
catch {
console.debug(`metrics/compute/${login}/plugins > activity > no more page to load`)
catch (error) {
console.debug(`metrics/compute/${login}/plugins > activity > no more page to load (${error.message})`)
}
console.debug(`metrics/compute/${login}/plugins > activity > ${events.length} events loaded`)

Expand All @@ -53,6 +53,8 @@ export default async function({login, data, rest, q, account, imports}, {enabled
case "CommitCommentEvent": {
if (!["created"].includes(payload.action))
return null
if (!payload.comment?.user)
return null
const {comment: {user: {login: user}, commit_id: sha, body: content}} = payload
if (!imports.filters.text(user, ignored))
return null
Expand Down Expand Up @@ -82,6 +84,8 @@ export default async function({login, data, rest, q, account, imports}, {enabled
case "IssueCommentEvent": {
if (!["created"].includes(payload.action))
return null
if (!payload.issue?.user)
return null
const {issue: {user: {login: user}, title, number}, comment: {body: content, performed_via_github_app: mobile}} = payload
if (!imports.filters.text(user, ignored))
return null
Expand All @@ -91,6 +95,8 @@ export default async function({login, data, rest, q, account, imports}, {enabled
case "IssuesEvent": {
if (!["opened", "closed", "reopened"].includes(payload.action))
return null
if (!payload.issue?.user)
return null
const {action, issue: {user: {login: user}, title, number, body: content}} = payload
if (!imports.filters.text(user, ignored))
return null
Expand All @@ -113,13 +119,17 @@ export default async function({login, data, rest, q, account, imports}, {enabled
case "PullRequestEvent": {
if (!["opened", "closed"].includes(payload.action))
return null
if (!payload.pull_request?.user)
return null
const {action, pull_request: {user: {login: user}, title, number, body: content, additions: added, deletions: deleted, changed_files: changed, merged}} = payload
if (!imports.filters.text(user, ignored))
return null
return {type: "pr", actor, timestamp, repo, action: (action === "closed") && (merged) ? "merged" : action, user, title, number, content: await imports.markdown(content, {mode: markdown, codelines}), lines: {added, deleted}, files: {changed}}
}
//Reviewed a pull request
case "PullRequestReviewEvent": {
if (!payload.pull_request?.user)
return null
const {review: {state: review}, pull_request: {user: {login: user}, number, title}} = payload
if (!imports.filters.text(user, ignored))
return null
Expand All @@ -129,6 +139,8 @@ export default async function({login, data, rest, q, account, imports}, {enabled
case "PullRequestReviewCommentEvent": {
if (!["created"].includes(payload.action))
return null
if (!payload.pull_request?.user)
return null
const {pull_request: {user: {login: user}, title, number}, comment: {body: content, performed_via_github_app: mobile}} = payload
if (!imports.filters.text(user, ignored))
return null
Expand All @@ -137,7 +149,9 @@ export default async function({login, data, rest, q, account, imports}, {enabled
//Pushed commits
case "PushEvent": {
let {size, commits, ref} = payload
commits = commits.filter(({author: {email}}) => imports.filters.text(email, ignored))
if (!commits || !Array.isArray(commits))
return null
commits = commits.filter(commit => commit?.author?.email).filter(({author: {email}}) => imports.filters.text(email, ignored))
if (!commits.length)
return null
if (commits.slice(-1).pop()?.message.startsWith("Merge branch "))
Expand Down
Loading