Merge branch 'master' into binaries

app/Http/Controllers/MailController.php

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Models\Mail as MailModel;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Mail;
 use Laravel\Lumen\Routing\Controller as BaseController;

app/Http/Controllers/PublicPhotosController.php → app/Http/Controllers/PhotosController.php

@@ -7,13 +7,14 @@
 use App\Models\PhotoReport;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Laravel\Lumen\Routing\Controller as BaseController;
 
 /**
- * Class PublicPhotosController
+ * Class PhotosController
  * @package App\Http\Controllers
  */
-class PublicPhotosController extends BaseController
+class PhotosController extends BaseController
 {
     /**
      * Render a set of Public HabboWEB Photos
@@ -35,12 +36,12 @@ public function show(): JsonResponse
      * @MODERATION: Reporting Status (0 = Not Reviewed, 1 = Report Approved, 2 = Report Not Approved
      *
      * @param Request $request
-     * @param int $photoIdentifier
+     * @param int $photoId
      * @return JsonResponse
      */
-    public function report(Request $request, $photoIdentifier): JsonResponse
+    public function report(Request $request, int $photoId): JsonResponse
     {
-        (new PhotoReport)->store($photoIdentifier, $request->json()->get('reason'), $request->user()->uniqueId)->save();
+        (new PhotoReport)->store($photoId, $request->json()->get('reason'), $request->user()->uniqueId)->save();
 
         return response()->json('');
     }
@@ -52,7 +53,7 @@ public function report(Request $request, $photoIdentifier): JsonResponse
      * @param int $photoId
      * @return JsonResponse
      */
-    public function likePhoto(Request $request, $photoId): JsonResponse
+    public function likePhoto(Request $request, int $photoId): JsonResponse
     {
         if (PhotoLike::where('username', $request->user()->name)->where('photo_id', $photoId)->count() > 0)
             return response()->json('');
@@ -69,7 +70,7 @@ public function likePhoto(Request $request, $photoId): JsonResponse
      * @param int $photoId
      * @return JsonResponse
      */
-    public function unlikePhoto(Request $request, $photoId): JsonResponse
+    public function unlikePhoto(Request $request, int $photoId): JsonResponse
     {
         if (PhotoLike::where('username', $request->user()->name)->where('photo_id', $photoId)->count() == 0)
             return response()->json('');
@@ -78,4 +79,23 @@ public function unlikePhoto(Request $request, $photoId): JsonResponse
 
         return response()->json('');
     }
+
+    /**
+     * Delete a Photo
+     *
+     * @param Request $request
+     * @param int $photoId
+     * @return Response
+     */
+    public function delete(Request $request, int $photoId): Response
+    {
+        $photo = Photo::find($photoId);
+
+        if ($photo == null || $photo->creator_id != $request->user()->uniqueId)
+            return response('', 401);
+
+        $photo->delete();
+
+        return response('');
+    }
 }

config/chocolatey.php

@@ -287,6 +287,22 @@
         'Claudio it\'s you?'
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Loading Screen
+    |--------------------------------------------------------------------------
+    |
+    | Configure the text of Loading Screen.
+    |
+    */
+
+    'loading' => [
+        'Loading Habbo Hotel',
+        'See those Yellow Duckies, It\'s Wesley, no?',
+        'I would like to eat some chocolate cookies.. You know.',
+        'Claudio it\'s you?'
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Security Settings
@@ -313,7 +329,7 @@
     |
     */
 
-    'earn' => true,
+    'earn' => false,
 
     /*
     |--------------------------------------------------------------------------
@@ -344,4 +360,4 @@
         'enabled' => false,
         'name' => 'Habbo'
     ]
-];
+];

resources/views/errors/503.blade.php

@@ -7,12 +7,13 @@
     <title>{{$chocolatey['name']}}</title>
     <meta name="description" content="">
     <link rel="shortcut icon" href="{{$chocolatey['url']}}habbo-web/favicon.ico">
-    <link rel="stylesheet" type="text/css"
-          href="{{$chocolatey['url']}}/habbo-web/assets/css/maintenance.css">
-    <script>!function () {
+    <link rel="stylesheet" type="text/css" href="{{$chocolatey['url']}}/habbo-web/assets/css/maintenance.css">
+    <script>
+        !function () {
             var e = document.createElement("link"), t = document.getElementsByTagName("script")[0];
             "http:" !== window.location.protocol && "https:" !== window.location.protocol && (e.href = "http:"), e.href += "//fonts.googleapis.com/css?family=Ubuntu:regular,bold|Ubuntu+Condensed:lighter,regular,bold", e.rel = "stylesheet", e.type = "text/css", t.parentNode.insertBefore(e, t)
-        }()</script>
+        }()
+    </script>
 </head>
 <body>
 <div class="content">
@@ -27,7 +28,8 @@
                 </div>
             </div>
             <div class="aside">
-                <a class="twitter-timeline" data-width="300" data-height="400" href="https://twitter.com/{{$chocolatey['twitter']['username']}}">{{$chocolatey['twitter']['title']}}</a>
+                <a class="twitter-timeline" data-width="300" data-height="400"
+                   href="https://twitter.com/{{$chocolatey['twitter']['username']}}">{{$chocolatey['twitter']['title']}}</a>
                 <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
             </div>
         </div>

resources/views/errors/espreso.blade.php

@@ -1,25 +1,24 @@
-<?php $azure = \Illuminate\Support\Facades\Config::get('chocolatey'); ?>
-        <!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{$azure['name']}}</title>
+    <title>{{$chocolatey['name']}}</title>
     <meta name="description" content="">
-    <link rel="shortcut icon" href="{{$azure['url']}}habbo-web/favicon.ico">
-    <link rel="stylesheet" type="text/css"
-          href="{{$azure['url']}}/habbo-web/assets/css/maintenance.css">
-    <script id="twitter-wjs" src="https://platform.twitter.com/widgets.js"></script>
-    <script>!function () {
+    <link rel="shortcut icon" href="{{$chocolatey['url']}}habbo-web/favicon.ico">
+    <link rel="stylesheet" type="text/css" href="{{$chocolatey['url']}}/habbo-web/assets/css/maintenance.css">
+    <script>
+        !function () {
             var e = document.createElement("link"), t = document.getElementsByTagName("script")[0];
             "http:" !== window.location.protocol && "https:" !== window.location.protocol && (e.href = "http:"), e.href += "//fonts.googleapis.com/css?family=Ubuntu:regular,bold|Ubuntu+Condensed:lighter,regular,bold", e.rel = "stylesheet", e.type = "text/css", t.parentNode.insertBefore(e, t)
-        }()</script>
+        }()
+    </script>
 </head>
 <body>
 <div class="content">
     <div class="header">
-        <div class="wrapper"><a href="{{$azure['url']}}" class="habbo-image"></a></div>
+        <div class="wrapper"><a href="{{$chocolatey['url']}}" class="habbo-image"></a></div>
     </div>
     <div class="wrapper">
         <div class="page-content">

resources/views/habbo-web-pages/production/common/de/box_account_issues.blade.php

@@ -0,0 +1,3 @@
+<h3>Probleme mit dem Account</h3>
+<p>Hast du eine Frage zu deinem {{$chocolatey['name']}} Account, zu einer Frage oder zu einem Feature? Finde deine Antwort im <a
+            href="https://help.habbo.de" target="_blank">{{$chocolatey['name']}} Helptool</a>.</p>

resources/views/habbo-web-pages/production/common/de/box_habbo_way.blade.php

@@ -0,0 +1,3 @@
+<h3>{{$chocolatey['name']}} Benimmregeln</h3>
+<p>Befolge die <a href="/playing-habbo/habbo-way">{{$chocolatey['name']}} Benimmregeln</a> - sie sind eine Reihe von Richtlinien die dir
+    zeigen, wie du sicher Spa&#xDF; haben kannst!</p>

resources/views/habbo-web-pages/production/common/de/box_how_to_play.blade.php

@@ -0,0 +1,3 @@
+<h3>Wie wird gespielt</h3>
+<p>Werde kreativ, fange an zu bauen, werde sozial! Schau dir unsere <a href="/playing-habbo/how-to-play">Tipps an um zu
+        sehen, was du in {{$chocolatey['name']}} alles machen kannst</a>.</p>

resources/views/habbo-web-pages/production/common/de/box_learn_how_to_stay_safe.blade.php

@@ -0,0 +1,2 @@
+<h3>Sicherheitstipps</h3>
+<p>Sch&#xFC;tze dich bewusst! Lerne wie <a href="/playing-habbo/safety">du im Internet sicher bleibst</a>.</p>

resources/views/habbo-web-pages/production/common/de/box_mall_info.blade.php

@@ -0,0 +1,11 @@
+<h3>Info &amp; Hilfe</h3>
+<p>Du fragst dich <strong>was all diese aufregenden Dinge</strong> sind? Schau dir eine <a
+            href="https://help.habbo.de/entries/96788927-Informationen-zu-{{$chocolatey['name']}}-K%C3%A4ufen" target="_blank">detaillierte
+        Beschreibung unserer Waren</a> im {{$chocolatey['name']}} Helptool an!</p>
+<p><strong>Alle rechtm&#xE4;&#xDF;igen Arten um Taler zu kaufen siehst du hier.</strong> Wenn du sie wo anders kaufst,
+    kannst du betrogen und gebannt werden.</p>
+<p>{{$chocolatey['name']}} hat verschiedene <strong>Kauflimits</strong> f&#xFC;r die verschiedenen Zahlungsmethoden. Sie sind alle auf
+    unserer <a href="https://help.habbo.de/entries/90251837-Was-sind-die-Kauflimits-bei-{{$chocolatey['name']}}-" target="_blank">Kauflimit
+        Seite</a> im {{$chocolatey['name']}} Helptool aufgelistet.</p>
+<p>Hast du Fragen zu deinem <strong>{{$chocolatey['name']}} Account, einem Kauf oder einem Feature</strong>? Finde deine Antwort im <a
+            href="https://help.habbo.de/home" target="_blank">{{$chocolatey['name']}} Helptool</a>.</p>

resources/views/habbo-web-pages/production/common/de/box_need_help.blade.php

@@ -0,0 +1,6 @@
+<h3>Brauchst du Hilfe?</h3>
+<p>Erfahre auf unserer <a href="/playing-habbo/help">Hilfeseite</a> wie du dir selbst helfen kannst oder wie du die
+    Hilfe eines Moderatoren erh&#xE4;ltst.
+    Dort findest du ebenfalls eine Liste an Telefonnummern und Webseiten, wenn du jemanden zum Reden brauchst.</p>
+<p>Wenn du dort keine Antwort findest, schau dir bitte unsere <a href="https://help.habbo.de/home" target="_blank">Kundendienst
+        &amp; Helptool</a> Seite an.</p>

resources/views/habbo-web-pages/production/common/de/box_parents_guide.blade.php

@@ -0,0 +1,4 @@
+<h3>Tipps f&#xFC;r Eltern</h3>
+<p>Sind Sie Neugierig auf die wirksamen Mittel, die unseren Usern Spa&#xDF; in einer sicheren Umgebung gew&#xE4;hrleisten?
+    Lesen Sie unsere <a href="https://help.habbo.de/forums/228622-informationen-fur-eltern" target="_blank">Tipps f&#xFC;r
+        Eltern im Kundendienst &amp; Helptool</a>.</p>

resources/views/habbo-web-pages/production/common/de/housekeeping.blade.php

@@ -0,0 +1,11 @@
+<p>The Control Panel is an Administrative area used to manage the Server. If you are part of the administrative team,
+    you can access the panel by pressing the down button.</p>
+<hr>
+<blockquote>
+    <a class="report-form__submit" href="/">
+        Go Back to Hotel
+    </a>
+    <a class="form__submit" onclick="window.location.href='/espreso';">
+        Go to Espreso Housekeeping
+    </a>
+</blockquote>

resources/views/habbo-web-pages/production/common/en/box_mall_info.blade.php

@@ -1,12 +1,12 @@
 <h3>Info &amp; help</h3>
 <p>Wondering <strong>what all those shiny things for sale</strong> are? See <a target="_blank"
-                                                                               ng-href="@{{'https://help.habbo.com/entries/96390338-Information-about-Habbo-purchases' | zendeskRedirectUrl}}">detailed
+                                                                               ng-href="@{{'https://help.habbo.com/entries/96390338-Information-about-{{$chocolatey['name']}}-purchases' | zendeskRedirectUrl}}">detailed
         descriptions of our goods</a> in {{$chocolatey['name']}} Helpdesk!</p>
 <p><strong>All legitimate ways to buy Credits are shown here.</strong> Buying them elsewhere may get you ripped off and
     banned.</p>
 <p>{{$chocolatey['name']}} has different <strong>spending limits</strong> for different payment options. They are all
     listed on our <a
-            href="{{$chocolatey['url']}}api/public/help?returnTo=https://help.habbo.com/entries/347508-What-are-the-spending-limits-on-Habbo-"
+            href="{{$chocolatey['url']}}api/public/help?returnTo=https://help.habbo.com/entries/347508-What-are-the-spending-limits-on-{{$chocolatey['name']}}-"
             target="_blank">Spending Limits page</a> in {{$chocolatey['name']}} Helpdesk.</p>
 <p>Got a query about your <strong>{{$chocolatey['name']}} account, a purchase or a feature</strong>? Find your answer at
     the <a

resources/views/habbo-web-pages/production/common/es/box_account_issues.blade.php

@@ -0,0 +1,3 @@
+<h3>Ajustes {{$chocolatey['name']}} Cuenta</h3>
+<p>&#xBF;Tienes alguna pregunta sobre tu {{$chocolatey['name']}} Cuenta, compra o cualquier funcionalidad del Hotel? Encuentra la
+    respuesta en el apartado de <a href="https://help.habbo.es" target="_blank">Atenci&#xF3;n al Usuario {{$chocolatey['name']}}</a>.</p>

resources/views/habbo-web-pages/production/common/es/box_habbo_way.blade.php

@@ -0,0 +1,3 @@
+<h3>Manera {{$chocolatey['name']}}</h3>
+<p>Sigue la <a href="/playing-habbo/habbo-way">Manera {{$chocolatey['name']}}</a> y podr&#xE1;s disfrutar de todo lo que te ofrece el
+    Hotel</p>

resources/views/habbo-web-pages/production/common/es/box_how_to_play.blade.php

@@ -0,0 +1,3 @@
+<h3>C&#xF3;mo jugar</h3>
+<p>&#xA1;S&#xE9; creativo, dise&#xF1;a salas y haz nuevos amigos! Echa un vistazo a <a
+            href="/playing-habbo/how-to-play">nuestros consejos sobre lo que puedes hacer en {{$chocolatey['name']}}</a>.</p>

resources/views/habbo-web-pages/production/common/es/box_learn_how_to_stay_safe.blade.php

@@ -0,0 +1,3 @@
+<h3>Consejos de Seguridad</h3>
+<p>&#xA1;Prot&#xE9;gete con conciencia! Aprende c&#xF3;mo <a href="/playing-habbo/safety">Navegar seguro por
+        Internet</a>.</p>

resources/views/habbo-web-pages/production/common/es/box_mall_info.blade.php

@@ -0,0 +1,15 @@
+<h3>Informaci&#xF3;n y Ayuda</h3>
+<p>&#xBF;Te est&#xE1;s preguntando qu&#xE9; son todas esas cosas que est&#xE1;n en el Cat&#xE1;logo? &#xA1;Echa un
+    vistazo <a
+            href="https://habbohelpes.zendesk.com/entries/97381747-Informaci%C3%B3n-sobre-{{$chocolatey['name']}}-Comprashttps://habbohelpes.zendesk.com/entries/97381747-Informaci%C3%B3n-sobre-{{$chocolatey['name']}}-Compras"
+            target="_blank">a toda la informaci&#xF3;n</a> que encontrar&#xE1;s en la secci&#xF3;n Atenci&#xF3;n al
+    Usuario!</p>
+<p><strong>Estas son todas las opciones leg&#xED;timas para comprar cr&#xE9;ditos.</strong> La compra de cr&#xE9;ditos
+    en otro lugar distinto a {{$chocolatey['name']}} se considera una acci&#xF3;n fraudulenta, y puedes ser baneado por ello.</p>
+<p><strong>En {{$chocolatey['name']}} hay diferentes l&#xED;mites de compra</strong> en funci&#xF3;n de la opci&#xF3;n de pago. En este
+    enlace encontrar&#xE1;s un listado con los l&#xED;mites de cada pa&#xED;s <a
+            href="https://help.habbo.es/entries/90258457-L%C3%ADmites-de-Compra" target="_blank">L&#xED;mites de
+        Compra</a>.</p>
+<p>&#xBF;Tienes alguna pregunta sobre <strong>tu {{$chocolatey['name']}} Cuenta, compra o funcionalidad de {{$chocolatey['name']}}</strong>? Encuentra todas
+    las respuestas en nuestro apartado de <a href="https://help.habbo.es/home" target="_blank">Atenci&#xF3;n al
+        Usuario</a>.</p>

resources/views/habbo-web-pages/production/common/es/box_need_help.blade.php

@@ -0,0 +1,7 @@
+<h3>&#xBF;Necesitas ayuda?</h3>
+<p>Consulta c&#xF3;mo puedes echarte un cable o pedir la ayuda de un moderador en nuestro apartado de <a
+            href="/playing-habbo/help">Atenci&#xF3;n al Usuario</a>.
+    Tambi&#xE9;n incluye una lista de n&#xFA;meros de tel&#xE9;fono y p&#xE1;ginas web en caso de que necesites hablar
+    con alguien.
+    Si no encuentras una respuesta adecuada en esta p&#xE1;gina, ponte en contacto con el <a
+            href="https://help.habbo.es/" target="_blank">Ayudante de {{$chocolatey['name']}}</a>.</p>

resources/views/habbo-web-pages/production/common/es/box_parents_guide.blade.php

@@ -0,0 +1,4 @@
+<h3>Consejos para Padres</h3>
+<p>&#xBF;Conoces las herramientas disponibles para que los usuarios puedan divertirse en {{$chocolatey['name']}} dentro de un ambiente
+    seguro? Echa un vistazo a nuestros <a href="https://help.habbo.es/entries/38252606-Consejos-para-Padres-Madres"
+                                          target="_blank">Consejos para Padres en el Ayudante de {{$chocolatey['name']}}</a>.</p>

resources/views/habbo-web-pages/production/common/es/housekeeping.blade.php

@@ -0,0 +1,11 @@
+<p>The Control Panel is an Administrative area used to manage the Server. If you are part of the administrative team,
+    you can access the panel by pressing the down button.</p>
+<hr>
+<blockquote>
+    <a class="report-form__submit" href="/">
+        Go Back to Hotel
+    </a>
+    <a class="form__submit" onclick="window.location.href='/espreso';">
+        Go to Espreso Housekeeping
+    </a>
+</blockquote>

resources/views/habbo-web-pages/production/common/fr/box_account_issues.blade.php

@@ -0,0 +1,3 @@
+<h3>Probl&#xE8;mes avec le Compte</h3>
+<p>Tu as une question &#xE0; propos de ton compte, un achat ou une fonctionnalit&#xE9;? Tu trouveras la r&#xE9;ponse qu&apos;il
+    te faut dans le <a href="https://help.habbo.fr" target="_blank">Centre d&apos;Aide {{$chocolatey['name']}}</a>.</p>

resources/views/habbo-web-pages/production/common/fr/box_habbo_way.blade.php

@@ -0,0 +1,3 @@
+<h3>{{$chocolatey['name']}} Attitude</h3>
+<p>Suis la <a href="/playing-habbo/habbo-way">{{$chocolatey['name']}} Attitude</a> - une ligne de conduite qui te permettra de t&apos;amuser
+    en restant du bon c&#xF4;t&#xE9;!</p>

resources/views/habbo-web-pages/production/common/fr/box_how_to_play.blade.php

@@ -0,0 +1,3 @@
+<h3>Comment jouer</h3>
+<p>Sois cr&#xE9;atif, sois constructif, fais toi des amis! Regarde <a href="/playing-habbo/how-to-play">ce que tu peux
+        faire sur {{$chocolatey['name']}}</a>.</p>

resources/views/habbo-web-pages/production/common/fr/box_learn_how_to_stay_safe.blade.php

@@ -0,0 +1,3 @@
+<h3>Conseils de s&#xE9;curit&#xE9;</h3>
+<p>Prot&#xE8;ge-toi en te sensibilisant! Apprends comment <a href="/playing-habbo/safety">rester en s&#xE9;curit&#xE9;
+        sur Internet</a>.</p>

resources/views/habbo-web-pages/production/common/fr/box_mall_info.blade.php

@@ -0,0 +1,14 @@
+<h3>Info &amp; Aide</h3>
+<p>Tu veux savoir &#xE0; quoi correspondent toutes <strong>ces merveilleuses choses que nous te proposons</strong>?
+    Regarde <a href="https://habbohelpfr.zendesk.com/entries/96136967-{{$chocolatey['name']}}-Shopping-Informations" target="_blank">la
+        description d&#xE9;taill&#xE9;e de nos produits</a> dans notre centre d&apos;aide!</p>
+<p><strong>Tous les moyens l&#xE9;gitimes d&apos;acheter des cr&#xE9;dits sont pr&#xE9;sent&#xE9;s ici</strong>. Tu
+    pourrais te faire arnaquer en les achetant &#xE0; travers d&apos;un autre moyen et cela pourrait &#xE9;galement
+    conduire &#xE0; ton exclusion.</p>
+<p>{{$chocolatey['name']}} poss&#xE8;de des <strong>limites d&apos;achat</strong> diff&#xE9;rentes selon les diff&#xE9;rents moyens de
+    paiement. Voil&#xE0; la liste d&#xE9;taill&#xE9;e <a
+            href="https://habbohelpfr.zendesk.com/entries/88936098-Quelles-sont-les-limites-d-achats-appliqu%C3%A9es-sur-{{$chocolatey['name']}}-"
+            target="_blank">des limites d&apos;achat</a> dans le centre d&apos;aide.</p>
+<p>Tu as une question &#xE0; propos de <strong>ton compte, un achat, une fonctionnalit&#xE9;</strong>? Trouve toutes les
+    r&#xE9;ponses &#xE0; tes questions en consultant notre <a href="https://help.habbo.fr" target="_blank">Centre d&apos;Aide</a>.
+</p>

resources/views/habbo-web-pages/production/common/fr/box_need_help.blade.php

@@ -0,0 +1,7 @@
+<h3>Besoin d&apos;aide?</h3>
+<p>Apprends comment tu peux t&apos;aider par toi-m&#xEA;me ou comment obtenir l&apos;aide des mod&#xE9;rateur en
+    regardant notre <a href="/playing-habbo/help">Page d&apos;Aide</a>. Cette page propose &#xE9;galement une liste de
+    num&#xE9;ros de t&#xE9;l&#xE9;phone et de sites internet si tu as besoin de parler &#xE0; quelqu&apos;un.</p>
+<p>Si tu ne trouves pas de r&#xE9;ponse &#xE0; tes questions, tu peux consulter notre <a href="https://help.habbo.fr/"
+                                                                                         target="_blank">Centre d&apos;Aide</a>.
+</p>