contribution parsing fixed

87kangsw · Jul 23, 2023 · 28c0226 · 28c0226
1 parent c2b1599
commit 28c0226
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/GitTime/Sources/ViewControllers/Activity/ActivityViewReactor.swift b/GitTime/Sources/ViewControllers/Activity/ActivityViewReactor.swift
@@ -263,25 +263,21 @@ final class ActivityViewReactor: ReactorKit.Reactor {
 		var profileURL: String = ""
 
 		if let doc = try? HTML(html: response.data, encoding: .utf8) {
-			if let calendar = doc.css("div.js-calendar-graph").first {
-				for weekdayRow in calendar.css("tbody tr") {
-					for rect in weekdayRow.css("td.ContributionCalendar-day") {
-
-						if var date = rect["data-date"],
-						   let dataLevel = rect["data-level"] {
-
-							date = date.replacingOccurrences(of: "\\", with: "")
-								.replacingOccurrences(of: "/", with: "")
-								.replacingOccurrences(of: "\"", with: "")
-
-							let colorType = ContributionHexColorTypes.allCases.first { $0.rawValue == Int(dataLevel) }
-							if let hexString = colorType?.hexString {
-								contributions.append(Contribution(date: date, contribution: Int(dataLevel)!, hexColor: hexString))
-							}
-						}
+			for rect in doc.css("td") {
+				if var date = rect["data-date"],
+				   let dataLevel = rect["data-level"] {
+
+					date = date.replacingOccurrences(of: "\\", with: "")
+						.replacingOccurrences(of: "/", with: "")
+						.replacingOccurrences(of: "\"", with: "")
+
+					let colorType = ContributionHexColorTypes.allCases.first { $0.rawValue == Int(dataLevel) }
+					if let hexString = colorType?.hexString {
+						contributions.append(Contribution(date: date, contribution: Int(dataLevel)!, hexColor: hexString))
 					}
 				}
 			}
+
 
 			for count in doc.css("h2, f4 text-normal mb-2") {
 				let decimalCharacters = CharacterSet.decimalDigits

diff --git a/GitTime/Sources/ViewControllers/Buddy/BuddyViewReactor.swift b/GitTime/Sources/ViewControllers/Buddy/BuddyViewReactor.swift
@@ -257,7 +257,7 @@ final class BuddyViewReactor: Reactor {
 		var profileURL: String = ""
 
 		if let doc = try? HTML(html: response.data, encoding: .utf8) {
-			for rect in doc.css("rect") {
+			for rect in doc.css("td") {
 				if var date = rect["data-date"],
 				   let dataLevel = rect["data-level"] {