locale file & thank api

app/Http/Controllers/CommentController.php

@@ -17,7 +17,11 @@ class CommentController extends Controller
     {
         $torrentId = $request->torrent_id;
         $with = ['create_user', 'update_user'];
-        $comments = Comment::query()->with($with)->where('torrent', $torrentId)->paginate();
+        $comments = Comment::query()
+            ->with($with)
+            ->where('torrent', $torrentId)
+            ->whereHas('create_user')
+            ->paginate();
         $resource = CommentResource::collection($comments);
         $resource->additional([
             'page_title' => nexus_trans('comment.index.page_title'),

app/Http/Controllers/FileController.php

@@ -19,6 +19,9 @@ class FileController extends Controller
         $torrentId = $request->torrent_id;
         $files = File::query()->where('torrent', $torrentId)->get();
         $resource = FileResource::collection($files);
+        $resource->additional([
+            'page_title' => nexus_trans('file.index.page_title'),
+        ]);
 
         return $this->success($resource);
     }

app/Http/Controllers/ThankController.php

@@ -16,8 +16,15 @@ class ThankController extends Controller
     public function index(Request $request)
     {
         $torrentId = $request->torrent_id;
-        $thanks = Thank::query()->where('torrentid', $torrentId)->with(['user'])->paginate();
+        $thanks = Thank::query()
+            ->where('torrentid', $torrentId)
+            ->whereHas('user')
+            ->with(['user'])
+            ->paginate();
         $resource = ThankResource::collection($thanks);
+        $resource->additional([
+            'page_title' => nexus_trans('thank.index.page_title'),
+        ]);
 
         return $this->success($resource);
     }

app/Http/Resources/UserResource.php

@@ -29,6 +29,7 @@ class UserResource extends JsonResource
             'downloaded' => $this->downloaded,
             'downloaded_text' => mksize($this->downloaded),
             'bonus' => $this->seedbonus,
+            'seed_points' => $this->seed_points,
             'seedtime' => $this->seedtime,
             'seedtime_text' => mkprettytime($this->seedtime),
             'leechtime' => $this->leechtime,

app/Models/User.php

@@ -72,10 +72,11 @@ class User extends Authenticatable
     public static $cardTitles = [
         'uploaded_human' => '上传',
         'downloaded_human' => '下载',
-        'share_ratio' => '分享率',
-        'seed_time' => '做种时间',
+//        'share_ratio' => '分享率',
+//        'seed_time' => '做种时间',
         'seed_bonus' => '魔力值',
-        'invites' => '邀请',
+        'seed_points' => '做种积分',
+//        'invites' => '邀请',
     ];
 
     public function getClassTextAttribute(): string

database/migrations/2021_06_24_013107_add_seed_points_to_users_table.php

@@ -14,7 +14,7 @@ class AddSeedPointsToUsersTable extends Migration
     public function up()
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->decimal('seed_points', 20, 1)->nullable();
+            $table->decimal('seed_points', 20, 1)->default(0);
         });
     }
 

include/cleanup.php

@@ -290,7 +290,7 @@ function docleanup($forceAll = 0, $printProgress = false) {
 			if ($is_donor == 'yes' && $donortimes_bonus > 0)
 				$all_bonus = $all_bonus * $donortimes_bonus;
 			KPS("+",$all_bonus,$arr["userid"]);
-			sql_query("update users set seed_points = seed_points + $seedPoints where id = {$arr["userid"]}");
+			sql_query("update users set seed_points = ifnull(seed_points, 0) + $seedPoints where id = {$arr["userid"]}");
 		}
 	}
 	$log = 'calculate seeding bonus';

include/functions.php

@@ -2933,7 +2933,7 @@ function commenttable($rows, $type, $parent_id, $review = false)
 	{
 //		$userRow = get_user_row($row['user']);
         $userInfo = $userInfoArr->get($row['user']);
-		$userRow = $userInfo->toArray();
+		$userRow = empty($userInfo) ? [] : $userInfo->toArray();
 		if ($count>=1)
 		{
 			if ($Advertisement->enable_ad()){

resources/lang/en/file.php

@@ -0,0 +1,6 @@
+<?php
+return [
+    'index' => [
+        'page_title' => 'Files',
+    ],
+];

resources/lang/en/thank.php

@@ -0,0 +1,6 @@
+<?php
+return [
+    'index' => [
+        'page_title' => 'Thanks',
+    ],
+];

resources/lang/zh_CN/file.php

@@ -0,0 +1,6 @@
+<?php
+return [
+    'index' => [
+        'page_title' => '文件列表',
+    ],
+];

resources/lang/zh_CN/thank.php

@@ -0,0 +1,6 @@
+<?php
+return [
+    'index' => [
+        'page_title' => '感谢者',
+    ],
+];

resources/lang/zh_TW/file.php

@@ -0,0 +1,6 @@
+<?php
+return [
+    'index' => [
+        'page_title' => '文件列表',
+    ],
+];

resources/lang/zh_TW/thank.php

@@ -0,0 +1,6 @@
+<?php
+return [
+    'index' => [
+        'page_title' => '感謝者',
+    ],
+];