Merge branch 'Kotenko' of gitgod/geolook into master

app/Http/Kernel.php

@@ -19,6 +19,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
+        \App\Http\Middleware\HttpsProtocol::class
     ];
 
     /**

app/Http/Middleware/HttpsProtocol.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class HttpsProtocol {
+
+    public function handle($request, Closure $next)
+    {
+        if (@$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
+            \URL::forceScheme('https');
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -22,10 +22,10 @@ class VerifyCsrfToken extends Middleware
        // '869244226:'
     ];
 
-     public function __construct(\Illuminate\Foundation\Application $app, \Illuminate\Contracts\Encryption\Encrypter $encrypter)
-    {
-        $this->app = $app;
-        $this->encrypter = $encrypter;
-        $this->except[] = \Telegram::getAccessToken();
-    }
+//     public function __construct(\Illuminate\Foundation\Application $app, \Illuminate\Contracts\Encryption\Encrypter $encrypter)
+//    {
+//        $this->app = $app;
+//        $this->encrypter = $encrypter;
+//        $this->except[] = \Telegram::getAccessToken();
+//    }
 }

app/Providers/AppServiceProvider.php

@@ -24,6 +24,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        URL::forceScheme('https');
+//        URL::forceScheme('https');
     }
 }

config/telegram.php

@@ -57,5 +57,6 @@ return [
     */
     'commands' => [
         Telegram\Bot\Commands\HelpCommand::class,
+        \App\TCommands\TestCommand::class,
     ],
 ];

routes/web.php

@@ -27,6 +27,6 @@ Route::post('/tbot/'.Telegram::getAccessToken(), function(){
     Telegram::commandsHandler(true);
 });
 
-Route::post(Telegram::getAccessToken(), function () {
-	Telegram::commandsHandler(true);
-});
+//Route::post(Telegram::getAccessToken(), function () {
+//	Telegram::commandsHandler(true);
+//});