Merge pull request #200 from ExpDev07/dev

New features and bugfixes

Author: coalaura

app/Helpers/StatisticsHelper.php

@@ -5,6 +5,7 @@
 use App\Ban;
 use App\Character;
 use App\Warning;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
@@ -94,6 +95,34 @@ public static function getCharacterCreationStats(): array
         return $data;
     }
 
+    /**
+     * Returns Lucky Wheel statistics
+     *
+     * @return array
+     */
+    public static function getLuckyWheelStats(): array
+    {
+        $key = 'lucky_wheel_spins_statistics';
+        if (Cache::has($key)) {
+            return Cache::get($key, []);
+        }
+
+        $stats = DB::table('lucky_wheel_spins')->fromSub(function ($query) {
+            $query->from('lucky_wheel_spins')->select([
+                DB::raw('FROM_UNIXTIME(`timestamp`, \'%Y-%m-%d\') AS `date`'),
+            ])->orderByDesc('timestamp');
+        }, 'spins')->select([
+            DB::raw('COUNT(`date`) as `count`'),
+            'date',
+        ])->groupBy('date')->get()->toArray();
+
+        $data = self::parseHistoricData($stats);
+
+        Cache::put($key, $data, 6 * 60 * 60);
+
+        return $data;
+    }
+
     /**
      * Returns Character creation statistics
      *
@@ -126,6 +155,7 @@ private static function parseHistoricData(array $stats): array
     {
         $map = [];
         foreach ($stats as $row) {
+            $row = (array)$row;
             $map[$row['date']] = $row['count'];
         }
 

app/Http/Controllers/PlayerWarningController.php

@@ -25,6 +25,27 @@ public function store(Player $player, WarningStoreRequest $request): RedirectRes
         return back()->with('success', 'The player has successfully been warned.');
     }
 
+    /**
+     * Updates the specified resource.
+     *
+     * @param Player $player
+     * @param Warning $warning
+     * @param WarningStoreRequest $request
+     * @return RedirectResponse
+     */
+    public function update(Player $player, Warning $warning, WarningStoreRequest $request): RedirectResponse
+    {
+        $staffIdentifier = $request->user()->player->steam_identifier;
+        $issuer = $warning->issuer()->first();
+        if (!$issuer || $staffIdentifier !== $issuer->steam_identifier) {
+            return back()->with('error', 'You can only edit your own warnings!');
+        }
+
+        $warning->update($request->validated());
+
+        return back()->with('success', 'Successfully updated warning');
+    }
+
     /**
      * Remove the specified resource from storage.
      *

app/Http/Controllers/StatisticsController.php

@@ -26,10 +26,11 @@ class StatisticsController extends Controller
     public function render(Request $request): Response
     {
         return Inertia::render('Statistics/Index', [
-            'bans'      => StatisticsHelper::getBanStats(),
-            'warnings'  => StatisticsHelper::getWarningStats(),
-            'creations' => StatisticsHelper::getCharacterCreationStats(),
-            'deletions' => StatisticsHelper::getCharacterDeletionStats(),
+            'bans'       => StatisticsHelper::getBanStats(),
+            'warnings'   => StatisticsHelper::getWarningStats(),
+            'creations'  => StatisticsHelper::getCharacterCreationStats(),
+            'deletions'  => StatisticsHelper::getCharacterDeletionStats(),
+            'luckyWheel' => StatisticsHelper::getLuckyWheelStats(),
         ]);
     }
 

database/migrations/2021_08_02_215817_create_lucky_wheel_spins_table.php

@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateLuckyWheelSpinsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasTable("lucky_wheel_spins")) {
+            Schema::create('lucky_wheel_spins', function (Blueprint $table) {
+                $table->bigInteger('id')->unsigned()->nullable(false)->autoIncrement();
+            });
+        }
+        if (!Schema::hasColumn("lucky_wheel_spins", "steam_identifier")) {
+            Schema::table("lucky_wheel_spins", function (Blueprint $table) {
+                $table->string('steam_identifier')->nullable(false);
+            });
+        }
+        if (!Schema::hasColumn("lucky_wheel_spins", "paid_spin")) {
+            Schema::table("lucky_wheel_spins", function (Blueprint $table) {
+                $table->tinyInteger('paid_spin')->nullable(false)->default(0);
+            });
+        }
+        if (!Schema::hasColumn("lucky_wheel_spins", "timestamp")) {
+            Schema::table("lucky_wheel_spins", function (Blueprint $table) {
+                $table->integer('timestamp')->nullable(false);
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('lucky_wheel_spins');
+    }
+}

resources/js/Pages/Logs/Index.vue

@@ -61,38 +61,38 @@
                             <input class="block w-full px-4 py-3 bg-gray-200 border rounded dark:bg-gray-600"
                                    id="details" :placeholder="t('logs.placeholder_details')" v-model="filters.details">
                         </div>
-                        <!-- Before -->
-                        <div class="w-1/6 px-3 pr-1 mobile:w-full mobile:mb-3">
-                            <label class="block mb-3 mt-3" for="before-date">
-                                {{ t('logs.before-date') }} <sup class="text-muted dark:text-dark-muted">*</sup>
-                            </label>
-                            <input class="block w-full px-4 py-3 bg-gray-200 border rounded dark:bg-gray-600"
-                                   id="before-date" type="date" placeholder="">
-                        </div>
-                        <!-- Before -->
-                        <div class="w-1/6 px-3 pl-1 mobile:w-full mobile:mb-3">
-                            <label class="block mb-3 mt-3" for="before-time">
-                                {{ t('logs.before-time') }} <sup class="text-muted dark:text-dark-muted">*</sup>
-                            </label>
-                            <input class="block w-full px-4 py-3 bg-gray-200 border rounded dark:bg-gray-600"
-                                   id="before-time" type="time" placeholder="">
-                        </div>
-                        <!-- After -->
+                        <!-- After Date -->
                         <div class="w-1/6 px-3 pr-1 mobile:w-full mobile:mb-3">
                             <label class="block mb-3 mt-3" for="after-date">
                                 {{ t('logs.after-date') }} <sup class="text-muted dark:text-dark-muted">*</sup>
                             </label>
                             <input class="block w-full px-4 py-3 bg-gray-200 border rounded dark:bg-gray-600" id="after-date"
                                    type="date" placeholder="">
                         </div>
-                        <!-- Before -->
+                        <!-- After Time -->
                         <div class="w-1/6 px-3 pl-1 mobile:w-full mobile:mb-3">
                             <label class="block mb-3 mt-3" for="after-time">
                                 {{ t('logs.after-time') }} <sup class="text-muted dark:text-dark-muted">*</sup>
                             </label>
                             <input class="block w-full px-4 py-3 bg-gray-200 border rounded dark:bg-gray-600"
                                    id="after-time" type="time" placeholder="">
                         </div>
+                        <!-- Before Date -->
+                        <div class="w-1/6 px-3 pr-1 mobile:w-full mobile:mb-3">
+                            <label class="block mb-3 mt-3" for="before-date">
+                                {{ t('logs.before-date') }} <sup class="text-muted dark:text-dark-muted">*</sup>
+                            </label>
+                            <input class="block w-full px-4 py-3 bg-gray-200 border rounded dark:bg-gray-600"
+                                   id="before-date" type="date" placeholder="">
+                        </div>
+                        <!-- Before Time -->
+                        <div class="w-1/6 px-3 pl-1 mobile:w-full mobile:mb-3">
+                            <label class="block mb-3 mt-3" for="before-time">
+                                {{ t('logs.before-time') }} <sup class="text-muted dark:text-dark-muted">*</sup>
+                            </label>
+                            <input class="block w-full px-4 py-3 bg-gray-200 border rounded dark:bg-gray-600"
+                                   id="before-time" type="time" placeholder="">
+                        </div>
                     </div>
                     <!-- Description -->
                     <div class="w-full px-3 mt-3">
@@ -204,18 +204,42 @@
             </template>
         </v-section>
 
+        <modal :show.sync="showLogDetail">
+            <template #header>
+                <h1 class="dark:text-white">
+                    {{ t('logs.detail.title') }}
+                </h1>
+                <p class="dark:text-dark-muted !-mt-3 italic">
+                    {{ t('logs.detail.description', log_detail.user) }}
+                </p>
+            </template>
+
+            <template #default>
+                <pre class="text-lg block mb-2">{{ log_detail.reason }}</pre>
+                {{ log_detail.description }}
+            </template>
+
+            <template #actions>
+                <button type="button" class="px-5 py-2 rounded hover:bg-gray-200 dark:bg-gray-600 dark:hover:bg-gray-400" @click="showLogDetail = false">
+                    {{ t('global.close') }}
+                </button>
+            </template>
+        </modal>
+
     </div>
 </template>
 
 <script>
 import Layout from './../../Layouts/App';
 import VSection from './../../Components/Section';
 import Pagination from './../../Components/Pagination';
+import Modal from './../../Components/Modal';
 
 export default {
     layout: Layout,
     components: {
         Pagination,
+        Modal,
         VSection,
     },
     props: {
@@ -250,7 +274,13 @@ export default {
     },
     data() {
         return {
-            isLoading: false
+            isLoading: false,
+            showLogDetail: false,
+            log_detail: {
+                user: '',
+                reason: '',
+                description: ''
+            }
         };
     },
     methods: {
@@ -293,6 +323,57 @@ export default {
 
             this.isLoading = false;
         },
+        parseDisconnectLog(details) {
+            const regex = /(?<=\) has disconnected from the server .+? with reason: `)(.+?)(?=`\.)/gm;
+            const matches = details.match(regex);
+            const match = matches && matches.length === 1 && matches[0].trim() ? matches[0].trim() : null;
+
+            if (match) {
+                const descriptions = [
+                    [/^Exiting/gmi, this.t('logs.detail.reasons.exited')],
+                    [/^Disconnected|^You have disconnected from the server/gmi, this.t('logs.detail.reasons.disconnected')],
+                    [/Game crashed: /gmi, this.t('logs.detail.reasons.crash')],
+                    [/(?<=connection|You) timed out[!.]|^Timed out after/gmi, this.t('logs.detail.reasons.timeout')],
+                    [/^You have been banned/gmi, this.t('logs.detail.reasons.banned')],
+                    [/^The server is restarting/gmi, this.t('logs.detail.reasons.restart')],
+                    [/^You have been kicked/gmi, this.t('logs.detail.reasons.kicked')],
+                    [/^Your Job Priority expired/gmi, this.t('logs.detail.reasons.job')],
+                    [/^Failed to sync doors/gmi, this.t('logs.detail.reasons.doors')],
+                    [/^You have been globally banned from all OP-FW servers/gmi, this.t('logs.detail.reasons.global')],
+                    [/^Entering Rockstar Editor/gmi, this.t('logs.detail.reasons.editor')],
+                    [/^Reliable network event overflow/gmi, this.t('logs.detail.reasons.overflow')],
+                    [/^Connecting to another server/gmi, this.t('logs.detail.reasons.another')],
+                    [/^Obtaining configuration from server failed/gmi, this.t('logs.detail.reasons.config')],
+                ];
+
+                let description = '';
+                for (let x in descriptions) {
+                    const entry = descriptions[x];
+
+                    if (entry[0].test(match)) {
+                        description = entry[1];
+                        break;
+                    }
+                }
+
+                if (!description) {
+                    description = this.t('logs.detail.reasons.unknown');
+                }
+
+                const html = $('<div />').append(
+                    $('<a></a>', {
+                        "data-reason" : match,
+                        "data-description" : description,
+                        "class": "text-yellow-800 dark:text-yellow-200 exit-log",
+                        "href": "#"
+                    }).text(match)
+                ).html();
+
+                return details.replace(match, html);
+            }
+
+            return details;
+        },
         parseLog(details) {
             const regex = /(to|from) (inventory )?((trunk|glovebox|character|property)-(\d+-)?\d+:\d+)/gmi;
 
@@ -313,13 +394,24 @@ export default {
                 details = details.replaceAll(inventories[x], '<a title="' + this.t('inventories.view') + '" class="text-indigo-600 dark:text-indigo-400" href="/inventory/' + inventories[x] + '">' + inventories[x] + '</a>');
             }
 
-            return details;
+            return this.parseDisconnectLog(details);
         },
         playerName(steamIdentifier) {
             return steamIdentifier in this.playerMap ? this.playerMap[steamIdentifier] : steamIdentifier;
         }
     },
     mounted() {
+        const _this = this;
+        $('body').on('click', 'a.exit-log', function(e) {
+            e.preventDefault();
+            const parent = $(this).closest('tr');
+
+            _this.showLogDetail = true;
+            _this.log_detail.user = $('td:first-child a', parent).text().trim();
+            _this.log_detail.reason = $(this).data('reason');
+            _this.log_detail.description = $(this).data('description');
+        });
+
         if (this.filters.before) {
             const d = new Date(this.filters.before * 1000);