From d3aad23568d2642e982618f3df8f02eba6830e87 Mon Sep 17 00:00:00 2001
From: Tommy <52971804+ISnackable@users.noreply.github.com>
Date: Thu, 10 Sep 2020 10:55:58 +0800
Subject: [PATCH] Added recents for 4anime & changed Preferences > Settings  
 (#174)

* Add recents anime for 4anime
* Change Preferences to Settings
* Update preferences -> settings
---
 NineAnimator/AppDelegate+Environment.swift    |   2 +-
 NineAnimator/Base.lproj/Settings.storyboard   |  20 +--
 NineAnimator/Base.lproj/Setup.storyboard      |   6 +-
 ...verySceneViewController+QuickActions.swift |   2 +-
 .../Player Scene/NativePlayerController.swift |   2 +-
 .../SettingsDownloadsController.swift         |   2 +-
 .../SetupThemeViewController.swift            |   2 +-
 .../UserNotificationManager.swift             |   2 +-
 .../4anime.to/FourAnime+Anime.swift           | 141 ++++++++++--------
 .../4anime.to/FourAnime+Featured.swift        |  29 +++-
 .../Models/User/User+HomeIntegration.swift    |   2 +-
 .../Models/User/User+Preferences.swift        |   4 +-
 .../ScreenshotAutomation.swift                |   2 +-
 README.md                                     |   6 +-
 docs/third-party-lists.md                     |   2 +-
 15 files changed, 131 insertions(+), 93 deletions(-)

diff --git a/NineAnimator/AppDelegate+Environment.swift b/NineAnimator/AppDelegate+Environment.swift
index f84860ef8..9730df711 100644
--- a/NineAnimator/AppDelegate+Environment.swift
+++ b/NineAnimator/AppDelegate+Environment.swift
@@ -40,7 +40,7 @@ extension AppDelegate {
         // NINEANIMATOR_APPEARANCE_OVERRIDE: Theme Override
         if let overridingTheme = NineAnimator.runtime.overridingAppearanceName {
             if let theme = Theme.availableThemes[overridingTheme] {
-                Log.info("[AppDelegate.Environment] Updating appearance to '%@' (note this will not change the preferences in the user settings)...", overridingTheme)
+                Log.info("[AppDelegate.Environment] Updating appearance to '%@' (note this will not change the setting in the user settings)...", overridingTheme)
                 Theme.setTheme(theme)
             } else {
                 Log.error("[AppDelegate.Environment] Appearance '%@' is undefined.", overridingTheme)
diff --git a/NineAnimator/Base.lproj/Settings.storyboard b/NineAnimator/Base.lproj/Settings.storyboard
index f6292e2fe..9cea1f852 100644
--- a/NineAnimator/Base.lproj/Settings.storyboard
+++ b/NineAnimator/Base.lproj/Settings.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="1QF-QW-wC1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="1QF-QW-wC1">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -7,7 +7,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Preferences-->
+        <!--Settings-->
         <scene sceneID="Vvw-7M-2Be">
             <objects>
                 <tableViewController id="avc-gc-Mj2" customClass="SettingsSceneController" customModule="NineAnimator" customModuleProvider="target" sceneMemberID="viewController">
@@ -504,11 +504,11 @@ Fallback to Browser directs the app to open the playback page in Safari when fai
                                         <rect key="frame" x="16" y="1004.5" width="343" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="30T-PY-VFY" id="eTQ-k1-6uJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="317" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="324" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Home" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0eR-hu-Qxf">
-                                                    <rect key="frame" x="15" y="0.0" width="294" height="44"/>
+                                                    <rect key="frame" x="15" y="0.0" width="301" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -528,7 +528,7 @@ Fallback to Browser directs the app to open the playback page in Safari when fai
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Open Cast Controller" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7gK-el-Ee1">
-                                                    <rect key="frame" x="15" y="0.0" width="313" height="44"/>
+                                                    <rect key="frame" x="15" y="0.0" width="320" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" name="controlAccentColor" catalog="System" colorSpace="catalog"/>
@@ -596,7 +596,7 @@ NineAnimator uses Background App Refresh to determine if a new episode of a subs
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="0 Items" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7Ky-4E-HeC">
-                                                    <rect key="frame" x="271" y="12" width="57" height="20.5"/>
+                                                    <rect key="frame" x="278" y="12" width="57" height="20.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
@@ -620,7 +620,7 @@ NineAnimator uses Background App Refresh to determine if a new episode of a subs
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Checking..." textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1D4-d4-eg5">
-                                                    <rect key="frame" x="241.5" y="12" width="86.5" height="20.5"/>
+                                                    <rect key="frame" x="248.5" y="12" width="86.5" height="20.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
@@ -637,7 +637,7 @@ NineAnimator uses Background App Refresh to determine if a new episode of a subs
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Unsubscribe All" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hGc-BW-frZ">
-                                                    <rect key="frame" x="15" y="0.0" width="313" height="44"/>
+                                                    <rect key="frame" x="15" y="0.0" width="320" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" name="controlAccentColor" catalog="System" colorSpace="catalog"/>
@@ -820,7 +820,7 @@ Clear Shortcuts and Spotlight Items will delete all NineAnimator shortcuts and S
                             <outlet property="delegate" destination="avc-gc-Mj2" id="w3F-YX-9Kd"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="Preferences" id="SsL-fL-doX">
+                    <navigationItem key="navigationItem" title="Settings" id="SsL-fL-doX">
                         <barButtonItem key="rightBarButtonItem" systemItem="done" id="XHY-Ma-Rtv">
                             <connections>
                                 <action selector="onDoneButtonClicked:" destination="avc-gc-Mj2" id="U44-8U-CwK"/>
@@ -2201,7 +2201,7 @@ Remaining storage capacity displayed in this screen may be different from the Se
                                 </cells>
                             </tableViewSection>
                             <tableViewSection headerTitle="Privacy" id="Ips-J8-mzS">
-                                <mutableString key="footerTitle">You may clear your playback history and reset your personal preferences in the Preferences menu.

By switching on Opt-out Analytics, the app will no longer automatically collect analytical data. We use analytical data to get insights on how people use our Services so that we can make our Services better. See our Privacy Policy for what data we collect and how we use it.
+                                <mutableString key="footerTitle">You may clear your playback history and reset your personal preferences in the Settings menu.

By switching on Opt-out Analytics, the app will no longer automatically collect analytical data. We use analytical data to get insights on how people use our Services so that we can make our Services better. See our Privacy Policy for what data we collect and how we use it.
 
 NineAnimator will never uploads your personal information or playback history to any third party services or websites without your consent. However, NineAnimator is not designed to prevent services (e.g. 9anime, MyCloud, MyAnimeList) or your Internet Service Provider from tracking you.
 
diff --git a/NineAnimator/Base.lproj/Setup.storyboard b/NineAnimator/Base.lproj/Setup.storyboard
index 92c40e46e..753949793 100644
--- a/NineAnimator/Base.lproj/Setup.storyboard
+++ b/NineAnimator/Base.lproj/Setup.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jMC-Us-Crt">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jMC-Us-Crt">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -555,7 +555,7 @@
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ok1-aG-zqs">
                                 <rect key="frame" x="32" y="614.33333333333337" width="311" height="65.666666666666629"/>
                                 <string key="text">Setting the appearance to Dynamic allows NineAnimator to change the theme according to the brightness of the screen.
-After setup, you can change the theme settings in the Preferences menu.</string>
+After setup, you can change the theme settings in the Settings menu.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
@@ -789,7 +789,7 @@ After setup, you can change the theme settings in the Preferences menu.</string>
                                     <action selector="onFinishButtonTapped:" destination="Rpq-aZ-KUE" eventType="touchUpInside" id="VAQ-uu-uyT"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Login to your Anilist, Kitsu, or MyAnimeList accounts in the Preferences menu. Join our Discord community to receive updates." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="8" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MDo-yQ-irq">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Login to your Anilist, Kitsu, or MyAnimeList accounts in the Settings menu. Join our Discord community to receive updates." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="8" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MDo-yQ-irq">
                                 <rect key="frame" x="32" y="450" width="311" height="50.333333333333314"/>
                                 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="14"/>
                                 <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/NineAnimator/Controllers/Anime Discovery Scenes/DiscoverySceneViewController+QuickActions.swift b/NineAnimator/Controllers/Anime Discovery Scenes/DiscoverySceneViewController+QuickActions.swift
index 88f097758..7a9c0b2d7 100644
--- a/NineAnimator/Controllers/Anime Discovery Scenes/DiscoverySceneViewController+QuickActions.swift	
+++ b/NineAnimator/Controllers/Anime Discovery Scenes/DiscoverySceneViewController+QuickActions.swift	
@@ -48,7 +48,7 @@ extension DiscoverySceneViewController {
         listOfActions.append(
             .init(
                 icon: UIImage(named: "Cog Icon QuickAction")!,
-                title: "Preferences"
+                title: "Settings"
             ) {
                 [weak self] completion in
                 guard let self = self else { return }
diff --git a/NineAnimator/Controllers/Player Scene/NativePlayerController.swift b/NineAnimator/Controllers/Player Scene/NativePlayerController.swift
index 1e6921445..cbaa9c221 100644
--- a/NineAnimator/Controllers/Player Scene/NativePlayerController.swift	
+++ b/NineAnimator/Controllers/Player Scene/NativePlayerController.swift	
@@ -370,7 +370,7 @@ extension NativePlayerController {
     }
 }
 
-// MARK: - Update preferences
+// MARK: - Update settings
 extension NativePlayerController {
     @objc func onUserPreferenceDidChange(notification _: Notification) {
         playerViewController.allowsPictureInPicturePlayback = shouldUsePictureInPicture
diff --git a/NineAnimator/Controllers/Settings Scene/SettingsDownloadsController.swift b/NineAnimator/Controllers/Settings Scene/SettingsDownloadsController.swift
index c27bdcbd8..d708477e6 100644
--- a/NineAnimator/Controllers/Settings Scene/SettingsDownloadsController.swift	
+++ b/NineAnimator/Controllers/Settings Scene/SettingsDownloadsController.swift	
@@ -182,7 +182,7 @@ class SettingsDownloadsController: UITableViewController {
             }
         }
         
-        // Update preferences states
+        // Update settings states
         autoRetrySwitch.setOn(
             NineAnimator.default.user.autoRestartInterruptedDownloads,
             animated: true
diff --git a/NineAnimator/Controllers/Setup Scenes/SetupThemeViewController.swift b/NineAnimator/Controllers/Setup Scenes/SetupThemeViewController.swift
index 02d1cd4cc..0712154aa 100644
--- a/NineAnimator/Controllers/Setup Scenes/SetupThemeViewController.swift	
+++ b/NineAnimator/Controllers/Setup Scenes/SetupThemeViewController.swift	
@@ -104,7 +104,7 @@ class SetupThemeViewController: UIViewController, Themable {
         if #available(iOS 13.0, *) {
             themeDescriptionLabel.text = """
 Select Light or Dark to use an appearance independent from the system.
-After setup, you can change the theme settings in the Preferences menu.
+After setup, you can change the theme settings in the Settings menu.
 """
         }
     }
diff --git a/NineAnimator/Controllers/User Notification/UserNotificationManager.swift b/NineAnimator/Controllers/User Notification/UserNotificationManager.swift
index d471df6fb..d38a5944a 100644
--- a/NineAnimator/Controllers/User Notification/UserNotificationManager.swift	
+++ b/NineAnimator/Controllers/User Notification/UserNotificationManager.swift	
@@ -126,7 +126,7 @@ extension UserNotificationManager {
         notificationCenter.requestAuthorization(options: [.badge]) {
             success, _ in DispatchQueue.main.async {
                 if shouldPresetError && !success {
-                    let alertController = UIAlertController(title: "Updates Unavailable", message: "NineAnimator doesn't have persmission to send notifications. You won't receive any updates for this anime until you allow notifications from NineAnimator in Settings.", preferredStyle: .alert)
+                    let alertController = UIAlertController(title: "Updates Unavailable", message: "NineAnimator doesn't have persmission to send notifications. You won't receive any updates for this anime until you allow notifications from NineAnimator in system settings app.", preferredStyle: .alert)
                     alertController.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
                     RootViewController.shared?.presentOnTop(alertController, animated: true)
                 }
diff --git a/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Anime.swift b/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Anime.swift
index f09a1fbcd..761c95769 100644
--- a/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Anime.swift	
+++ b/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Anime.swift	
@@ -25,79 +25,90 @@ extension NASourceFourAnime {
         self.requestManager.request(
             url: link.link,
             handling: .browsing
-        ) .responseString.then {
-            responseContent -> Anime in
+        ) .responseString.thenPromise {
+            responseContent in
             let bowl = try SwiftSoup.parse(responseContent)
-            let animeTitle = try bowl.select(".content p").text()
-            let animeArtworkUrl = URL(
-                string: try bowl.select(".cover>img").attr("src"),
+            let animeLinkURL = URL(
+                string: try bowl.select("#titleleft").attr("href"),
                 relativeTo: link.link
-            ) ?? link.image
-            let reconstructedAnimeLink = AnimeLink(
-                title: animeTitle,
-                link: link.link,
-                image: animeArtworkUrl,
-                source: self
-            )
-            
-            // Obtain the list of episodes
-            let episodes = try bowl.select("ul.episodes>li").reduce(into: [EpisodeLink]()) {
-                collection, container in
-                let episodeName = try container
-                    .text()
-                    .trimmingCharacters(in: .whitespacesAndNewlines)
-                let episodeLink = try container.select("a").attr("href")
-                
-                collection.append(.init(
-                    identifier: episodeLink,
-                    name: episodeName,
-                    server: NASourceFourAnime.FourAnimeStream,
-                    parent: reconstructedAnimeLink
-                ))
-            }
-            
-            // Information
-            let animeSynopsis = try bowl
-                .select("div#description-mob")
-                .text()
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-                .replacingOccurrences(
-                    of: "\\n+",
-                    with: "\n",
-                    options: [.regularExpression]
-                )
-                .replacingOccurrences(
-                    of: "^Description\\s",
-                    with: "",
-                    options: [.regularExpression]
+                ) ?? link.link
+            return self.requestManager.request(
+                url: animeLinkURL,
+                handling: .browsing
+            ) .responseString.then {
+                responseContent -> Anime in
+                let bowl = try SwiftSoup.parse(responseContent)
+                let animeTitle = try bowl.select(".content p").text()
+                let animeArtworkUrl = URL(
+                    string: try bowl.select(".cover>img").attr("src"),
+                    relativeTo: link.link
+                ) ?? link.image
+                let reconstructedAnimeLink = AnimeLink(
+                    title: animeTitle,
+                    link: link.link,
+                    image: animeArtworkUrl,
+                    source: self
                 )
-            
-            // Attributes
-            var additionalAttributes = [Anime.AttributeKey: Any]()
-            let detailContainers = try bowl.select("div.info div.detail")
-            
-            for container in detailContainers {
-                let attributeNameContainer = try container.select(".title-side")
-                let attributeName = try attributeNameContainer.text()
-                try attributeNameContainer.remove()
-                let attributeValue = try container
+                
+                // Obtain the list of episodes
+                let episodes = try bowl.select("ul.episodes>li").reduce(into: [EpisodeLink]()) {
+                    collection, container in
+                    let episodeName = try container
+                        .text()
+                        .trimmingCharacters(in: .whitespacesAndNewlines)
+                    let episodeLink = try container.select("a").attr("href")
+                    
+                    collection.append(.init(
+                        identifier: episodeLink,
+                        name: episodeName,
+                        server: NASourceFourAnime.FourAnimeStream,
+                        parent: reconstructedAnimeLink
+                    ))
+                }
+                
+                // Information
+                let animeSynopsis = try bowl
+                    .select("div#description-mob")
                     .text()
                     .trimmingCharacters(in: .whitespacesAndNewlines)
+                    .replacingOccurrences(
+                        of: "\\n+",
+                        with: "\n",
+                        options: [.regularExpression]
+                    )
+                    .replacingOccurrences(
+                        of: "^Description\\s",
+                        with: "",
+                        options: [.regularExpression]
+                    )
+                
+                // Attributes
+                var additionalAttributes = [Anime.AttributeKey: Any]()
+                let detailContainers = try bowl.select("div.info div.detail")
                 
-                if attributeName.lowercased().contains("release date") {
-                    additionalAttributes[.airDate] = attributeValue
+                for container in detailContainers {
+                    let attributeNameContainer = try container.select(".title-side")
+                    let attributeName = try attributeNameContainer.text()
+                    try attributeNameContainer.remove()
+                    let attributeValue = try container
+                        .text()
+                        .trimmingCharacters(in: .whitespacesAndNewlines)
+                    
+                    if attributeName.lowercased().contains("release date") {
+                        additionalAttributes[.airDate] = attributeValue
+                    }
                 }
+                
+                return Anime(
+                    reconstructedAnimeLink,
+                    alias: "",
+                    additionalAttributes: additionalAttributes,
+                    description: animeSynopsis,
+                    on: [ NASourceFourAnime.FourAnimeStream: "4anime" ],
+                    episodes: [ NASourceFourAnime.FourAnimeStream: episodes ],
+                    episodesAttributes: [:]
+                )
             }
-            
-            return Anime(
-                reconstructedAnimeLink,
-                alias: "",
-                additionalAttributes: additionalAttributes,
-                description: animeSynopsis,
-                on: [ NASourceFourAnime.FourAnimeStream: "4anime" ],
-                episodes: [ NASourceFourAnime.FourAnimeStream: episodes ],
-                episodesAttributes: [:]
-            )
         }
     }
 }
diff --git a/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Featured.swift b/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Featured.swift
index b8ca29d95..040b580c2 100644
--- a/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Featured.swift	
+++ b/NineAnimator/Models/Anime Source/4anime.to/FourAnime+Featured.swift	
@@ -27,6 +27,7 @@ extension NASourceFourAnime {
             let endpointURL = self.endpointURL
             let bowl = try SwiftSoup.parse(responseContent)
             let popularLinkElements = try bowl.select("#populartodaycontent>div a")
+            let recentLinkElements = try bowl.select("#urcontent>div a")
             
             let popularAnimeLinks = try popularLinkElements.compactMap {
                 aElement -> (a: Element, img: Element)? in
@@ -50,9 +51,35 @@ extension NASourceFourAnime {
                 }
             }
             
+            let recentAnimeLinks = try recentLinkElements.compactMap {
+                aElement -> (a: Element, img: Element)? in
+                if let imageElement = try aElement.select("img").first() {
+                    return (aElement, imageElement)
+                } else { return nil }
+            } .reduce(into: [AnimeLink]()) {
+                container, elements in
+                if let artworkPath = try? elements.img.attr("src"),
+                    let artworkUrl = URL(string: artworkPath, relativeTo: endpointURL),
+                    let animeTitle = try? elements.img.attr("title").replacingOccurrences(
+                        of: " Episode [\\d]+$",
+                        with: "",
+                        options: [ .regularExpression ]
+                    ),
+                    let animePath = try? elements.a.attr("href"),
+                    let animeUrl = URL(string: animePath, relativeTo: endpointURL) {
+                    // Construct and add anime link
+                    container.append(.init(
+                        title: animeTitle,
+                        link: animeUrl,
+                        image: artworkUrl,
+                        source: self
+                    ))
+                }
+            }
+            
             return BasicFeaturedContainer(
                 featured: popularAnimeLinks,
-                latest: []
+                latest: recentAnimeLinks
             )
         }
     }
diff --git a/NineAnimator/Models/User/User+HomeIntegration.swift b/NineAnimator/Models/User/User+HomeIntegration.swift
index a0b2ec41e..aa8bfcea9 100644
--- a/NineAnimator/Models/User/User+HomeIntegration.swift
+++ b/NineAnimator/Models/User/User+HomeIntegration.swift
@@ -19,7 +19,7 @@
 
 import Foundation
 
-// MARK: - Home Integration preferences
+// MARK: - Home Integration settings
 extension NineAnimatorUser {
     /// Configure NineAnimator to only run HomeKit tasks when the video is
     /// playing on external screens.
diff --git a/NineAnimator/Models/User/User+Preferences.swift b/NineAnimator/Models/User/User+Preferences.swift
index 7604fa6d0..f429c5437 100644
--- a/NineAnimator/Models/User/User+Preferences.swift
+++ b/NineAnimator/Models/User/User+Preferences.swift
@@ -19,7 +19,7 @@
 
 import Foundation
 
-// MARK: - Preferences
+// MARK: - Settings
 extension NineAnimatorUser {
     enum EpisodeListingOrder: String {
         /// List from the first episode to the last
@@ -158,7 +158,7 @@ extension NineAnimatorUser {
     ///
     /// This was disabled by default as of 1.1b2 since the WAF resolver is unstable
     /// and usually takes a long time to fallback to manual authentication.
-    /// Until the challenge resolver has stablized, there will be no preferences
+    /// Until the challenge resolver has stablized, there will be no settings
     /// menu option to enable this functionality.
     ///
     /// Re-enabled on 1.1b8 thanks to [Awsomedude](https://github.com/Awsomedude)
diff --git a/NineAnimatorScreenshotAutomation/ScreenshotAutomation.swift b/NineAnimatorScreenshotAutomation/ScreenshotAutomation.swift
index be6d3bb08..c5d98c8fe 100644
--- a/NineAnimatorScreenshotAutomation/ScreenshotAutomation.swift
+++ b/NineAnimatorScreenshotAutomation/ScreenshotAutomation.swift
@@ -52,7 +52,7 @@ class ScreenshotAutomation: XCTestCase {
         watchNextButton.tap()
         
         let tablesQuery = app.tables
-        tablesQuery.buttons["Preferences"].tap()
+        tablesQuery.buttons["Settings"].tap()
         tablesQuery.staticTexts["Third-Party Anime Lists"].tap()
         
         snapshot("TrackingServices")
diff --git a/README.md b/README.md
index 54d4c49b6..a20c3e80a 100644
--- a/README.md
+++ b/README.md
@@ -131,7 +131,7 @@ Or simply tap on the subscribe button when you are viewing any anime.
 NineAnimator can be configurated to run Home scenes when the playback starts and
 ends. The default behavior is to only run the scenes when the video is playing on
 external screens (e.g. Google Cast, AirPlay). However, you may change that in the
-`Preference` -> `Home` panel.
+`Settings` -> `Home` panel.
 
 - NineAnimator runs `Starts Playing` scene immediately after the video starts playing
 - The `Ends Playing` scene will be performed 15 seconds before video playback ends
@@ -153,7 +153,7 @@ When you browse an anime, depending on the device you are using, the NineAnimato
 will show up on the dock (iPad) or the task switcher of your other devices. You may tap
 on the icon to continue browsing or watching on the new device.
 
-To add a siri shortcut, navigate to the system preferences app. Find NineAnimator under
+To add a siri shortcut, navigate to the system settings app. Find NineAnimator under
 the root menu, tap `Siri & Search`, then tap `Shortcuts`.
 
 ## Backup History and Playback Progresses
@@ -162,7 +162,7 @@ NineAnimator can export the recently watched anime list and the playback histori
 a `.naconfig` file. You may use this file to restore anime to the Recents tab or sync
 progresses between devices.
 
-Navigate to the preferences menu and tap on the `Export History`, a share menu
+Navigate to the settings menu and tap on the `Export History`, a share menu
 will pop up.
 
 >
diff --git a/docs/third-party-lists.md b/docs/third-party-lists.md
index 9a34ede25..2d3e965e6 100644
--- a/docs/third-party-lists.md
+++ b/docs/third-party-lists.md
@@ -9,7 +9,7 @@
 NineAnimator can present information on a selection of third party listing websites. You can configure
 NineAnimator to push local playback history to those tracking services.
 
-The tracking services can be configured in the `Preferences` menu, under the `Anime Tracking Services`
+The tracking services can be configured in the `Settings` menu, under the `Anime Tracking Services`
 submenu in the `Data and Privacy` section.
 
 Supported tracking/listing services and capabilities: