Skip to content

Commit c427d09

Browse files
0x40070x4007
committed
fix: import paths in files
1 parent 9151881 commit c427d09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+168
-104
lines changed

Diff for: ‎.eslintrc

+17-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,23 @@
3434
{ "selector": "interface", "format": ["PascalCase"], "custom": { "regex": "^I[A-Z]", "match": false } },
3535
{ "selector": ["function", "variable"], "format": ["camelCase"] },
3636
{ "selector": "variable", "modifiers": ["destructured"], "format": null },
37-
{ "selector": "variable", "format": ["camelCase"], "leadingUnderscore": "allow", "trailingUnderscore": "allow" }
37+
{ "selector": "variable", "format": ["camelCase"], "leadingUnderscore": "allow", "trailingUnderscore": "allow" },
38+
39+
{
40+
"selector": "parameter",
41+
"format": ["camelCase"],
42+
"leadingUnderscore": "allow", // This allows the use of a leading underscore
43+
"trailingUnderscore": "allow" // This allows the use of a trailing underscore
44+
},
45+
{
46+
"selector": "parameter",
47+
"format": null,
48+
"filter": {
49+
// This allows parameters to be named as just an underscore
50+
"regex": "^_$",
51+
"match": true
52+
}
53+
}
3854
]
3955
}
4056
}

Diff for: ‎src/adapters/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import { Settlement } from "./supabase/helpers/tables/settlement";
77
import { Super } from "./supabase/helpers/tables/super";
88
import { User } from "./supabase/helpers/tables/user";
99
import { Wallet } from "./supabase/helpers/tables/wallet";
10-
import { Database } from "./supabase/types";
10+
1111
import { env } from "../bindings/env";
12+
import { Database } from "./supabase/types/database";
1213

1314
export const supabaseClient = createClient<Database>(env.SUPABASE_URL, env.SUPABASE_KEY, {
1415
auth: { persistSession: false },

Diff for: ‎src/adapters/supabase/helpers/tables/label.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { SupabaseClient } from "@supabase/supabase-js";
22
import { Repository } from "../../../../types/payload";
3-
import { Database } from "../../types";
4-
import { Super } from "./super";
3+
54
import Runtime from "../../../../bindings/bot-runtime";
5+
import { Super } from "./super";
6+
import { Database } from "../../types/database";
67

78
type LabelRow = Database["public"]["Tables"]["labels"]["Row"];
89

Diff for: ‎src/adapters/supabase/helpers/tables/logs.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { SupabaseClient } from "@supabase/supabase-js";
77
import { execSync } from "child_process";
88
import { Context as ProbotContext } from "probot";
99
import Runtime from "../../../../bindings/bot-runtime";
10-
import { Database } from "../../types";
10+
import { Database } from "../../types/database";
11+
1112
import { LogLevel, PrettyLogs } from "../pretty-logs";
1213

1314
type LogFunction = (message: string, metadata?: any) => void;

Diff for: ‎src/adapters/supabase/helpers/tables/wallet.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import dotenv from "dotenv";
22
dotenv.config();
33

44
import { createAdapters } from "../../..";
5-
import { User } from "../../../../types";
5+
import { User } from "../../../../types/payload";
66
const SUPABASE_URL = process.env.SUPABASE_URL;
77
if (!SUPABASE_URL) throw new Error("SUPABASE_URL is not defined");
88
const SUPABASE_KEY = process.env.SUPABASE_KEY;

Diff for: ‎src/adapters/supabase/helpers/tables/wallet.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { PostgrestError, SupabaseClient } from "@supabase/supabase-js";
22
import { Context as ProbotContext } from "probot";
33
import Runtime from "../../../../bindings/bot-runtime";
4-
import { User } from "../../../../types";
4+
import { User } from "../../../../types/payload";
5+
56
import { Database } from "../../types/database";
67
import { Super } from "./super";
78
import { UserRow } from "./user";

Diff for: ‎src/bindings/event.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { processors, wildcardProcessors } from "../handlers/processors";
77
import { validateConfigChange } from "../handlers/push";
88
import structuredMetadata from "../handlers/shared/structured-metadata";
99
import { addCommentToIssue, shouldSkip } from "../helpers";
10-
import { BotConfig } from "../types";
10+
import { BotConfig } from "../types/configuration-types";
11+
1112
import { Context } from "../types/context";
1213
import {
1314
HandlerReturnValuesNoVoid,

Diff for: ‎src/handlers/access/labels-access.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Runtime from "../../bindings/bot-runtime";
2-
import { addCommentToIssue, isUserAdminOrBillingManager, removeLabel, addLabelToIssue } from "../../helpers";
3-
import { Context, UserType } from "../../types";
2+
import { addCommentToIssue, addLabelToIssue, isUserAdminOrBillingManager, removeLabel } from "../../helpers";
3+
import { Context } from "../../types/context";
4+
import { UserType } from "../../types/payload";
45

56
export async function labelAccessPermissionsCheck(context: Context) {
67
const runtime = Runtime.getState();

Diff for: ‎src/handlers/assign/action.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { calculateDurations, calculateLabelValue, closePullRequest } from "../../helpers";
22
import { getLinkedPullRequests } from "../../helpers/parser";
3-
import { Context, Label, Payload } from "../../types";
3+
import { Context } from "../../types/context";
4+
import { Label } from "../../types/label";
5+
import { Payload } from "../../types/payload";
46

57
export async function startCommandHandler(context: Context) {
68
const config = context.config;

Diff for: ‎src/handlers/assign/auto.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { addAssignees, getAllPullRequests, getIssueByNumber, getPullByNumber } from "../../helpers";
22
import { getLinkedIssues } from "../../helpers/parser";
3-
import { Context } from "../../types";
3+
import { Context } from "../../types/context";
44

55
// Check for pull requests linked to their respective issues but not assigned to them
66
export async function checkPullRequests(context: Context) {

Diff for: ‎src/handlers/comment/action.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
import { Comment, Payload, Context } from "../../types";
1+
import { Context } from "../../types/context";
22
import { commentParser, userCommands } from "./handlers";
33
import { verifyFirstCommentInRepository } from "./handlers/first";
4+
import { Payload } from "../../types/payload";
5+
import { Comment } from "../../types/payload";
46

57
export async function commentCreatedOrEdited(context: Context) {
68
const config = context.config,

Diff for: ‎src/handlers/comment/handlers/ask.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import { Context, Payload, StreamlinedComment, UserType } from "../../../types";
2-
import { getAllIssueComments, getAllLinkedIssuesAndPullsInBody } from "../../../helpers";
31
import { CreateChatCompletionRequestMessage } from "openai/resources/chat";
2+
import { getAllIssueComments, getAllLinkedIssuesAndPullsInBody } from "../../../helpers";
43
import { askGPT, decideContextGPT, sysMsg } from "../../../helpers/gpt";
4+
import { Context } from "../../../types/context";
5+
import { StreamlinedComment } from "../../../types/openai";
6+
import { Payload, UserType } from "../../../types/payload";
57

68
export async function ask(context: Context, body: string) {
79
// The question to ask

Diff for: ‎src/handlers/comment/handlers/assign/check-task-stale.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Issue } from "../../../../types";
1+
import { Issue } from "../../../../types/payload";
22

33
export function checkTaskStale(staleTask: number, issue: Issue) {
44
let days: number | undefined;

Diff for: ‎src/handlers/comment/handlers/assign/generate-assignment-comment.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Runtime from "../../../../bindings/bot-runtime";
2-
import { Context, Payload } from "../../../../types";
2+
import { Context } from "../../../../types/context";
3+
import { Payload } from "../../../../types/payload";
34

45
const options: Intl.DateTimeFormatOptions = {
56
weekday: "short",

Diff for: ‎src/handlers/comment/handlers/assign/get-multiplier-info-to-display.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Issue, Context } from "../../../../types";
1+
import { Context } from "../../../../types/context";
2+
import { Issue } from "../../../../types/payload";
23
import { taskPaymentMetaData } from "../../../wildcard";
34
import { getUserMultiplier } from "./get-user-multiplier";
45

Diff for: ‎src/handlers/comment/handlers/assign/get-time-labels-assigned.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { BotConfig, Context, Label, Payload } from "../../../../types";
1+
import { BotConfig } from "../../../../types/configuration-types";
2+
import { Context } from "../../../../types/context";
3+
import { Label } from "../../../../types/label";
4+
import { Payload } from "../../../../types/payload";
25

36
export function getTimeLabelsAssigned(context: Context, payload: Payload, config: BotConfig) {
47
const logger = context.logger;

Diff for: ‎src/handlers/comment/handlers/assign/index.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import {
44
getAssignedIssues,
55
getAvailableOpenedPullRequests,
66
} from "../../../../helpers";
7-
import { Context, IssueType, Payload, User } from "../../../../types";
7+
import { Context } from "../../../../types/context";
8+
import { User, IssueType, Payload } from "../../../../types/payload";
9+
810
import { isParentIssue } from "../../../pricing";
911
import structuredMetadata from "../../../shared/structured-metadata";
1012
import { assignTableComment } from "../table";
@@ -24,7 +26,7 @@ export async function assign(context: Context, body: string) {
2426
disabledCommands,
2527
} = context.config;
2628

27-
const isStartDisabled = disabledCommands.some((command) => command === "start");
29+
const isStartDisabled = disabledCommands.some((command: string) => command === "start");
2830

2931
logger.info("Received '/start' command", { sender: payload.sender.login, body });
3032

Diff for: ‎src/handlers/comment/handlers/authorize.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Runtime from "../../../bindings/bot-runtime";
22
import { isUserAdminOrBillingManager } from "../../../helpers";
3-
import { Context, Payload } from "../../../types";
3+
import { Context } from "../../../types/context";
4+
import { Payload } from "../../../types/payload";
5+
46
import { taskPaymentMetaData } from "../../wildcard";
57

68
export async function authorizeLabelChanges(context: Context) {

Diff for: ‎src/handlers/comment/handlers/first.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Context, Payload } from "../../../types";
1+
import { Context } from "../../../types/context";
2+
import { Payload } from "../../../types/payload";
23
import { generateHelpMenu } from "./help";
34

45
export async function verifyFirstCommentInRepository(context: Context) {

Diff for: ‎src/handlers/comment/handlers/help.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { userCommands } from ".";
2-
import { Context } from "../../../types";
2+
import { Context } from "../../../types/context";
33

44
export async function listAvailableCommands(context: Context, body: string) {
55
const logger = context.logger;

Diff for: ‎src/handlers/comment/handlers/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { UserCommands } from "../../../types";
21
import { assign } from "./assign";
32
import { listAvailableCommands } from "./help";
43
// Commented out until Gnosis Safe is integrated (https://github.com/ubiquity/ubiquibot/issues/353)
@@ -13,6 +12,7 @@ import { registerWallet } from "./wallet";
1312

1413
import { autoPay } from "./payout";
1514
import { query } from "./query";
15+
import { UserCommands } from "../../../types/handlers";
1616

1717
export * from "./ask";
1818
export * from "./assign";

Diff for: ‎src/handlers/comment/handlers/issue/assignee-scoring.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Decimal from "decimal.js";
22
import { Issue, User } from "../../../../types/payload";
33
import { ContributorView } from "./contribution-style-types";
44
import { UserScoreDetails } from "./issue-shared-types";
5-
import { Context } from "../../../../types";
5+
import { Context } from "../../../../types/context";
66

77
export async function assigneeScoring(
88
context: Context,

Diff for: ‎src/handlers/comment/handlers/issue/calculate-quality-score.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import OpenAI from "openai";
2-
import { Context } from "../../../../types";
2+
import { Context } from "../../../../types/context";
33
import { Comment, Issue, User, UserType } from "../../../../types/payload";
44
import { countTokensOfConversation, estimateOptimalModel, gptRelevance, relevanceScoring } from "./relevance-scoring";
55

Diff for: ‎src/handlers/comment/handlers/issue/comment-scoring-rubric.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import MarkdownIt from "markdown-it";
66
import { Comment } from "../../../../types/payload";
77
import { ContributorClassesKeys } from "./contribution-style-types";
88
import { FormatScoreConfig, FormatScoreConfigParams } from "./element-score-config";
9-
import { Context } from "../../../../types";
9+
import { Context } from "../../../../types/context";
1010

1111
export type Tags = keyof HTMLElementTagNameMap;
1212

Diff for: ‎src/handlers/comment/handlers/issue/generate-permit-2-signature.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import { MaxUint256, PERMIT2_ADDRESS, PermitTransferFrom, SignatureTransfer } fr
22
import Decimal from "decimal.js";
33
import { BigNumber, ethers } from "ethers";
44
import { keccak256, toUtf8Bytes } from "ethers/lib/utils";
5-
import { Context } from "../../../../types";
5+
66
import { getPayoutConfigByNetworkId } from "../../../../helpers";
77
import { decryptKeys } from "../../../../utils/private";
8+
import { Context } from "../../../../types/context";
89

910
export async function generatePermit2Signature(
1011
context: Context,

Diff for: ‎src/handlers/comment/handlers/issue/generate-permits.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import { stringify } from "yaml";
44
import Runtime from "../../../../bindings/bot-runtime";
55
import { getPayoutConfigByNetworkId } from "../../../../helpers";
66
import { getTokenSymbol } from "../../../../helpers/contracts";
7-
import { Context, Issue, Payload } from "../../../../types";
7+
import { Context } from "../../../../types/context";
8+
import { Issue, Payload } from "../../../../types/payload";
9+
810
import structuredMetadata from "../../../shared/structured-metadata";
911
import { generatePermit2Signature } from "./generate-permit-2-signature";
1012
import { UserScoreTotals } from "./issue-shared-types";

Diff for: ‎src/handlers/comment/handlers/issue/get-collaborator-ids-for-repo.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Context, Payload, User } from "../../../../types";
1+
import { Context } from "../../../../types/context";
2+
import { Payload, User } from "../../../../types/payload";
23

34
export async function getCollaboratorsForRepo(context: Context): Promise<User[]> {
45
const payload = context.event.payload as Payload;

Diff for: ‎src/handlers/comment/handlers/issue/getPullRequestComments.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { getAllIssueComments } from "../../../../helpers";
22
import { getLinkedPullRequests } from "../../../../helpers/parser";
3-
import { Context } from "../../../../types";
3+
import { Context } from "../../../../types/context";
4+
45
import { Comment } from "../../../../types/payload";
56

67
export async function getPullRequestComments(context: Context, owner: string, repository: string, issueNumber: number) {

Diff for: ‎src/handlers/comment/handlers/issue/identify-user-ids.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Context } from "../../../../types";
1+
import { Context } from "../../../../types/context";
22
import { Comment, Issue, User } from "../../../../types/payload";
33
import { ContributorClasses } from "./contribution-style-types";
44
import { getCollaboratorsForRepo } from "./get-collaborator-ids-for-repo";

Diff for: ‎src/handlers/comment/handlers/issue/issue-closed.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Runtime from "../../../../bindings/bot-runtime";
22
import { checkUserPermissionForRepoAndOrg, getAllIssueComments } from "../../../../helpers";
3-
import { Context } from "../../../../types";
3+
import { Context } from "../../../../types/context";
4+
45
import { Comment, Issue, Payload, StateReason } from "../../../../types/payload";
56
import structuredMetadata from "../../../shared/structured-metadata";
67
import { generatePermits } from "./generate-permits";

Diff for: ‎src/handlers/comment/handlers/issue/perUserCommentScoring.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Context } from "../../../../types";
1+
import { Context } from "../../../../types/context";
22
import { Comment, User } from "../../../../types/payload";
33
import { CommentScoring } from "./comment-scoring-rubric";
44

Diff for: ‎src/handlers/comment/handlers/issue/relevance-scoring.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import Decimal from "decimal.js";
22
import { encodingForModel } from "js-tiktoken";
33
import OpenAI from "openai";
4-
import { Context } from "../../../../types";
4+
import { Context } from "../../../../types/context";
5+
56
import { Comment, Issue } from "../../../../types/payload";
67

78
export async function relevanceScoring(context: Context, issue: Issue, contributorComments: Comment[]) {
@@ -145,7 +146,7 @@ function filterSamples(context: Context, batchResults: number[][], correctLength
145146

146147
function averageSamples(batchResults: (number | Decimal)[][], precision: number) {
147148
const averageScores = batchResults[0]
148-
.map((x, columnIndex) => {
149+
.map((_, columnIndex) => {
149150
let sum = new Decimal(0);
150151
batchResults.forEach((row) => {
151152
sum = sum.plus(row[columnIndex]);

Diff for: ‎src/handlers/comment/handlers/issue/specification-scoring.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import Decimal from "decimal.js";
22

3-
import { Context } from "../../../../types";
43
import { Comment, Issue } from "../../../../types/payload";
54
import { allCommentScoring } from "./allCommentScoring";
65
import { UserScoreDetails } from "./issue-shared-types";
76
import { addRelevanceAndFormatScoring } from "./relevance-format-scoring";
87

98
// import Runtime from "../../../../bindings/bot-runtime";
109
import { ContributorView } from "./contribution-style-types";
10+
import { Context } from "../../../../types/context";
1111

1212
export type ContextIssue = { context: Context; issue: Issue };
1313

Diff for: ‎src/handlers/comment/handlers/labels.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Runtime from "../../../bindings/bot-runtime";
22
import { isUserAdminOrBillingManager } from "../../../helpers";
3-
import { Context, Payload } from "../../../types";
3+
import { Context } from "../../../types/context";
4+
import { Payload } from "../../../types/payload";
45

56
export async function setLabels(context: Context, body: string) {
67
const logger = context.logger;

Diff for: ‎src/handlers/comment/handlers/multiplier.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Runtime from "../../../bindings/bot-runtime";
22
import { isUserAdminOrBillingManager } from "../../../helpers";
3-
import { Context, Payload } from "../../../types";
3+
import { Context } from "../../../types/context";
4+
import { Payload } from "../../../types/payload";
5+
46
/**
57
* You can use this command to set a multiplier for a user.
68
* It will accept arguments in any order.

Diff for: ‎src/handlers/comment/handlers/payout.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { Context, Payload } from "../../../types";
21
import { isUserAdminOrBillingManager } from "../../../helpers/issue";
2+
import { Context } from "../../../types/context";
3+
import { Payload } from "../../../types/payload";
34

45
export async function autoPay(context: Context, body: string) {
56
const payload = context.event.payload as Payload;

Diff for: ‎src/handlers/comment/handlers/query.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Runtime from "../../../bindings/bot-runtime";
2-
import { Context, Payload } from "../../../types";
2+
33
import _ from "lodash";
4+
import { Context } from "../../../types/context";
5+
import { Payload } from "../../../types/payload";
46

57
export async function query(context: Context, body: string) {
68
const runtime = Runtime.getState(),

Diff for: ‎src/handlers/comment/handlers/unassign.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { Context, Payload } from "../../../types";
21
import { closePullRequestForAnIssue } from "../../assign/index";
2+
import { Payload } from "../../../types/payload";
3+
import { Context } from "../../../types/context";
34

45
export async function unassign(context: Context, body: string) {
56
const logger = context.logger;

Diff for: ‎src/handlers/comment/handlers/wallet.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { constants, ethers } from "ethers";
22
import Runtime from "../../../bindings/bot-runtime";
33
import { resolveAddress } from "../../../helpers";
4-
import { Context, Payload } from "../../../types";
4+
import { Context } from "../../../types/context";
5+
import { Payload } from "../../../types/payload";
6+
57
// Extracts ensname from raw text.
68
function extractEnsName(text: string) {
79
// Define a regular expression to match ENS names

0 commit comments

Comments
 (0)