From 4bc81484d322a6e4519d245e2a637b8380d17ef9 Mon Sep 17 00:00:00 2001
From: Chip Wasson <chip@wasson.io>
Date: Wed, 30 Oct 2024 10:29:43 -0600
Subject: [PATCH] Use nestjs ip decorator

---
 src/junk-drawer/junk-drawer.controller.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/junk-drawer/junk-drawer.controller.ts b/src/junk-drawer/junk-drawer.controller.ts
index fff7cf9..1dd81a7 100644
--- a/src/junk-drawer/junk-drawer.controller.ts
+++ b/src/junk-drawer/junk-drawer.controller.ts
@@ -2,6 +2,7 @@ import {
   Body,
   Controller,
   Get,
+  Ip,
   Param,
   Post,
   Redirect,
@@ -26,12 +27,12 @@ export class JunkDrawerController {
 
   @Get('')
   @Render('junk-drawer/upload')
-  async generateUploadForm(@Req() req: Request) {
+  async generateUploadForm(@Ip() ip: string) {
     let items: string[] = [];
-    if (req.ip) {
-      items = await this.junkDrawerService.getItemsForIp(req.ip);
+    if (ip) {
+      items = await this.junkDrawerService.getItemsForIp(ip);
     }
-    return { items, ip: req.ip };
+    return { items, ip };
   }
 
   @Get(':slug.json')
@@ -86,6 +87,7 @@ export class JunkDrawerController {
   async handleFileUpload(
     @UploadedFiles() files: Express.Multer.File[],
     @Req() request: Request,
+    @Ip() ip: string,
     @Body('description') description: string,
     @Body('private-ish') privateIsh: boolean,
     @Body('remember') remember: boolean,
@@ -113,8 +115,8 @@ export class JunkDrawerController {
       );
     }
     await this.junkDrawerService.storeJunkDrawerMetadata(metadata);
-    if (remember && request.ip && !privateIsh) {
-      await this.junkDrawerService.recordItemForIp(request.ip, uniqueSlug);
+    if (remember && ip && !privateIsh) {
+      await this.junkDrawerService.recordItemForIp(ip, uniqueSlug);
     }
     return { url: `/junk-drawer/${uniqueSlug}` };
   }