From 6051ac951f0be50bc4ac8c17b26b41e0348c64be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Phil=20H=C3=B6fer?= <phil@suma-ev.de>
Date: Fri, 16 Oct 2020 11:57:39 +0000
Subject: [PATCH] Reintroduce quicktips into resultpage

---
 app/Http/Controllers/MetaGerSearch.php        | 13 ++++++++-
 app/MetaGer.php                               | 15 ++++++++---
 app/Models/Quicktips/Quicktip.php             | 27 -------------------
 .../views/layouts/researchandtabs.blade.php   |  4 +--
 resources/views/quicktips.blade.php           | 16 +----------
 5 files changed, 26 insertions(+), 49 deletions(-)

diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index 22289cad..025be641 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -76,10 +76,21 @@ class MetaGerSearch extends Controller
             return response($responseContent);
         }
 
+        $quicktips = $metager->createQuicktips();
+        if (!empty($timings)) {
+            $timings["createQuicktips"] = microtime(true) - $time;
+        }
+
         # Suche für alle zu verwendenden Suchmaschinen als Job erstellen,
         # auf Ergebnisse warten und die Ergebnisse laden
         $metager->createSearchEngines($request, $timings);
 
+        # Versuchen die Ergebnisse der Quicktips zu laden
+        $quicktipResults = $quicktips->loadResults();
+        if (!empty($timings)) {
+            $timings["loadResults"] = microtime(true) - $time;
+        }
+
         $metager->startSearch($timings);
 
         $metager->waitForMainResults();
@@ -128,7 +139,7 @@ class MetaGerSearch extends Controller
         }
 
         # Die Ausgabe erstellen:
-        $resultpage = $metager->createView();
+        $resultpage = $metager->createView($quicktipResults);
         if ($spamEntry !== null) {
             try {
                 Cache::put('spam.' . $metager->getFokus() . "." . md5($spamEntry), $resultpage->render(), 604800);
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 0a3be40d..5834d96d 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -135,7 +135,7 @@ class MetaGer
     }
 
     # Erstellt aus den gesammelten Ergebnissen den View
-    public function createView()
+    public function createView($quicktipResults = [])
     {
         # Hiermit werden die evtl. ausgewählten SuMas extrahiert, damit die Input-Boxen richtig gesetzt werden können
         $focusPages = [];
@@ -175,7 +175,7 @@ class MetaGer
                         ->with('apiAuthorized', $this->apiAuthorized)
                         ->with('metager', $this)
                         ->with('browser', (new Agent())->browser())
-                        ->with('quicktips', action('MetaGerSearch@quicktips', ["search" => $this->eingabe]))
+                        ->with('quicktips', $quicktipResults)
                         ->with('focus', $this->fokus)
                         ->with('resultcount', count($this->results));
             }
@@ -248,7 +248,7 @@ class MetaGer
                         ->with('apiAuthorized', $this->apiAuthorized)
                         ->with('metager', $this)
                         ->with('browser', (new Agent())->browser())
-                        ->with('quicktips', action('MetaGerSearch@quicktips', ["search" => $this->eingabe, "quotes" => $this->sprueche]))
+                        ->with('quicktips', $quicktipResults)
                         ->with('resultcount', count($this->results))
                         ->with('focus', $this->fokus);
                     break;
@@ -1213,6 +1213,15 @@ class MetaGer
         }
     }
 
+     public function createQuicktips()
+    {
+        # Die quicktips werden als job erstellt und zur Abarbeitung freigegeben
+        $quicktips = new \App\Models\Quicktips\Quicktips($this->q, LaravelLocalization::getCurrentLocale(), $this->getTime());
+        return $quicktips;
+    }
+
+
+
     private function anonymizeIp($ip)
     {
         if (str_contains($ip, ":")) {
diff --git a/app/Models/Quicktips/Quicktip.php b/app/Models/Quicktips/Quicktip.php
index 4d7201ca..8b137891 100644
--- a/app/Models/Quicktips/Quicktip.php
+++ b/app/Models/Quicktips/Quicktip.php
@@ -1,28 +1 @@
-<?php
 
-namespace App\Models\Quicktips;
-
-class Quicktip
-{
-    public $type;
-    public $title;
-    public $link;
-    public $gefVonTitle;
-    public $gefVonLink;
-    public $author;
-    public $descr;
-    public $details;
-
-    # Erstellt ein neues Ergebnis
-    public function __construct($type, $title, $link, $gefVonTitle, $gefVonLink, $author, $descr, $details)
-    {
-        $this->type = $type;
-        $this->title = $title;
-        $this->link = $link;
-        $this->gefVonTitle = $gefVonTitle;
-        $this->gefVonLink = $gefVonLink;
-        $this->author = $author;
-        $this->descr = $descr;
-        $this->details = $details;
-    }
-}
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index 17a26ccd..93ffeba5 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -35,9 +35,7 @@
 	<div id="additions-container">
 		@include('layouts.keyboardNavBox')
 		@if( $metager->showQuicktips() )
-			<div id="quicktips">
-				<iframe src="{{ $quicktips }}" frameborder="0"></iframe>
-			</div>
+			@include('quicktips', ['quicktips', $quicktips])
 		@endif
 	</div>
 	@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
diff --git a/resources/views/quicktips.blade.php b/resources/views/quicktips.blade.php
index 6fa679cf..f354bda8 100644
--- a/resources/views/quicktips.blade.php
+++ b/resources/views/quicktips.blade.php
@@ -1,19 +1,5 @@
-<!DOCTYPE html>
-<html lang="{{ LaravelLocalization::getCurrentLocale() }}">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>{{ $search }} - MetaGer Quicktips</title>
-  <link type="text/css" rel="stylesheet" href="{{ mix('css/quicktips.css') }}" />
-  <link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet">
-	<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" />
-	<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
-</head>
-<body id="quicktips">
 @foreach($quicktips as $quicktip)
   <div class="quicktip" type="{{ $quicktip->type }}">
     @include('parts.quicktip', ['quicktip' => $quicktip])
   </div>
-@endforeach
-</body>
-</html>
+@endforeach
\ No newline at end of file
-- 
GitLab