fix item view. (#33)

Livinglist · May 8, 2023 · f51e76f · f51e76f
1 parent 46c1b85
commit f51e76f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Packages/HackerNewsKit/Sources/HackerNewsKit/Repositories/StoriesRepository.swift b/Packages/HackerNewsKit/Sources/HackerNewsKit/Repositories/StoriesRepository.swift
@@ -114,10 +114,12 @@ public class StoriesRepository {
             switch type {
             case "story":
                 let story = try? JSONDecoder().decode(Story.self, from: data)
-                return story
+                let filteredText = story?.text.htmlStripped.withExtraLineBreak
+                return story?.copyWith(text: filteredText)
             case "comment":
                 let comment = try? JSONDecoder().decode(Comment.self, from: data)
-                return comment
+                let filteredText = comment?.text.htmlStripped.withExtraLineBreak
+                return comment?.copyWith(text: filteredText)
             default:
                 return nil
             }

diff --git a/Shared/Models/ItemStore.swift b/Shared/Models/ItemStore.swift
@@ -14,7 +14,8 @@ extension ItemView {
         func loadKids(of cmt: Comment) async {
             if let parentIndex = kids.firstIndex(of: cmt),
                let kids = cmt.kids,
-               let level = cmt.level {
+               let level = cmt.level,
+               loadingItem == nil {
                 self.loadingItem = cmt.id
 
                 var comments = [Comment]()
@@ -23,11 +24,11 @@ extension ItemView {
                     comments.append(comment.copyWith(level: level + 1))
                 }
 
-                self.loadingItem = nil
                 self.loadedItems.insert(cmt.id)
                 withAnimation {
                     self.kids.insert(contentsOf: comments, at: parentIndex + 1)
                 }
+                self.loadingItem = nil
             }
         }
 

diff --git a/ZCombinator.xcodeproj/project.pbxproj b/ZCombinator.xcodeproj/project.pbxproj
@@ -967,7 +967,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "ZCombinator (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1005,7 +1005,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "ZCombinator (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;