From 6a8ee9a2fb25070fc5d091562387f253df36bc57 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sat, 16 Mar 2019 17:30:30 -0700
Subject: [PATCH] Perform minor cleanups in Account.

---
 Frameworks/Account/Account.swift | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift
index 567c5a51a..0eab0690d 100644
--- a/Frameworks/Account/Account.swift
+++ b/Frameworks/Account/Account.swift
@@ -82,9 +82,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 
 	private var startingUp = true
 
-	private struct SettingsKey {
-		static let unreadCount = "unreadCount"
-	}
 	public var dirty = false {
 		didSet {
 			queueSaveToDiskIfNeeded()
@@ -162,17 +159,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		delegate.refreshAll(for: self)
 	}
 
-	func metadata(feedID: String) -> FeedMetadata {
-		if let d = feedMetadata[feedID] {
-			assert(d.delegate === self)
-			return d
-		}
-		let d = FeedMetadata(feedID: feedID)
-		d.delegate = self
-		feedMetadata[feedID] = d
-		return d
-	}
-
 	public func update(_ feed: Feed, with parsedFeed: ParsedFeed, _ completion: @escaping RSVoidCompletionBlock) {
 
 		feed.takeSettings(from: parsedFeed)
@@ -697,6 +683,17 @@ private extension Account {
 
 private extension Account {
 
+	func metadata(feedID: String) -> FeedMetadata {
+		if let d = feedMetadata[feedID] {
+			assert(d.delegate === self)
+			return d
+		}
+		let d = FeedMetadata(feedID: feedID)
+		d.delegate = self
+		feedMetadata[feedID] = d
+		return d
+	}
+
 	func updateFlattenedFeeds() {
 		var feeds = Set<Feed>()
 		feeds.formUnion(topLevelFeeds)
@@ -709,7 +706,6 @@ private extension Account {
 	}
 
 	func rebuildFeedDictionaries() {
-
 		var idDictionary = [String: Feed]()
 
 		flattenedFeeds().forEach { (feed) in