Merge branch 'develop' into feature/laravel-tests

Author: itinerare

app/Console/Commands/AddSiteSettings.php

@@ -103,6 +103,8 @@ public function handle()
 
         $this->addSiteSetting('group_currency', 1, 'ID of the group currency to award from gallery submissions (if enabled).');
 
+        $this->addSiteSetting('is_maintenance_mode', 0, '0: Site is normal, 1: Users without the Has Maintenance Access power will be redirected to the home page.');
+
         $this->line("\nSite settings up to date!");
 
     }

app/Helpers/Helpers.php

@@ -225,25 +225,34 @@ function randomString($characters)
  */
 function checkAlias($url, $failOnError = true)
 {
-    $recipient = null;
-    $matches = [];
-    // Check to see if url is 1. from a site used for auth
-    foreach(Config::get('lorekeeper.sites') as $key=>$site) if(isset($site['auth']) && $site['auth']) {
-        preg_match_all($site['regex'], $url, $matches);
-        if($matches != []) {$urlSite = $key; break;}
-    }
-    if($matches[0] == [] && $failOnError) throw new \Exception('This URL is from an invalid site. Please provide a URL for a user profile from a site used for authentication.');
+    if($url) {
+        $recipient = null;
+        $matches = [];
+        // Check to see if url is 1. from a site used for auth
+        foreach(Config::get('lorekeeper.sites') as $key=>$site) if(isset($site['auth']) && $site['auth']) {
+            preg_match_all($site['regex'], $url, $matches, PREG_SET_ORDER, 0);
+            if($matches != []) {$urlSite = $key; break;}
+        }
+        if($matches[0] == [] && $failOnError) throw new \Exception('This URL is from an invalid site. Please provide a URL for a user profile from a site used for authentication.');
 
-    // and 2. if it contains an alias associated with a user on-site.
-    if($matches[1] != [] && isset($matches[1][0])) {
-        $alias = App\Models\User\UserAlias::where('site', $urlSite)->where('alias', $matches[1][0])->first();
-        if($alias) $recipient = $alias->user;
-        else $recipient = $url;
-    }
+        // and 2. if it contains an alias associated with a user on-site.
+
+        if($matches[0] != [] && isset($matches[0][1])) {
+            if($urlSite != 'discord') {
+                $alias = App\Models\User\UserAlias::where('site', $urlSite)->where('alias', $matches[0][1])->first();
+            }
+            else {
+                $alias = App\Models\User\UserAlias::where('site', $urlSite)->where('alias', $matches[0][0])->first();
+            }
+            if($alias) $recipient = $alias->user;
+            else $recipient = $url;
+        }
 
-    return $recipient;
+        return $recipient;
+    }
 }
 
+
 /**
  * Prettifies links to user profiles on various sites in a "user@site" format.
  *
@@ -281,3 +290,22 @@ function prettyProfileName($url)
     if(isset($name) && isset($site)) return $name.'@'.(Config::get('lorekeeper.sites.'.$site.'.display_name') != null ? Config::get('lorekeeper.sites.'.$site.'.display_name') : $site);
     else return $url;
 }
+
+/**
+ * Creates an admin log entry after an action is performed.
+ * 
+ * @param  string  $action
+ * @param  object  $user
+ * @param  string  $action
+ */
+function logAdminAction($user, $action, $action_details)
+{
+    $log = \App\Models\AdminLog::create([
+        'user_id' => $user->id,
+        'action' => $action,
+        'action_details' => $action_details,
+    ]);
+
+    if($log) return true;
+    else return false;
+}

app/Http/Controllers/Admin/Data/CurrencyController.php

@@ -116,7 +116,7 @@ public function getDeleteCurrency($id)
      */
     public function postDeleteCurrency(Request $request, CurrencyService $service, $id)
     {
-        if($id && $service->deleteCurrency(Currency::find($id))) {
+        if($id && $service->deleteCurrency(Currency::find($id), Auth::user())) {
             flash('Currency deleted successfully.')->success();
         }
         else {

app/Http/Controllers/Admin/Data/FeatureController.php

@@ -124,7 +124,7 @@ public function getDeleteFeatureCategory($id)
      */
     public function postDeleteFeatureCategory(Request $request, FeatureService $service, $id)
     {
-        if($id && $service->deleteFeatureCategory(FeatureCategory::find($id))) {
+        if($id && $service->deleteFeatureCategory(FeatureCategory::find($id), Auth::user())) {
             flash('Category deleted successfully.')->success();
         }
         else {
@@ -273,7 +273,7 @@ public function getDeleteFeature($id)
      */
     public function postDeleteFeature(Request $request, FeatureService $service, $id)
     {
-        if($id && $service->deleteFeature(Feature::find($id))) {
+        if($id && $service->deleteFeature(Feature::find($id), Auth::user())) {
             flash('Trait deleted successfully.')->success();
         }
         else {

app/Http/Controllers/Admin/Data/GalleryController.php

@@ -114,7 +114,7 @@ public function getDeleteGallery($id)
      */
     public function postDeleteGallery(Request $request, GalleryService $service, $id)
     {
-        if($id && $service->deleteGallery(Gallery::find($id))) {
+        if($id && $service->deleteGallery(Gallery::find($id), Auth::user())) {
             flash('Gallery deleted successfully.')->success();
         }
         else {

app/Http/Controllers/Admin/Data/ItemController.php

@@ -126,7 +126,7 @@ public function getDeleteItemCategory($id)
      */
     public function postDeleteItemCategory(Request $request, ItemService $service, $id)
     {
-        if($id && $service->deleteItemCategory(ItemCategory::find($id))) {
+        if($id && $service->deleteItemCategory(ItemCategory::find($id), Auth::user())) {
             flash('Category deleted successfully.')->success();
         }
         else {
@@ -268,7 +268,7 @@ public function getDeleteItem($id)
      */
     public function postDeleteItem(Request $request, ItemService $service, $id)
     {
-        if($id && $service->deleteItem(Item::find($id))) {
+        if($id && $service->deleteItem(Item::find($id), Auth::user())) {
             flash('Item deleted successfully.')->success();
         }
         else {
@@ -311,7 +311,7 @@ public function postAddItemTag(Request $request, ItemService $service, $id)
     {
         $item = Item::find($id);
         $tag = $request->get('tag');
-        if($tag = $service->addItemTag($item, $tag)) {
+        if($tag = $service->addItemTag($item, $tag, Auth::user())) {
             flash('Tag added successfully.')->success();
             return redirect()->to($tag->adminUrl);
         }
@@ -350,7 +350,7 @@ public function getEditItemTag(ItemService $service, $id, $tag)
     public function postEditItemTag(Request $request, ItemService $service, $id, $tag)
     {
         $item = Item::find($id);
-        if($service->editItemTag($item, $tag, $request->all())) {
+        if($service->editItemTag($item, $tag, $request->all(), Auth::user())) {
             flash('Tag edited successfully.')->success();
         }
         else {
@@ -388,7 +388,7 @@ public function getDeleteItemTag($id, $tag)
     public function postDeleteItemTag(Request $request, ItemService $service, $id, $tag)
     {
         $item = Item::find($id);
-        if($service->deleteItemTag($item, $tag)) {
+        if($service->deleteItemTag($item, $tag, Auth::user())) {
             flash('Tag deleted successfully.')->success();
         }
         else {

app/Http/Controllers/Admin/Data/PromptController.php

@@ -182,10 +182,6 @@ public function getCreatePrompt()
         return view('admin.prompts.create_edit_prompt', [
             'prompt' => new Prompt,
             'categories' => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
         ]);
     }
 
@@ -202,10 +198,6 @@ public function getEditPrompt($id)
         return view('admin.prompts.create_edit_prompt', [
             'prompt' => $prompt,
             'categories' => ['none' => 'No category'] + PromptCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'items' => Item::orderBy('name')->pluck('name', 'id'),
-            'currencies' => Currency::where('is_user_owned', 1)->orderBy('name')->pluck('name', 'id'),
-            'tables' => LootTable::orderBy('name')->pluck('name', 'id'),
-            'raffles' => Raffle::where('rolled_at', null)->where('is_active', 1)->orderBy('name')->pluck('name', 'id'),
         ]);
     }
 

app/Http/Controllers/Admin/DesignController.php

@@ -9,7 +9,7 @@
 use App\Models\Character\CharacterDesignUpdate;
 use App\Models\Character\CharacterCategory;
 
-use App\Services\CharacterManager;
+use App\Services\DesignUpdateManager;
 
 use App\Http\Controllers\Controller;
 
@@ -28,7 +28,7 @@ public function getDesignIndex(Request $request, $type, $status)
         $requests = CharacterDesignUpdate::where('status', ucfirst($status));
         if($type == 'myo-approvals') $requests = $requests->myos();
         else $requests = $requests->characters();
-        
+
         return view('admin.designs.index', [
             'requests' => $requests->paginate(30)->appends($request->query()),
             'isMyo' => ($type == 'myo-approvals')
@@ -51,7 +51,7 @@ public function getDesignConfirmation($id, $action)
         ] : []));
     }
 
-    public function postDesign($id, $action, Request $request, CharacterManager $service)
+    public function postDesign($id, $action, Request $request, DesignUpdateManager $service)
     {
         $r = CharacterDesignUpdate::where('id', $id)->where('status', 'Pending')->first();
 
@@ -60,7 +60,7 @@ public function postDesign($id, $action, Request $request, CharacterManager $ser
         }
         elseif($action == 'approve' && $service->approveRequest($request->only([
                 'character_category_id', 'number', 'slug', 'description',
-                'is_giftable', 'is_tradeable', 'is_sellable', 'sale_value', 
+                'is_giftable', 'is_tradeable', 'is_sellable', 'sale_value',
                 'transferrable_at', 'set_active', 'invalidate_old',
             ]), $r, Auth::user())) {
             flash('Request approved successfully.')->success();
@@ -79,7 +79,7 @@ public function postDesign($id, $action, Request $request, CharacterManager $ser
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function postVote($id, $action, Request $request, CharacterManager $service)
+    public function postVote($id, $action, Request $request, DesignUpdateManager $service)
     {
         $r = CharacterDesignUpdate::where('id', $id)->where('status', 'Pending')->first();
         if(!$r) throw new \Exception ("Invalid design update.");

app/Http/Controllers/Admin/FileController.php

@@ -146,15 +146,16 @@ public function postDeleteFile(Request $request, FileManager $service)
      */
     public function postUploadFile(Request $request, FileManager $service)
     {
-        $request->validate(['file' => 'required|file']);
+        $request->validate(['files.*' => 'file|required']);
         $dir = $request->get('folder');
-        $file = $request->file('file');
-
-        if($service->uploadFile($file, $dir, $file->getClientOriginalName())) {
-            flash('File uploaded successfully.')->success();
-        }
-        else {
-            foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+        $files = $request->file('files');
+        foreach($files as $file) {
+            if($service->uploadFile($file, $dir, $file->getClientOriginalName())) {
+                flash('File uploaded successfully.')->success();
+            }
+            else {
+                foreach($service->errors()->getMessages()['error'] as $error) flash($error)->error();
+            }
         }
         return redirect()->back();
     }

app/Http/Controllers/Admin/HomeController.php

@@ -12,6 +12,7 @@
 use App\Models\Character\CharacterDesignUpdate;
 use App\Models\Character\CharacterTransfer;
 use App\Models\Trade;
+use App\Models\AdminLog;
 use App\Models\Report\Report;
 
 use App\Http\Controllers\Controller;
@@ -44,4 +45,16 @@ public function getIndex()
             'galleryAwardCount' => GallerySubmission::requiresAward()->where('is_valued', 0)->count()
         ]);
     }
+
+    /**
+     * Show admin logs.
+     * 
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function getLogs()
+    {
+        return view('admin.logs', [
+            'logs' => Adminlog::orderBy('created_at', 'DESC')->get()->paginate(20)
+        ]);
+    }
 }