Feat: fix minor bugs with trades & add tradelistings, trade proposals

app/Console/Commands/AddSiteSettings.php

@@ -45,6 +45,12 @@ public function handle() {
 
         $this->addSiteSetting('open_transfers_queue', 0, '0: Character transfers do not need mod approval, 1: Transfers must be approved by a mod.');
 
+        $this->addSiteSetting('open_trades_queue', 0, '0: Trades do not need mod approval, 1: Trades must be approved by a mod.');
+
+        $this->addSiteSetting('trade_listing_duration', 14, 'Number of days a trade listing is displayed for.');
+
+        $this->addSiteSetting('trade_listing_limit', 3, 'Number of trade listings a user can have at once.');
+
         $this->addSiteSetting('is_prompts_open', 1, '0: New prompt submissions cannot be made (mods can work on the queue still), 1: Prompts are submittable.');
 
         $this->addSiteSetting('is_claims_open', 1, '0: New claims cannot be made (mods can work on the queue still), 1: Claims are submittable.');

app/Helpers/AssetHelpers.php

@@ -437,6 +437,31 @@ function countAssets($array) {
     return $count;
 }
 
+/**
+ * Returns whether or not an asset can be traded based on its type.
+ *
+ * @param mixed $type
+ * @param mixed $asset
+ *
+ * @return bool
+ */
+function canTradeAsset($type, $asset) {
+    switch ($type) {
+        case 'Item':
+            return $asset->allow_transfer;
+            break;
+        case 'Currency':
+            // we don't have to worry about character->user or user->character transfers here
+            // technically you can loophole by transferring to a character and then transferring to a user
+            // but that is a process issue, not a code issue
+            return $asset->is_user_owned && $asset->allow_user_to_user;
+            break;
+        default:
+            return false;
+            break;
+    }
+}
+
 /**
  * Distributes the assets in an assets array to the given recipient (character).
  * Loot tables will be rolled before distribution.

app/Http/Controllers/Admin/Characters/CharacterController.php

@@ -12,10 +12,9 @@
 use App\Models\Rarity;
 use App\Models\Species\Species;
 use App\Models\Species\Subtype;
-use App\Models\Trade;
+use App\Models\Trade\Trade;
 use App\Models\User\User;
 use App\Services\CharacterManager;
-use App\Services\TradeManager;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
@@ -649,86 +648,6 @@ public function postTransferQueue(Request $request, CharacterManager $service, $
         return redirect()->back();
     }
 
-    /**
-     * Shows the character trade queue.
-     *
-     * @param string $type
-     *
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function getTradeQueue($type) {
-        $trades = Trade::query();
-        $user = Auth::user();
-
-        if ($type == 'completed') {
-            $trades->completed();
-        } elseif ($type == 'incoming') {
-            $trades->where('status', 'Pending');
-        } else {
-            abort(404);
-        }
-
-        $openTransfersQueue = Settings::get('open_transfers_queue');
-
-        return view('admin.masterlist.character_trades', [
-            'trades'             => $trades->orderBy('id', 'DESC')->paginate(20),
-            'tradesQueue'        => Settings::get('open_transfers_queue'),
-            'openTransfersQueue' => $openTransfersQueue,
-            'transferCount'      => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
-            'tradeCount'         => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
-        ]);
-    }
-
-    /**
-     * Shows the character trade action modal.
-     *
-     * @param int    $id
-     * @param string $action
-     *
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function getTradeModal($id, $action) {
-        if ($action != 'approve' && $action != 'reject') {
-            abort(404);
-        }
-        $trade = Trade::where('id', $id)->first();
-        if (!$trade) {
-            abort(404);
-        }
-
-        return view('admin.masterlist._'.$action.'_trade_modal', [
-            'trade'    => $trade,
-            'cooldown' => Settings::get('transfer_cooldown'),
-        ]);
-    }
-
-    /**
-     * Acts on a trade in the trade queue.
-     *
-     * @param App\Services\CharacterManager $service
-     * @param int                           $id
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function postTradeQueue(Request $request, TradeManager $service, $id) {
-        if (!Auth::check()) {
-            abort(404);
-        }
-
-        $action = strtolower($request->get('action'));
-        if ($action == 'approve' && $service->approveTrade($request->only(['action', 'cooldowns']) + ['id' => $id], Auth::user())) {
-            flash('Trade approved.')->success();
-        } elseif ($action == 'reject' && $service->rejectTrade($request->only(['action', 'reason']) + ['id' => $id], Auth::user())) {
-            flash('Trade rejected.')->success();
-        } else {
-            foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
-            }
-        }
-
-        return redirect()->back();
-    }
-
     /**
      * Shows a list of all existing MYO slots.
      *

app/Http/Controllers/Admin/HomeController.php

@@ -11,7 +11,7 @@
 use App\Models\Gallery\GallerySubmission;
 use App\Models\Report\Report;
 use App\Models\Submission\Submission;
-use App\Models\Trade;
+use App\Models\Trade\Trade;
 use App\Models\User\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -25,6 +25,7 @@ class HomeController extends Controller {
      */
     public function getIndex() {
         $openTransfersQueue = Settings::get('open_transfers_queue');
+        $openTradesQueue = Settings::get('open_trades_queue');
         $galleryRequireApproval = Settings::get('gallery_submissions_require_approval');
         $galleryCurrencyAwards = Settings::get('gallery_submissions_reward_currency');
 
@@ -36,6 +37,7 @@ public function getIndex() {
             'reportCount'            => Report::where('status', 'Pending')->count(),
             'assignedReportCount'    => Report::assignedToMe(Auth::user())->count(),
             'openTransfersQueue'     => $openTransfersQueue,
+            'openTradesQueue'        => $openTradesQueue,
             'transferCount'          => $openTransfersQueue ? CharacterTransfer::active()->where('is_approved', 0)->count() : 0,
             'tradeCount'             => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
             'galleryRequireApproval' => $galleryRequireApproval,

app/Http/Controllers/Admin/TradeController.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Facades\Settings;
+use App\Http\Controllers\Controller;
+use App\Models\Trade\Trade;
+use App\Services\TradeManager;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class TradeController extends Controller {
+    /**
+     * Shows the character trade queue.
+     *
+     * @param string $type
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getTradeQueue(Request $request, $type) {
+        $trades = Trade::query();
+        $user = Auth::user();
+        $data = $request->only(['sort']);
+        if (isset($data['sort'])) {
+            switch ($data['sort']) {
+                case 'newest':
+                    $trades->sortNewest();
+                    break;
+                case 'oldest':
+                    $trades->sortOldest();
+                    break;
+            }
+        } else {
+            $trades->sortOldest();
+        }
+
+        if ($type == 'completed') {
+            $trades->completed();
+        } elseif ($type == 'incoming') {
+            $trades->where('status', 'Pending');
+        } else {
+            abort(404);
+        }
+
+        $openTransfersQueue = Settings::get('open_trades_queue');
+
+        return view('admin.trades.trades', [
+            'trades'             => $trades->orderBy('id', 'DESC')->paginate(20),
+            'tradesQueue'        => Settings::get('open_trades_queue'),
+            'tradeCount'         => $openTransfersQueue ? Trade::where('status', 'Pending')->count() : 0,
+        ]);
+    }
+
+    /**
+     * Shows the character trade action modal.
+     *
+     * @param int    $id
+     * @param string $action
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getTradeModal($id, $action) {
+        if ($action != 'approve' && $action != 'reject') {
+            abort(404);
+        }
+        $trade = Trade::where('id', $id)->first();
+        if (!$trade) {
+            abort(404);
+        }
+
+        return view('admin.trades._'.$action.'_trade_modal', [
+            'trade'    => $trade,
+            'cooldown' => Settings::get('transfer_cooldown'),
+        ]);
+    }
+
+    /**
+     * Acts on a trade in the trade queue.
+     *
+     * @param App\Services\CharacterManager $service
+     * @param int                           $id
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postTradeQueue(Request $request, TradeManager $service, $id) {
+        if (!Auth::check()) {
+            abort(404);
+        }
+
+        $action = strtolower($request->get('action'));
+        if ($action == 'approve' && $service->approveTrade($request->only(['action', 'cooldowns']) + ['id' => $id], Auth::user())) {
+            flash('Trade approved.')->success();
+        } elseif ($action == 'reject' && $service->rejectTrade($request->only(['action', 'reason']) + ['id' => $id], Auth::user())) {
+            flash('Trade rejected.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
+    }
+}

app/Http/Controllers/Admin/Users/GrantController.php

@@ -9,7 +9,7 @@
 use App\Models\Currency\Currency;
 use App\Models\Item\Item;
 use App\Models\Submission\Submission;
-use App\Models\Trade;
+use App\Models\Trade\Trade;
 use App\Models\User\User;
 use App\Models\User\UserItem;
 use App\Services\CurrencyManager;

app/Http/Controllers/Characters/DesignController.php

@@ -170,12 +170,21 @@ public function getAddons($id) {
             $inventory = isset($r->data['user']) ? parseAssetData($r->data['user']) : null;
         }
 
+        $item_filter = Item::orderBy('name')->get()->mapWithKeys(function ($item) {
+            return [
+                $item->id => json_encode([
+                    'name'      => $item->name,
+                    'image_url' => $item->image_url,
+                ]),
+            ];
+        });
+
         return view('character.design.addons', [
             'request'     => $r,
             'categories'  => ItemCategory::visible(Auth::user() ?? null)->orderBy('sort', 'DESC')->get(),
             'inventory'   => $inventory,
             'items'       => Item::all()->keyBy('id'),
-            'item_filter' => Item::orderBy('name')->get()->keyBy('id'),
+            'item_filter' => $item_filter,
             'page'        => 'update',
         ]);
     }

app/Http/Controllers/Comments/CommentController.php

@@ -10,6 +10,7 @@
 use App\Models\Report\Report;
 use App\Models\Sales\Sales;
 use App\Models\SitePage;
+use App\Models\Trade\TradeListing;
 use App\Models\User\User;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
@@ -130,6 +131,12 @@ public function store(Request $request, $model, $id) {
                 $post = 'your site page';
                 $link = $page->url.'/#comment-'.$comment->getKey();
                 break;
+            case 'App\Models\Trade\TradeListing':
+                $listing = TradeListing::find($comment->commentable_id);
+                $recipient = $listing->user;
+                $post = 'your trade listing';
+                $link = $listing->url.'/#comment-'.$comment->getKey();
+                break;
             case 'App\Models\Gallery\GallerySubmission':
                 $submission = GallerySubmission::find($comment->commentable_id);
                 if ($type == 'Staff-Staff') {

app/Http/Controllers/Users/InventoryController.php

@@ -11,7 +11,7 @@
 use App\Models\Item\ItemCategory;
 use App\Models\Rarity;
 use App\Models\Submission\Submission;
-use App\Models\Trade;
+use App\Models\Trade\Trade;
 use App\Models\User\User;
 use App\Models\User\UserItem;
 use App\Services\InventoryManager;