From f6f2c27874e956d42743b3af1757dc644a3df248 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 5 Apr 2022 21:22:32 -0600
Subject: [PATCH] Update horizon config, add default timeout limit

---
 app/Http/Controllers/ProfileController.php |  4 +--
 config/horizon.php                         |  2 ++
 resources/views/profile/memory.blade.php   | 35 ----------------------
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 resources/views/profile/memory.blade.php

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 7dbda1191..147d95842 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -81,9 +81,7 @@ class ProfileController extends Controller
 					'list' => $settings->show_profile_followers
 				]
 			];
-			$ui = $request->has('ui') && $request->input('ui') == 'memory' ? 'profile.memory' : 'profile.show';
-
-			return view($ui, compact('profile', 'settings'));
+			return view('profile.show', compact('profile', 'settings'));
 		} else {
 			$key = 'profile:settings:' . $user->id;
 			$ttl = now()->addHours(6);
diff --git a/config/horizon.php b/config/horizon.php
index c089fd901..f7fd81c29 100644
--- a/config/horizon.php
+++ b/config/horizon.php
@@ -175,6 +175,7 @@ return [
 				'memory'        => 128,
 				'tries'         => 3,
 				'nice'          => 0,
+				'timeout'		=> 60
 			],
 		],
 
@@ -187,6 +188,7 @@ return [
 				'memory'        => 128,
 				'tries'         => 3,
 				'nice'          => 0,
+				'timeout'       => 60
 			],
 		],
 	],
diff --git a/resources/views/profile/memory.blade.php b/resources/views/profile/memory.blade.php
deleted file mode 100644
index 7e23972fd..000000000
--- a/resources/views/profile/memory.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-@extends('layouts.app',['title' => $profile->username . " on " . config('app.name')])
-
-@section('content')
-@if (session('error'))
-    <div class="alert alert-danger text-center font-weight-bold mb-0">
-        {{ session('error') }}
-    </div>
-@endif
-
-<memory-profile profile-id="{{$profile->id}}" profile-username="{{$profile->username}}" :profile-settings="{{json_encode($settings)}}" profile-layout="{{$profile->profile_layout ?? 'metro'}}"></memory-profile>
-@if($profile->website)
-<a class="d-none" href="{{$profile->website}}" rel="me">{{$profile->website}}</a>
-@endif
-
-<noscript>
-  <div class="container">
-    <p class="pt-5 text-center lead">Please enable javascript to view this content.</p>
-  </div>
-</noscript>
-
-@endsection
-
-@push('meta')<meta property="og:description" content="{{$profile->bio}}">
-  @if(false == $settings['crawlable'] || $profile->remote_url)
-  <meta name="robots" content="noindex, nofollow">
-  @else  <meta property="og:image" content="{{$profile->avatarUrl()}}">
-    <link href="{{$profile->permalink('.atom')}}" rel="alternate" title="{{$profile->username}} on Pixelfed" type="application/atom+xml">
-    <link href='{{$profile->permalink()}}' rel='alternate' type='application/activity+json'>
-  @endif
-@endpush
-
-@push('scripts')<script type="text/javascript" src="{{ mix('js/memoryprofile.js') }}"></script>
-    <script type="text/javascript" defer>App.boot();</script>
-
-@endpush