From 26bdeca374fd652d48c81a9ad5a00f0d4e9430ba Mon Sep 17 00:00:00 2001
From: Roardom <roardom@protonmail.com>
Date: Sat, 12 Aug 2023 08:30:59 +0000
Subject: [PATCH] refactor: inline peer upsert array creation

Remove some code duplication.
---
 app/Jobs/ProcessAnnounce.php | 40 +++++++++++++-----------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/app/Jobs/ProcessAnnounce.php b/app/Jobs/ProcessAnnounce.php
index 4533107aa..1fb99e3f2 100644
--- a/app/Jobs/ProcessAnnounce.php
+++ b/app/Jobs/ProcessAnnounce.php
@@ -128,19 +128,7 @@ class ProcessAnnounce implements ShouldQueue
             $creditedUploadedDelta = $uploadedDelta;
         }
 
-        // Common Parts Extracted From Switch
-        $peer->peer_id = $peerId;
-        $peer->ip = $ipAddress;
-        $peer->port = $this->queries['port'];
-        $peer->agent = $this->queries['user-agent'];
-        $peer->uploaded = $realUploaded;
-        $peer->downloaded = $realDownloaded;
-        $peer->seeder = $this->queries['left'] == 0;
-        $peer->left = $this->queries['left'];
-        $peer->torrent_id = $this->torrent->id;
-        $peer->user_id = $this->user->id;
         $peer->updateConnectableStateIfNeeded();
-        $peer->active = $event !== 'stopped';
 
         if (($creditedUploadedDelta > 0 || $creditedDownloadedDelta > 0) && $event !== 'stopped') {
             $this->user->update([
@@ -151,20 +139,20 @@ class ProcessAnnounce implements ShouldQueue
 
         Redis::connection('announce')->command('RPUSH', [
             config('cache.prefix').':peers:batch',
-            serialize($peer->only([
-                'peer_id',
-                'ip',
-                'port',
-                'agent',
-                'uploaded',
-                'downloaded',
-                'left',
-                'seeder',
-                'torrent_id',
-                'user_id',
-                'connectable',
-                'active'
-            ]))
+            serialize([
+                'peer_id'     => $peerId,
+                'ip'          => $ipAddress,
+                'port'        => $this->queries['port'],
+                'agent'       => $this->queries['user-agent'],
+                'uploaded'    => $realUploaded,
+                'downloaded'  => $realDownloaded,
+                'left'        => $this->queries['left'],
+                'seeder'      => $this->queries['left'] == 0,
+                'torrent_id'  => $this->torrent->id,
+                'user_id'     => $this->userId,
+                'connectable' => $peer->connectable,
+                'active'      => $event !== 'stopped',
+            ])
         ]);
 
         Redis::connection('announce')->command('RPUSH', [