feature/update-image-string-urls (#136)

Применил ко всем ссылкам кодировку urlQueryAllowed

Author: easydev991

SwiftUI-WorkoutApp/SWModels/Sources/SWModels/DialogResponse.swift

@@ -46,7 +46,7 @@ public struct DialogResponse: Codable, Identifiable {
 
 public extension DialogResponse {
     var anotherUserImageURL: URL? {
-        .init(string: anotherUserImageStringURL.valueOrEmpty)
+        anotherUserImageStringURL.queryAllowedURL
     }
 
     var lastMessageFormatted: String {

SwiftUI-WorkoutApp/SWModels/Sources/SWModels/EventResponse.swift

@@ -173,7 +173,7 @@ public extension EventResponse {
     }
 
     var previewImageURL: URL? {
-        .init(string: previewImageStringURL.valueOrEmpty)
+        previewImageStringURL.queryAllowedURL
     }
 
     var eventDateString: String {

SwiftUI-WorkoutApp/SWModels/Sources/SWModels/Journal/JournalEntryResponse.swift

@@ -40,7 +40,7 @@ public struct JournalEntryResponse: Codable, Identifiable {
 
 public extension JournalEntryResponse {
     var imageURL: URL? {
-        .init(string: authorImage.valueOrEmpty)
+        authorImage.queryAllowedURL
     }
 
     var formattedMessage: String {

SwiftUI-WorkoutApp/SWModels/Sources/SWModels/Journal/JournalResponse.swift

@@ -54,7 +54,7 @@ public struct JournalResponse: Codable, Identifiable, Equatable {
 
 public extension JournalResponse {
     var imageURL: URL? {
-        .init(string: lastMessageImage.valueOrEmpty)
+        lastMessageImage.queryAllowedURL
     }
 
     var title: String {

SwiftUI-WorkoutApp/SWModels/Sources/SWModels/MessageResponse.swift

@@ -16,7 +16,7 @@ public struct MessageResponse: Codable, Identifiable, Hashable {
 
 public extension MessageResponse {
     var imageURL: URL? {
-        .init(string: imageStringURL.valueOrEmpty)
+        imageStringURL.queryAllowedURL
     }
 
     var formattedMessage: String {

SwiftUI-WorkoutApp/SWModels/Sources/SWModels/SportsGround.swift

@@ -66,7 +66,7 @@ public final class SportsGround: NSObject, Codable, MKAnnotation, Identifiable {
     }
 
     public var previewImageURL: URL? {
-        .init(string: preview.valueOrEmpty)
+        preview.queryAllowedURL
     }
 
     public enum CodingKeys: String, CodingKey {
@@ -158,7 +158,7 @@ public struct Photo: Codable, Identifiable, Equatable {
     public let stringURL: String?
 
     public var imageURL: URL? {
-        .init(string: stringURL.valueOrEmpty)
+        stringURL.queryAllowedURL
     }
 
     public enum CodingKeys: String, CodingKey {

SwiftUI-WorkoutApp/SWModels/Sources/SWModels/UserResponse.swift

@@ -73,7 +73,7 @@ public extension UserResponse {
     }
 
     var avatarURL: URL? {
-        .init(string: imageStringURL.valueOrEmpty)
+        imageStringURL.queryAllowedURL
     }
 
     var gender: String {

SwiftUI-WorkoutApp/Utils/Sources/Utils/String+.swift

@@ -1,3 +1,5 @@
+import Foundation
+
 public extension String {
     @available(*, deprecated, message: "Нужно корректно парсить HTML")
     var withoutHTML: String {
@@ -19,3 +21,12 @@ public extension String {
         replacingOccurrences(of: " ", with: "")
     }
 }
+
+public extension String? {
+    /// `URL` без кириллицы
+    var queryAllowedURL: URL? {
+        guard let percentEncoded = self?.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
+        else { return nil }
+        return .init(string: percentEncoded)
+    }
+}

SwiftUI-WorkoutApp/Utils/Tests/UtilsTests/UtilsTests.swift

@@ -2,7 +2,7 @@
 import XCTest
 
 final class UtilsTests: XCTestCase {
-    func testStringValueOrEmpty() throws {
+    func testStringValueOrEmpty() {
         let string: String? = "Test string"
         let stringNil: String? = nil
         XCTAssertNil(stringNil)
@@ -11,7 +11,7 @@ final class UtilsTests: XCTestCase {
         XCTAssertEqual(string.valueOrEmpty, "Test string")
     }
 
-    func testIntValueOrZero() throws {
+    func testIntValueOrZero() {
         let one: Int? = 1
         let intNil: Int? = nil
         XCTAssertNil(intNil)
@@ -20,7 +20,7 @@ final class UtilsTests: XCTestCase {
         XCTAssertEqual(one.valueOrZero, 1)
     }
 
-    func testBoolIsTrue() throws {
+    func testBoolIsTrue() {
         let bool: Bool? = true
         let boolNil: Bool? = nil
         XCTAssertNil(boolNil)
@@ -29,15 +29,21 @@ final class UtilsTests: XCTestCase {
         XCTAssertEqual(bool.isTrue, true)
     }
 
-    func testStringWithoutHTML() throws {
+    func testStringWithoutHTML() {
         let htmlString = "<p>Строка с тегами html.<p>"
         let cleanString = htmlString.withoutHTML
         XCTAssertEqual(cleanString, "Строка с тегами html.")
     }
 
-    func testCapitalizingFirstLetter() throws {
+    func testCapitalizingFirstLetter() {
         let string = "test string"
         let newString = string.capitalizingFirstLetter
         XCTAssertEqual(newString, "Test string")
     }
+    
+    func testQueryAllowedURL() {
+        let urlString: String? = "https://workout.su/uploads/userfiles/св3.jpg"
+        let resultURL = urlString.queryAllowedURL
+        XCTAssertEqual(resultURL, URL(string: "https://workout.su/uploads/userfiles/%D1%81%D0%B23.jpg"))
+    }
 }