Some minor leftover tweaks

Remove some unused code & imports, use a new `sameUser` utility to
compare usernames, fix a big.

Author: elibarzilay

src/compute-pr-actions.ts

@@ -1,8 +1,8 @@
 import * as Comments from "./comments";
 import { PrInfo, BotError, BotEnsureRemovedFromProject, BotNoPackages } from "./pr-info";
 import { CIResult } from "./util/CIResult";
-import { PackageInfo, ReviewInfo } from "./pr-info";
-import { noNulls, flatten, unique } from "./util/util";
+import { ReviewInfo } from "./pr-info";
+import { noNulls, flatten, unique, sameUser } from "./util/util";
 
 type ColumnName =
     | "Needs Maintainer Action"
@@ -142,12 +142,12 @@ interface ExtendedPrInfo extends PrInfo {
 }
 function extendPrInfo(info: PrInfo): ExtendedPrInfo {
     const reviewLink = uriForReview.replace(/{}/, ""+info.pr_number);
-    const authorIsOwner = info.pkgInfo.every(p => p.owners && p.owners.map(o => o.toLowerCase()).includes(info.author.toLowerCase()));
+    const authorIsOwner = info.pkgInfo.every(p => p.owners && p.owners.some(o => sameUser(o, info.author)));
     const editsInfra = info.pkgInfo.some(p => p.name === null);
     const editsConfig = info.pkgInfo.some(p => p.files.some(f => f.kind === "package-meta"));
     const allOwners = unique(flatten(info.pkgInfo.map(p => p.owners || [])));
-    const otherOwners = allOwners.filter(o => info.author.toLowerCase() !== o.toLowerCase());
-    const noOtherOwners = !allOwners.some(o => o.toLowerCase() !== info.author.toLowerCase());
+    const otherOwners = allOwners.filter(o => !sameUser(o, info.author));
+    const noOtherOwners = !allOwners.some(o => !sameUser(o, info.author));
     const tooManyOwners = allOwners.length > 50;
     const packages = noNulls(info.pkgInfo.map(p => p.name));
     const hasMultiplePackages = packages.length > 1;

src/pr-info.ts

@@ -16,7 +16,7 @@ import { getMonthlyDownloadCount } from "./util/npm";
 import { client } from "./graphql-client";
 import { ApolloQueryResult } from "apollo-boost";
 import { fetchFile as defaultFetchFile } from "./util/fetchFile";
-import { noNulls, notUndefined, findLast, forEachReverse, daysSince, authorNotBot, latestDate, earliestDate
+import { noNulls, notUndefined, findLast, forEachReverse, daysSince, sameUser, authorNotBot, latestDate, earliestDate
        } from "./util/util";
 import * as HeaderParser from "definitelytyped-header-parser";
 import * as jsonDiff from "fast-json-patch";
@@ -211,7 +211,7 @@ export async function deriveStateForPR(
     const lastBlessing = getLastMaintainerBlessingDate(prInfo.timelineItems);
     const reopenedDate = getReopenedDate(prInfo.timelineItems);
     const now = getNow().toISOString();
-    const reviews = getReviews(prInfo, isOwner);
+    const reviews = getReviews(prInfo);
     const latestReview = latestDate(...reviews.map(r => r.date));
     const firstApprovalDate = earliestDate(...reviews.map(r => r.type === "approved" ? r.date : undefined));
     const stalenessInDays = daysSince(latestDate(createdDate, lastPushDate, lastCommentDate, lastBlessing, reopenedDate, latestReview) || lastPushDate, now);
@@ -253,10 +253,6 @@ export async function deriveStateForPR(
     function botNoPackages(pr_number: number): BotNoPackages {
         return { type: "no_packages", pr_number };
     }
-
-    function isOwner(login: string) {
-        return pkgInfo.some(p => p.owners?.some(k => k.toLowerCase() === login.toLowerCase()));
-    }
 }
 
 type ReopenedEvent = PR_repository_pullRequest_timelineItems_nodes_ReopenedEvent;
@@ -436,7 +432,7 @@ function usersSayReadyToMerge(comments: PR_repository_pullRequest_comments_nodes
         && (new Date(comment.createdAt)).getTime() > sinceDate.getTime());
 }
 
-function getReviews(prInfo: PR_repository_pullRequest, isOwner: (name: string) => boolean) {
+function getReviews(prInfo: PR_repository_pullRequest) {
     if (!prInfo.reviews?.nodes) return [];
     const headCommitOid: string = prInfo.headRefOid;
     const reviews: ReviewInfo[] = [];
@@ -448,7 +444,7 @@ function getReviews(prInfo: PR_repository_pullRequest, isOwner: (name: string) =
         // Skip self-reviews
         if (reviewer === prInfo.author!.login) continue;
         // Only look at the most recent review per person (ignoring pending/commented)
-        if (reviews.find(r => r.reviewer.toLowerCase() === reviewer.toLowerCase())) continue;
+        if (reviews.find(r => sameUser(r.reviewer, reviewer))) continue;
         // collect reviews by type
         if (r.commit.oid !== headCommitOid) {
             reviews.push({ type: "stale", reviewer, date, abbrOid: r.commit.abbreviatedOid });

src/util/util.ts

@@ -64,6 +64,10 @@ export function daysSince(date: Date, now: Date | string): number {
     return Math.floor(moment(now).diff(moment(date), "days"));
 }
 
+export function sameUser(u1: string, u2: string) {
+    return u1.toLowerCase() === u2.toLowerCase();
+}
+
 export function authorNotBot(node: { login: string } | { author?: { login: string } | null} | { actor?: { login: string } | null}): boolean {
     return ("author" in node && node.author!.login !== "typescript-bot")
         || ("actor" in node && node.actor!.login !== "typescript-bot")