From d8b26c6da8e18f799d2de1a7d2f1a6203bba7400 Mon Sep 17 00:00:00 2001
From: Alex Tran <alex.tran1502@gmail.com>
Date: Sat, 16 Jul 2022 10:54:00 -0500
Subject: [PATCH] Update bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md             | 16 ++++++++--------
 .../api-v1/server-info/server-info.controller.ts |  3 ++-
 server/apps/immich/src/main.ts                   |  2 +-
 .../libs/database/src/config/database.config.ts  |  2 +-
 web/src/hooks.ts                                 |  8 ++++----
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 029596b3da206..1a42bf05f9bf6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -16,8 +16,11 @@ Note: Please search to see if an issue already exists for the bug you encountere
 A clear and concise description of what the bug is.
 
 **Task List**
+
+*Please complete the task list below. We need this information to help us reproduce the bug or point out problems in your setup. You are not providing enough info may delay our effort to help you.*
+
 - [ ] I have read thoroughly the README setup and installation instructions.
-- [ ] If my setup is different, I have included my docker-compose file.
+- [ ] I have included my `docker-compose` file.
 - [ ] I have included my redacted `.env` file.
 - [ ] I have included information on my machine, and environment.
 
@@ -34,13 +37,10 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Version [e.g. 22]
+**System**
+- Phone OS [iOS, Android]: `<version>`
+- Server Version: `<version>`
+- Mobile App Version: `<version>`
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/server/apps/immich/src/api-v1/server-info/server-info.controller.ts b/server/apps/immich/src/api-v1/server-info/server-info.controller.ts
index 16eb9d5aafa20..9c863d7e217a7 100644
--- a/server/apps/immich/src/api-v1/server-info/server-info.controller.ts
+++ b/server/apps/immich/src/api-v1/server-info/server-info.controller.ts
@@ -7,11 +7,12 @@ import { ApiTags } from '@nestjs/swagger';
 import { ServerPingResponse } from './response-dto/server-ping-response.dto';
 import { ServerVersionReponseDto } from './response-dto/server-version-response.dto';
 import { ServerInfoResponseDto } from './response-dto/server-info-response.dto';
+import { DataSource } from 'typeorm';
 
 @ApiTags('Server Info')
 @Controller('server-info')
 export class ServerInfoController {
-  constructor(private readonly serverInfoService: ServerInfoService, private readonly configService: ConfigService) {}
+  constructor(private readonly serverInfoService: ServerInfoService) {}
 
   @Get()
   async getServerInfo(): Promise<ServerInfoResponseDto> {
diff --git a/server/apps/immich/src/main.ts b/server/apps/immich/src/main.ts
index 51afa4288f72b..a54f16e682bdb 100644
--- a/server/apps/immich/src/main.ts
+++ b/server/apps/immich/src/main.ts
@@ -1,3 +1,4 @@
+import { dataSource } from '@app/database/config/database.config';
 import { Logger } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
@@ -46,7 +47,6 @@ async function bootstrap() {
     customSiteTitle: 'Immich API Documentation',
   });
 
-  
   await app.listen(3001, () => {
     if (process.env.NODE_ENV == 'development') {
       // Generate API Documentation only in development mode
diff --git a/server/libs/database/src/config/database.config.ts b/server/libs/database/src/config/database.config.ts
index 97c4efb34c2e0..5e3d736494600 100644
--- a/server/libs/database/src/config/database.config.ts
+++ b/server/libs/database/src/config/database.config.ts
@@ -1,5 +1,5 @@
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import {DataSource} from "typeorm";
+import { DataSource } from 'typeorm';
 
 export const databaseConfig: PostgresConnectionOptions = {
   type: 'postgres',
diff --git a/web/src/hooks.ts b/web/src/hooks.ts
index a7f30da708a0e..03b712d06cdde 100644
--- a/web/src/hooks.ts
+++ b/web/src/hooks.ts
@@ -22,7 +22,7 @@ export const handle: Handle = async ({ event, resolve }) => {
 				firstName,
 				lastName,
 				isAdmin,
-				email,
+				email
 			};
 		}
 
@@ -30,7 +30,7 @@ export const handle: Handle = async ({ event, resolve }) => {
 
 		return response;
 	} catch (error) {
-		console.log('Error [handle]', error);
+		console.log('Error [handle]');
 		return await resolve(event);
 	}
 };
@@ -45,7 +45,7 @@ export const getSession: GetSession = async ({ locals }) => {
 			firstName: locals.user.firstName,
 			lastName: locals.user.lastName,
 			isAdmin: locals.user.isAdmin,
-			email: locals.user.email,
-		},
+			email: locals.user.email
+		}
 	};
 };