From 5c09b1910f93545bcd7ace8d8101f0893488dc20 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 19 Sep 2022 22:52:52 -0400
Subject: [PATCH] Cleanup/reorganize some things

---
 Tusker.xcodeproj/project.pbxproj              | 20 ++++++-------------
 Tusker/{ => API}/InstanceFeatures.swift       |  0
 .../MastodonController.swift                  |  0
 Tusker/{Services => API}/PostService.swift    |  0
 Tusker/{Controllers => }/MenuController.swift | 14 -------------
 5 files changed, 6 insertions(+), 28 deletions(-)
 rename Tusker/{ => API}/InstanceFeatures.swift (100%)
 rename Tusker/{Controllers => API}/MastodonController.swift (100%)
 rename Tusker/{Services => API}/PostService.swift (100%)
 rename Tusker/{Controllers => }/MenuController.swift (90%)

diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj
index e098e284..0b863d60 100644
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@@ -1344,16 +1344,16 @@
 				D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */,
 				D64D0AAC2128D88B005A6F37 /* LocalData.swift */,
 				D6AC956623C4347E008C9946 /* MainSceneDelegate.swift */,
+				D6B81F432560390300F6E31D /* MenuController.swift */,
 				D64D8CA82463B494006B0BAA /* MultiThreadDictionary.swift */,
 				D6945C2E23AC47C3005C403C /* SavedDataManager.swift */,
 				D6C693EE216192C2007D6A6D /* TuskerNavigationDelegate.swift */,
 				D6DFC69F242C4CCC00ACC392 /* WeakArray.swift */,
-				D62E9988279DB2D100C26176 /* InstanceFeatures.swift */,
 				D63D8DF32850FE7A008D95E1 /* ViewTags.swift */,
 				D6D4DDD6212518A200E1C4BB /* Assets.xcassets */,
 				D6AEBB3F2321640F00E5038B /* Activities */,
+				D6F953F121251A2F00CF0F2B /* API */,
 				D6F1F84E2193B9BE00F5FE67 /* Caching */,
-				D6F953F121251A2F00CF0F2B /* Controllers */,
 				D6370B9924421FE00092A7FF /* CoreData */,
 				D667E5F62135C2ED0057A976 /* Extensions */,
 				D6D4DDD8212518A200E1C4BB /* LaunchScreen.storyboard */,
@@ -1361,7 +1361,6 @@
 				D61959D2241E846D00A37B8E /* Models */,
 				D663626021360A9600C9CBA2 /* Preferences */,
 				D641C780213DD7C4004B4513 /* Screens */,
-				D6E9CDA6281A426700BBC98E /* Services */,
 				D62D241E217AA46B005076CC /* Shortcuts */,
 				D67B506B250B28FF00FAECFB /* Vendor */,
 				D6BED1722126661300F02DA0 /* Views */,
@@ -1417,14 +1416,6 @@
 			path = OpenInTusker;
 			sourceTree = "<group>";
 		};
-		D6E9CDA6281A426700BBC98E /* Services */ = {
-			isa = PBXGroup;
-			children = (
-				D6E9CDA7281A427800BBC98E /* PostService.swift */,
-			);
-			path = Services;
-			sourceTree = "<group>";
-		};
 		D6F1F84E2193B9BE00F5FE67 /* Caching */ = {
 			isa = PBXGroup;
 			children = (
@@ -1447,13 +1438,14 @@
 			path = "Crash Reporter";
 			sourceTree = "<group>";
 		};
-		D6F953F121251A2F00CF0F2B /* Controllers */ = {
+		D6F953F121251A2F00CF0F2B /* API */ = {
 			isa = PBXGroup;
 			children = (
+				D62E9988279DB2D100C26176 /* InstanceFeatures.swift */,
 				D6F953EF21251A2900CF0F2B /* MastodonController.swift */,
-				D6B81F432560390300F6E31D /* MenuController.swift */,
+				D6E9CDA7281A427800BBC98E /* PostService.swift */,
 			);
-			path = Controllers;
+			path = API;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/Tusker/InstanceFeatures.swift b/Tusker/API/InstanceFeatures.swift
similarity index 100%
rename from Tusker/InstanceFeatures.swift
rename to Tusker/API/InstanceFeatures.swift
diff --git a/Tusker/Controllers/MastodonController.swift b/Tusker/API/MastodonController.swift
similarity index 100%
rename from Tusker/Controllers/MastodonController.swift
rename to Tusker/API/MastodonController.swift
diff --git a/Tusker/Services/PostService.swift b/Tusker/API/PostService.swift
similarity index 100%
rename from Tusker/Services/PostService.swift
rename to Tusker/API/PostService.swift
diff --git a/Tusker/Controllers/MenuController.swift b/Tusker/MenuController.swift
similarity index 90%
rename from Tusker/Controllers/MenuController.swift
rename to Tusker/MenuController.swift
index f96f6a8f..7c4d1519 100644
--- a/Tusker/Controllers/MenuController.swift
+++ b/Tusker/MenuController.swift
@@ -95,17 +95,3 @@ struct MenuController {
     }
     
 }
-
-extension MenuController {
-    class SidebarItem: NSObject, NSCopying {
-        let item: MainSidebarViewController.Item
-        
-        init(item: MainSidebarViewController.Item) {
-            self.item = item
-        }
-        
-        func copy(with zone: NSZone? = nil) -> Any {
-            return SidebarItem(item: self.item)
-        }
-    }
-}