From 33f0df29358df3a80128277ecd4e760ba7deceae Mon Sep 17 00:00:00 2001
From: stv-beep <aleixalguero0@gmail.com>
Date: Mon, 12 Sep 2022 16:28:43 +0200
Subject: [PATCH] fixed bug: display fails if author's name has a dot v2

---
 README.md                   |  6 ++---
 package-lock.json           |  2 +-
 package.json                |  2 +-
 src/routes/driversQuotes.ts | 46 ++++++++++++++++++++++---------------
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 02af973..0f3440d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
-<h1  align="center">F1 quotes api 🏎</h1>
-
-  
+<h1 align="center">F1 quotes api 🏎</h1>
 
 <p>
-<img alt="Version" src="https://img.shields.io/badge/version-0.4.5-green.svg"/>
+<img alt="Version" src="https://img.shields.io/badge/version-0.4.6-cyan.svg"/>
 <img src="https://img.shields.io/badge/npm-%3E%3D8.5.0-blue.svg"/>
 <img src="https://img.shields.io/badge/node-%3E%3D16.14.2-blue.svg"/>
 </p>
diff --git a/package-lock.json b/package-lock.json
index 693df7b..6620efa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "f1-quotes-api",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 8d41d83..41201f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "f1-quotes-api",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/src/routes/driversQuotes.ts b/src/routes/driversQuotes.ts
index 7705c79..5f3af8e 100644
--- a/src/routes/driversQuotes.ts
+++ b/src/routes/driversQuotes.ts
@@ -78,30 +78,38 @@ router.get('/:driverId', (req, res) => { //quotes/:driverId
                 const $ = load(html)
                 specificQuotes = [] //cleaning array
                 /* getting the quote div including the author, then slicing the quote and the author */
-                $(specificQuoteContent, html).each(function () {
-                    let rawQuote = $(this).text().replace(/\n/g, '')
+                $(specificQuoteContent).each(function () {
                     let lastDotIndex = 0
+                    let rawQuote = $(this).text().replace(/\n/g, '')
+                    let author = ''
+                    let quote = ''
                     if (rawQuote.includes('?')) {
-                        lastDotIndex = $(this).text().lastIndexOf('?')
+                        lastDotIndex = rawQuote.lastIndexOf('?')
                     } else if (rawQuote.includes('!')) {
-                        lastDotIndex = $(this).text().lastIndexOf('!')
+                        lastDotIndex = rawQuote.lastIndexOf('!')
                     } else {
-                        lastDotIndex = $(this).text().lastIndexOf('.')
+                        lastDotIndex = rawQuote.lastIndexOf('.')
+                        if (rawQuote.slice(rawQuote.length-3, rawQuote.length) === 'Jr.') {//if there's a '.' in author's name
+                            rawQuote = rawQuote.replace('Jr.', 'Jr')
+                            author = rawQuote.slice(rawQuote.lastIndexOf('.')+1, rawQuote.length)
+                            rawQuote.slice(0,1) === ' ' ? quote = rawQuote.slice(1, rawQuote.length-author.length) : 
+                            quote = rawQuote.slice(0, rawQuote.lastIndexOf('.')+1)
+
+                            specificQuotes.push({
+                                quote: quote,
+                                author: author
+                            })
+                        } else {
+                            author = rawQuote.slice(rawQuote.lastIndexOf('.')+1, rawQuote.length)
+                            rawQuote.slice(0,1) === ' ' ? quote = rawQuote.slice(1, rawQuote.length-author.length) : 
+                            quote = rawQuote.slice(0, rawQuote.lastIndexOf('.')+1)
+
+                            specificQuotes.push({
+                                quote: quote,
+                                author: author
+                            })
+                        }
                     }
-                    let quote = rawQuote.slice(0, lastDotIndex-2)
-                    const author = $(this).text().slice(lastDotIndex+1).replace(/\n/g, '')
-                    if (!author.includes('.')) {
-                        const specialQuote = quote.slice(0, quote.lastIndexOf('.')+1) //quote with an image
-                        quote.slice(-1) === '.' ||  quote.slice(-1) === '!' ||  quote.slice(-1) === '?' ? 
-                        specificQuotes.push({
-                            quote,
-                            author: author
-                        }) : 
-                        specificQuotes.push({
-                            quote: specialQuote,
-                            author: author
-                        })
-                    }                    
                 })
                 res.json(specificQuotes)
             }).catch(err => console.log(err))