fix(Torrent): Fix Torrent Download Dict miss

Rhilip · Mar 16, 2019 · 3a1780b · 3a1780b
1 parent 3101a63
commit 3a1780b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/apps/models/Torrent.php b/apps/models/Torrent.php
@@ -163,7 +163,7 @@ public function getRawDict()
 
     public function getDownloadDict($encode = true)
     {
-        $userInfo = app()->session->get('userInfo');  // FIXME add remote download by &passkey=  (Add change our BeforeMiddle) or token ?
+        $dict = $this->getRawDict();
 
         $scheme = "http://";
         if (filter_var(app()->request->get("https"), FILTER_VALIDATE_BOOLEAN))
@@ -173,12 +173,7 @@ public function getDownloadDict($encode = true)
         else if (app()->request->isSecure())
             $scheme = "https://";
 
-        // FIXME bad code
-        $passkey = app()->pdo->createCommand("SELECT `passkey` FROM `users` WHERE id=:id LIMIT 1;")->bindParams([
-            "id" => $userInfo["uid"]
-        ])->queryScalar();
-
-        $announce_suffix = "/announce?passkey=" . $passkey;
+        $announce_suffix = "/announce?passkey=" . app()->user->getPasskey();
         $dict["announce"] = $scheme . app()->config->get("base.site_tracker_url") . $announce_suffix;
 
         /** BEP 0012 Multitracker Metadata Extension

diff --git a/framework/User/UserTrait.php b/framework/User/UserTrait.php
@@ -298,4 +298,12 @@ public function getLang()
     {
         return $this->lang;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getPasskey()
+    {
+        return $this->passkey;
+    }
 }