lint

Half-Shot · Half-Shot · commit 4ad5adea4c03 · 2024-11-28T14:23:28.000Z
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ public/
 
 # Generated during test run
 /spec-lib
+/hookshot-int-*
 
 book
 *.cer
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -6,7 +6,7 @@ import chai from "eslint-plugin-chai-expect";
 
 export default [
     {
-        ignores: ["lib/**/*", "contrib/**/*"],
+        ignores: ["lib/**/*", "spec-lib/**/*", "contrib/**/*"],
     },
     ...tseslint.config(
         {
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "start:matrixsender": "node --require source-map-support/register lib/App/MatrixSenderApp.js",
     "start:resetcrypto": "node --require source-map-support/register lib/App/ResetCryptoStore.js",
     "test": "mocha -r ts-node/register tests/init.ts 'tests/*.ts'  'tests/**/*.ts'",
-    "test:e2e": "tsc --p tsconfig.spec.json && yarn node --experimental-vm-modules $(yarn bin jest)",
+    "test:e2e": "tsc --p tsconfig.spec.json && cp ./lib/libRs.js ./lib/matrix-hookshot-rs.node ./spec-lib/src  && yarn node --experimental-vm-modules $(yarn bin jest)",
     "test:cover": "nyc --reporter=lcov --reporter=text yarn test",
     "lint": "yarn run lint:js && yarn run lint:rs",
     "lint:js": "eslint",
diff --git a/src/AdminRoom.ts b/src/AdminRoom.ts
@@ -1,4 +1,3 @@
- 
 import "reflect-metadata";
 import { AdminAccountData, AdminRoomCommandHandler, Category } from "./AdminRoomCommandHandler";
 import { botCommand, compileBotCommands, handleCommand, BotCommands, HelpFunction } from "./BotCommands";
diff --git a/src/AdminRoomCommandHandler.ts b/src/AdminRoomCommandHandler.ts
@@ -13,7 +13,6 @@ export enum Category {
 
 
 export interface AdminAccountData {
-     
     admin_user: string;
     github?: {
         notifications?: {
diff --git a/src/CommentProcessor.ts b/src/CommentProcessor.ts
@@ -16,7 +16,6 @@ const log = new Logger("CommentProcessor");
 const mime = import('mime');
 
 interface IMatrixCommentEvent extends MatrixMessageContent {
-     
     external_url: string;
     "uk.half-shot.matrix-hookshot.github.comment": {
         id: number;
diff --git a/src/Connections/GithubIssue.ts b/src/Connections/GithubIssue.ts
@@ -20,7 +20,6 @@ export interface GitHubIssueConnectionState {
     repo: string;
     state: string;
     issues: string[];
-     
     comments_processed: number;
 }
 
diff --git a/src/Connections/GithubProject.ts b/src/Connections/GithubProject.ts
@@ -7,7 +7,6 @@ import { ConfigGrantChecker, GrantChecker } from "../grants/GrantCheck";
 import { BridgeConfig } from "../config/Config";
 
 export interface GitHubProjectConnectionState {
-     
     project_id: number;
     state: "open"|"closed";
 }
diff --git a/src/Connections/GithubUserSpace.ts b/src/Connections/GithubUserSpace.ts
@@ -76,7 +76,6 @@ export class GitHubUserSpace extends BaseConnection implements IConnection {
             throw Error("Could not find repo");
         }
 
-         
         let avatarState: {type: "m.room.avatar", state_key: "", content: { url: string}}|undefined;
         try {
             if (avatarUrl) {
diff --git a/src/Gitlab/Types.ts b/src/Gitlab/Types.ts
@@ -1,4 +1,3 @@
- 
 export interface GitLabAuthor {
     id: number;
     name: string;
diff --git a/src/Gitlab/WebhookTypes.ts b/src/Gitlab/WebhookTypes.ts
@@ -1,5 +1,3 @@
- 
-
 export interface IGitLabWebhookEvent {
     object_kind: string;
 }
diff --git a/src/MatrixEvent.ts b/src/MatrixEvent.ts
@@ -1,4 +1,3 @@
- 
 export interface MatrixEvent<T extends MatrixEventContent|unknown> {
     content: T;
     event_id: string;
@@ -8,7 +7,6 @@ export interface MatrixEvent<T extends MatrixEventContent|unknown> {
     type: string;
 }
 
- 
 type MatrixEventContent = object;
 
 export interface MatrixMemberContent extends MatrixEventContent {
diff --git a/src/NotificationsProcessor.ts b/src/NotificationsProcessor.ts
@@ -10,7 +10,6 @@ import { GitHubUserNotification } from "./github/Types";
 import { components } from "@octokit/openapi-types/types";
 import { NotifFilter } from "./NotificationFilters";
 
-
 const log = new Logger("NotificationProcessor");
 const md = new markdown();
 
@@ -21,27 +20,22 @@ export interface IssueDiff {
     merged: boolean;
     mergedBy: null|{
         login: string;
-         
         html_url: string;
     };
     user: {
         login: string;
-         
         html_url: string;
     };
 }
 
 export interface CachedReviewData {
-     
     requested_reviewers: PullsListRequestedReviewersResponseData;
     reviews: PullsListReviewsResponseData;
 }
 
 type PROrIssue = IssuesGetResponseData|PullGetResponseData;
 
 export class NotificationProcessor {
-
-     
     private static formatUser(user: {login: string, html_url: string}) {
         return `**[${user.login}](${user.html_url})**`;
     }
diff --git a/src/config/Config.ts b/src/config/Config.ts
@@ -51,11 +51,8 @@ interface BridgeConfigGitHubYAML {
         secret: string;
     };
     oauth?: {
-         
         client_id: string;
-         
         client_secret: string;
-         
         redirect_uri: string;
     };
     defaultOptions?: GitHubRepoConnectionOptions;
@@ -74,11 +71,8 @@ export class BridgeConfigGitHub {
     };
     @configKey("Settings for allowing users to sign in via OAuth.", true)
     readonly oauth?: {
-         
         client_id: string;
-         
         client_secret: string;
-         
         redirect_uri: string;
     };
     @configKey("Default options for GitHub connections.", true)
@@ -111,18 +105,14 @@ export class BridgeConfigGitHub {
 }
 
 export interface BridgeConfigJiraCloudOAuth {
-     
     client_id: string;
-     
     client_secret: string;
-     
     redirect_uri: string;
 }
 
 export interface BridgeConfigJiraOnPremOAuth {
     consumerKey: string;
     privateKey: string;
-     
     redirect_uri: string;
 }
 
@@ -186,11 +176,6 @@ export class BridgeConfigJira implements BridgeConfigJiraYAML {
 
 export interface GitLabInstance {
     url: string;
-    // oauth: {
-    //     client_id: string;
-    //     client_secret: string;
-    //     redirect_uri: string;
-    // };
 }
 
 export interface BridgeConfigGitLabYAML {
@@ -746,11 +731,9 @@ export async function parseRegistrationFile(filename: string) {
 if (require.main === module) {
     Logger.configure({console: "info"});
     BridgeConfig.parseConfig(process.argv[2] || "config.yml", process.env).then(() => {
-         
         console.log('Config successfully validated.');
         process.exit(0);
     }).catch(ex => {
-         
         console.error('Error in config:', ex);
         process.exit(1);
     });
diff --git a/src/config/Defaults.ts b/src/config/Defaults.ts
@@ -248,19 +248,16 @@ async function renderRegistrationFile(configPath?: string) {
             rooms: [],
         },
     };
-     
+
     console.log(YAML.stringify(obj));
 }
 
-
 // Can be called directly
 if (require.main === module) {
     if (process.argv[2] === '--config') {
-         
         console.log(renderDefaultConfig());
     } else if (process.argv[2] === '--registration') {
         renderRegistrationFile(process.argv[3]).catch(ex => {
-             
             console.error(ex);
             process.exit(1);
         });
diff --git a/src/generic/types.ts b/src/generic/types.ts
@@ -5,10 +5,8 @@ export interface GenericWebhookEvent {
     hookId: string;
 }
 
-
 export type GenericWebhookEventResult = GenericWebhookEventResultSuccess | GenericWebhookEventResultFailure;
 
-
 export interface GenericWebhookEventResultSuccess {
     successful: true|null;
     response?: WebhookResponse,
diff --git a/src/github/Types.ts b/src/github/Types.ts
@@ -19,7 +19,6 @@ export type CreateInstallationAccessTokenDataType = Endpoints["POST /app/install
 
 export const NAMELESS_ORG_PLACEHOLDER = "No name";
 
- 
 export interface GitHubUserNotification {
     id: string;
     reason: "assign"|"author"|"comment"|"invitation"|"manual"|"mention"|"review_requested"|
diff --git a/tests/connections/FeedTest.spec.ts b/tests/connections/FeedTest.spec.ts
@@ -1,4 +1,3 @@
- 
 import { AppserviceMock } from "../utils/AppserviceMock";
 import { FeedConnection, FeedConnectionState } from "../../src/Connections";
 import { FeedEntry } from "../../src/feeds/FeedReader";
diff --git a/tests/connections/GenericHookTest.ts b/tests/connections/GenericHookTest.ts
@@ -1,4 +1,3 @@
- 
 import { assert, expect } from "chai";
 import { Appservice, Intent, MatrixError } from "matrix-bot-sdk";
 import { BridgeConfigGenericWebhooks, BridgeGenericWebhooksConfigYAML } from "../../src/config/sections";
diff --git a/tests/connections/GithubRepoTest.ts b/tests/connections/GithubRepoTest.ts
@@ -55,7 +55,6 @@ function createConnection(state: Record<string, unknown> = {}, isExistingState=f
 		"state_key",
 		githubInstance,
 		// Default config always contains GitHub
-		 
 		DefaultConfig.github!
 	);
 	return {connection, intent: intent as IntentMock};
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
@@ -1,29 +1,11 @@
 {
-  "extends": "@tsconfig/node22/tsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "incremental": true,
+    "incremental": false,
     "declaration": false,
     "outDir": "./spec-lib",
     "rootDir": "./",
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "strictBindCallApply": true,
-    "strictPropertyInitialization": true,
-    "noImplicitThis": true,
-    "alwaysStrict": true,
-    /* Additional Checks */
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "inlineSourceMap": true,
-    "inlineSources": true,
-    "allowJs": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    // TODO: Type errors
-    "useUnknownInCatchVariables": false
+    "allowJs": true
   },
   "include": [
       "spec/**/*"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import chai from "eslint-plugin-chai-expect";`
`6`	`6`
`7`	`7`	`export default [`
`8`	`8`	`{`
`9`		`- ignores: ["lib/*/", "contrib/*/"],`
	`9`	`+ ignores: ["lib/*/", "spec-lib/*/", "contrib/*/"],`
`10`	`10`	`},`
`11`	`11`	`...tseslint.config(`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`import "reflect-metadata";`
`3`	`2`	`import { AdminAccountData, AdminRoomCommandHandler, Category } from "./AdminRoomCommandHandler";`
`4`	`3`	`import { botCommand, compileBotCommands, handleCommand, BotCommands, HelpFunction } from "./BotCommands";`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ export interface GitHubIssueConnectionState {`
`20`	`20`	`repo: string;`
`21`	`21`	`state: string;`
`22`	`22`	`issues: string[];`
`23`		`-`
`24`	`23`	`comments_processed: number;`
`25`	`24`	`}`
`26`	`25`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ import { ConfigGrantChecker, GrantChecker } from "../grants/GrantCheck";`
`7`	`7`	`import { BridgeConfig } from "../config/Config";`
`8`	`8`
`9`	`9`	`export interface GitHubProjectConnectionState {`
`10`		`-`
`11`	`10`	`project_id: number;`
`12`	`11`	`state: "open"\|"closed";`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ export class GitHubUserSpace extends BaseConnection implements IConnection {`
`76`	`76`	`throw Error("Could not find repo");`
`77`	`77`	`}`
`78`	`78`
`79`		`-`
`80`	`79`	`let avatarState: {type: "m.room.avatar", state_key: "", content: { url: string}}\|undefined;`
`81`	`80`	`try {`
`82`	`81`	`if (avatarUrl) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`export interface GitLabAuthor {`
`3`	`2`	`id: number;`
`4`	`3`	`name: string;`