bump to 1.5

Author: tealbathingsuit

Accord.xcodeproj/project.pbxproj

@@ -1191,7 +1191,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.4.2;
+				MARKETING_VERSION = 1.5;
 				OTHER_SWIFT_FLAGS = "";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = red.evelyn.accord;
@@ -1237,7 +1237,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.4.2;
+				MARKETING_VERSION = 1.5;
 				OTHER_SWIFT_FLAGS = "";
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = red.evelyn.accord;

Accord/UI/Base/Icons/FolderListView.swift

@@ -47,7 +47,7 @@ extension ServerListView {
 
         var body: some View {
             ForEach($appModel.folders, id: \.hashValue) { $folder in
-                if folder.guilds.count != 1 {
+                if folder.guilds.count > 1 {
                     Folder(
                         icon: Array(folder.guilds.prefix(4)),
                         color: self.color(folder),
@@ -65,6 +65,7 @@ extension ServerListView {
                         }
                     }
                     .padding(.bottom, 1)
+                    .id(folder.guilds.first?.id)
                 } else if let guild = $folder.guilds.first {
                     ServerIconCell(
                         guild: guild,
@@ -73,10 +74,11 @@ extension ServerListView {
                         selectedGuild: self.$selectedGuild
                     )
                     .fixedSize()
+                    .id(guild.id)
                 }
             }
             .padding(.trailing, 6)
-            .background(InsetGetter())
+            // .background(InsetGetter())
         }
     }
 }
@@ -151,17 +153,17 @@ struct ServerIconCell: View {
         }
         .buttonStyle(BorderlessButtonStyle())
         .redBadge($mentionCount)
-        .onPreferenceChange(FolderListHeightPreferenceKey.self, perform: { self.viewHeight = $0 })
-        .offset(x: 0, y: self.offsetY)
-        .zIndex(self.offsetY == .zero ? -1 : 1)
-        .gesture(
-            DragGesture()
-                .onChanged { gesture in
-                    self.offsetY = gesture.translation.height
-                }
-                .onEnded { gesture in
-                    print(viewHeight / gesture.translation.height)
-                }
-        )
+//        .onPreferenceChange(FolderListHeightPreferenceKey.self, perform: { self.viewHeight = $0 })
+//        .offset(x: 0, y: self.offsetY)
+//        .zIndex(self.offsetY == .zero ? -1 : 1)
+//        .gesture(
+//            DragGesture()
+//                .onChanged { gesture in
+//                    self.offsetY = gesture.translation.height
+//                }
+//                .onEnded { gesture in
+//                    print(viewHeight / gesture.translation.height)
+//                }
+//        )
     }
 }

Accord/UI/Base/ServerList/ServerListView+Init.swift

@@ -93,13 +93,12 @@ extension ServerListView {
         readyPacket.assignReadStates(appModel)
         readyPacket.order()
         var guildOrder = readyPacket.user_settings?.guild_positions ?? []
-        var folderTemp = readyPacket.user_settings?.guild_folders ?? []
-
+        let folderTemp = readyPacket.user_settings?.guild_folders ?? []
+        
         // Create a folder for every guild outside folders
         readyPacket.guilds.forEach { guild in
             if !guildOrder.contains(guild.id) {
                 guildOrder.insert(guild.id, at: 0)
-                folderTemp.insert(GuildFolder(name: nil, color: nil, guild_ids: [guild.id]), at: 0)
             }
         }
 

Accord/UI/Base/ServerList/ServerListView.swift

@@ -143,7 +143,6 @@ struct ServerListView: View {
             HStack(spacing: 0) {
                 ScrollView(.vertical, showsIndicators: false) {
                     // MARK: - Messages button
-                    
                     LazyVStack {
                         if reachability?.connected == false {
                             onlineButton.buttonStyle(BorderlessButtonStyle())

Accord/UI/Chat/Accessories/AttachmentView.swift

@@ -50,7 +50,6 @@ struct AttachmentView: View {
                         Request.fetch(url: URL(string: obj.url), headers: .init(type: .GET)) {
                             switch $0 {
                             case let .success(data):
-                                print(data)
                                 let path = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)[0]
                                     .appendingPathComponent(obj.filename)
                                 try? data.write(to: path)
@@ -70,6 +69,11 @@ struct AttachmentView: View {
                 }
                 .buttonStyle(.borderless)
                 .quickLookPreview(self.$quickLookURL)
+                .onChange(of: self.quickLookURL, perform: { [quickLookURL] url in
+                    if let quickLookURL, url == nil {
+                        try? FileManager.default.removeItem(at: quickLookURL)
+                    }
+                })
             } else if obj.content_type?.contains("gif") == true {
                 GifView(obj.url)
                     .cornerRadius(5)

Accord/UI/Chat/ChannelView/ChannelViewViewModel.swift

@@ -78,6 +78,7 @@ final class ChannelViewViewModel: ObservableObject, Equatable {
                         self.loadChannel(channel)
                     } else {
                         concurrentQueue.async {
+                            print("force resetting")
                             guard let new = try? Gateway(
                                 url: Gateway.gatewayURL,
                                 compress: UserDefaults.standard.value(forKey: "CompressGateway") as? Bool ?? true