Merge branch 'dev'

LiangJianForum/Localization/en.lproj/Localizable.strings

@@ -63,16 +63,16 @@
 "🎊 Username: " = "🎊 Username:";
 "🏖️ Discussion Count: " = "🏖️ Discussion Count:";
 "🧬 Comment Count: " = "🧬 Comment Count:";
-"comment_sector" = "🍿Comment";
-"like_sector" = "🍺Like";
-"follow_sector" = "⛳️Follow";
+"comment_sector" = "Comment";
+"like_sector" = "Like";
+"money_sector" = "Asset History Record";
 "Information has been hidden" = "Information has been hidden";
 "Earned Badges" = "Earned Badges";
 "No Badges Earned Yet" = "No Badges Earned Yet";
 "🍾 In" = "🍾 In";
 "username" = "username";
 "password" = "password";
-"Copy" = "Copy";
+"copy_in_contextMenu" = "Copy the comment";
 "Text Copied" = "Text Copied";
 "post_tags_exceed_limit" = "Selected tags exceed the limit!";
 "latest_sort_discussion" = "Latest discussions";
@@ -83,3 +83,12 @@
 "hours later" = "%d hours later";
 "minutes later" = "%d minutes later";
 "very soon" = "very soon";
+"like_in_contextMenu" = "Like the comment";
+"pay_to_read_message" = "pay flarum money to read";
+"tabbar_operations" = "Options";
+"choose_to_quit" = "Sign out";
+"start_new_discussion_message" = "New Discussion";
+"profile_operations" = "Options";
+"hot_discussions" = "Hot Discussions";
+"old_discussions" = "Old Discussions";
+"frontPage_discussions" = "Frontpage Discussions";

LiangJianForum/Localization/zh-Hans.lproj/Localizable.strings

@@ -66,13 +66,13 @@
 "Information has been hidden" = "信息已隐藏";
 "Earned Badges" = "获得徽章";
 "No Badges Earned Yet" = "还没有获得的徽章哦";
-"comment_sector" = "🍿 评论";
-"like_sector" = "🍺 点赞";
-"follow_sector" = "⛳️ 关注";
+"comment_sector" = "评论";
+"like_sector" = "点赞";
+"money_sector" = "资产记录";
 "🍾 In" = "🍾 于";
 "username" = "用户名";
 "password" = "密码";
-"Copy" = "复制回复内容";
+"copy_in_contextMenu" = "复制评论";
 "Text Copied" = "复制成功！";
 "post_tags_exceed_limit" = "至多一个主标签与一个副标签！";
 "latest_sort_discussion" = "最新帖子";
@@ -82,4 +82,13 @@
 "days later" = "%d 天后";
 "hours later" = "%d 小时后";
 "minutes later" = "%d 分钟后";
-"very soon" = "马上";
+"very soon" = "几秒后";
+"like_in_contextMenu" = "点赞这条评论";
+"pay_to_read_message" = "支付量见币购买";
+"tabbar_operations" = "选项";
+"choose_to_quit" = "退出登录";
+"start_new_discussion_message" = "发表新帖";
+"profile_operations" = "选项";
+"hot_discussions" = "热门帖子";
+"old_discussions" = "陈年旧帖";
+"frontPage_discussions" = "精华帖子";

LiangJianForum/Model/DiscussionData.swift

@@ -38,7 +38,7 @@ struct DatumAttributes: Codable, Hashable {
     let isSticky: Bool
     let isLocked: Bool
     let hasPoll: Bool?
-    let hasBestAnswer: HasBestAnswer
+    let hasBestAnswer: HasBestAnswer?
     let frontpage: Bool?
 //    let canReply, canRename, canDelete, canHide: Bool
 //    let isApproved: Bool

LiangJianForum/Model/MoneyData.swift

@@ -0,0 +1,38 @@
+// This file was generated from JSON Schema using quicktype, do not modify it directly.
+// To parse the JSON, add this file to your project and do:
+//
+//   let moneyData = try? JSONDecoder().decode(MoneyData.self, from: jsonData)
+
+import Foundation
+
+// MARK: - MoneyData
+struct MoneyData: Codable, Hashable {
+    let data: [Datum10]
+}
+
+// MARK: - Datum
+struct Datum10: Codable, Hashable {
+    let type: String
+    let id: String
+    let attributes: Attributes10
+}
+
+// MARK: - Attributes
+struct Attributes10: Codable, Hashable {
+    let id: Int
+    let money: Double
+    let userID: Int
+    let createTime: String
+    let targetID, actorID: Int
+    let data, reason: String
+
+    enum CodingKeys: String, CodingKey {
+        case id, money
+        case userID = "user_id"
+        case createTime = "create_time "
+        case targetID = "target_id"
+        case actorID = "actor_id"
+        case data, reason
+    }
+}
+

LiangJianForum/Model/TagsData.swift

@@ -16,7 +16,7 @@ struct Datum6: Codable, Hashable {
     let type: String
     let id: String
     let attributes: Attributes6
-//    let relationships: Relationships6?
+    let relationships: Relationships6?
 }
 
 // MARK: - Attributes
@@ -34,15 +34,15 @@ struct Attributes6: Codable, Hashable {
     }
 }
 
-//// MARK: - Relationships
-//struct Relationships6: Codable {
-//    let parent: Parent6
-//}
-//
-//// MARK: - Parent
-//struct Parent6: Codable {
-//    let data: DataClass6
-//}
+// MARK: - Relationships
+struct Relationships6: Codable, Hashable {
+    let parent: Parent6
+}
+
+// MARK: - Parent
+struct Parent6: Codable, Hashable {
+    let data: DataClass6
+}
 
 // MARK: - DataClass
 struct DataClass6: Codable, Hashable {

LiangJianForum/Model/UserData.swift

@@ -36,16 +36,17 @@ struct Attributes2: Codable {
 }
 
 // MARK: - UserInclude
-struct UserInclude: Codable {
+struct UserInclude: Codable, Hashable {
     let type, id: String
     let attributes: Attributes
 }
 
 // MARK: - Attributes
-struct Attributes: Codable {
+struct Attributes: Codable, Hashable {
     let nameSingular, namePlural, color, icon: String?
     let isHidden: Int?
     let name: String?
     let description: String?
+    let backgroundColor: String?
 }
 

LiangJianForum/View/ContentView.swift

@@ -32,20 +32,46 @@ struct ContentView: View {
 
                 NoticeView()
                     .tabItem { Label("Message", systemImage: "bell.fill") }
+                    .tag(Tab.notice)
 
                 ProfileView()
                     .tabItem { Label("Me", systemImage: "person.crop.rectangle.stack") }
                     .tag(Tab.profile)
             }
+            .onAppear{
+                Task{
+                    await retrieveCurrentUserInformation()
+                }
+            }
             .environmentObject(appsettings)
         } else {
             LoginPageView()
                 .environmentObject(appsettings)
         }
     }
+
+    private func retrieveCurrentUserInformation() async {
+        guard let url = URL(string: "\(appsettings.FlarumUrl)/api/users/\(appsettings.userId)") else{
+            print("Invalid URL")
+            return
+        }
+        print("Fetching User Info : id \(appsettings.userId) at: \(url)")
+
+        do{
+            let (data, _) = try await URLSession.shared.data(from: url)
+
+            if let decodedResponse = try? JSONDecoder().decode(UserData.self, from: data){
+                appsettings.username = decodedResponse.data.attributes.username
+                appsettings.displayName = decodedResponse.data.attributes.displayName
+
+                if let avatarUrl = decodedResponse.data.attributes.avatarURL{
+                    appsettings.avatarUrl = avatarUrl
+                }
+            }
+        } catch {
+            print("Invalid user Data!" ,error)
+        }
+    }
 }
 
-//#Preview {
-//    ContentView()
-//}
 

LiangJianForum/View/Helper/AppSettings.swift

@@ -18,7 +18,14 @@ class AppSettings: ObservableObject {
     @Published var FlarumName = "量见"
     @Published var token = ""
     @Published var username = ""
+    @Published var displayName = ""
+    @Published var avatarUrl = ""
     @Published var userId = 0
+    @Published var vipUsernames: [String] = []
+
+    init() {
+        vipUsernames.append(contentsOf: ["RomanticD"])
+    }
 
     func refreshPost() {
         refreshPostView.toggle()

LiangJianForum/View/Helper/DateHelper.swift → LiangJianForum/View/Helper/Helper.swift

@@ -57,3 +57,53 @@ public func removeFirstCharacter(from colorString: String) -> String {
     let index = colorString.index(after: colorString.startIndex)
     return String(colorString[index...])
 }
+
+func getParentTagsFromFetching(from tags : [Datum6]) -> [Datum6]{
+    var parentTags = [Datum6]()
+
+    for item in tags{
+        if !item.attributes.isChild{
+            parentTags.append(item)
+        }
+    }
+    return parentTags
+}
+
+func getChildTags(parentTag : Datum6, dataFetched: [Datum6]) -> [Datum6]{
+    var childTags = [Datum6]()
+    let parentTagId = parentTag.id
+
+    for item in getChildTagsFromFetching(from: dataFetched){
+        if let targetTagId = item.relationships?.parent.data.id{
+            if targetTagId == parentTagId{
+                childTags.append(item)
+            }
+        }
+    }
+    return childTags
+}
+
+func getChildTagsFromFetching(from tags : [Datum6]) -> [Datum6]{
+    var childTags = [Datum6]()
+
+    for item in tags{
+        if item.attributes.isChild{
+            childTags.append(item)
+        }
+    }
+    return childTags
+}
+
+func getChildTagsId(parentTag : Datum6, dataFetched : [Datum6]) -> [String]? {
+    var childTagsIds = [String]()
+    let parentTagId = parentTag.id
+
+    for childTag in getChildTagsFromFetching(from: dataFetched){
+        if let targetTagId = childTag.relationships?.parent.data.id{
+            if targetTagId == parentTagId{
+                childTagsIds.append(childTag.id)
+            }
+        }
+    }
+    return childTagsIds
+}

LiangJianForum/View/Login/LoginPageView.swift

@@ -82,12 +82,11 @@ struct LoginPageView: View {
                     }) {
                         Text("Sign in")
                             .fontWeight(.bold)
+                            .foregroundColor(.white)
+                            .frame(width: 350, height: 50)
+                            .background(Color.blue)
+                            .cornerRadius(10)
                     }
-
-                    .foregroundColor(.white)
-                    .frame(width: 350, height: 50)
-                    .background(Color.blue)
-                    .cornerRadius(10)
                     .opacity(isAnimating ? 0.9 : 0)
                     .animation(.easeInOut(duration: 1.5), value: isAnimating)
                     .onDisappear {