Skip to content

Feature/ios 418 if user adds the anonymous post all posts disappear from the list #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
volodymyr-chekyrta merged 1 commit into from
Mar 23, 2023
Merged

Feature/ios 418 if user adds the anonymous post all posts disappear from the list #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Discussion/Discussion/Data/Model/Data_CommentsResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public extension DataLayer {
// MARK: - Comments
struct Comments: Codable {
public let id: String
public let author: String
public let author: String?
public let authorLabel: String?
public let createdAt: String
public let updatedAt: String
Expand Down Expand Up @@ -75,7 +75,7 @@ public extension DataLayer {
case users
}

public init(id: String, author: String, authorLabel: String?, createdAt: String, updatedAt: String, rawBody: String,
public init(id: String, author: String?, authorLabel: String?, createdAt: String, updatedAt: String, rawBody: String,
renderedBody: String, abuseFlagged: Bool, voted: Bool, voteCount: Int, editableFields: [String],
canDelete: Bool, threadID: String, parentID: String?, endorsed: Bool, endorsedBy: String?,
endorsedByLabel: String?, endorsedAt: String?, childCount: Int, children: [String],
Expand Down Expand Up @@ -109,7 +109,7 @@ public extension DataLayer {
public extension DataLayer.Comments {
var domain: UserComment {
UserComment(
authorName: author,
authorName: author ?? DiscussionLocalization.anonymous,
authorAvatar: users?.userName?.profile?.image?.imageURLLarge ?? "",
postDate: Date(iso8601: createdAt),
postTitle: "",
Expand Down
4 changes: 2 additions & 2 deletions Discussion/Discussion/Data/Model/Data_CreatedComment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Core
public extension DataLayer {
struct CreatedComment: Codable {
public let id: String
public let author: String
public let author: String?
public let authorLabel: String?
public let createdAt: String
public let updatedAt: String
Expand Down Expand Up @@ -60,7 +60,7 @@ public extension DataLayer {

public extension DataLayer.CreatedComment {
var domain: Post {
Post(authorName: author,
Post(authorName: author ?? DiscussionLocalization.anonymous,
authorAvatar: "",
postDate: Date(iso8601: createdAt),
postTitle: "",
Expand Down
2 changes: 1 addition & 1 deletion Discussion/Discussion/Data/Model/Data_ThreadResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public extension DataLayer {
// MARK: - Thread
struct ThreadList: Codable {
public let id: String
public let author: String
public let author: String?
public let authorLabel: String?
public let createdAt: String
public let updatedAt: String
Expand Down
2 changes: 1 addition & 1 deletion Discussion/Discussion/Domain/Model/ThreadList.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Core

public extension DataLayer.ThreadList {
var domain: UserComment {
UserComment(authorName: author,
UserComment(authorName: author ?? DiscussionLocalization.anonymous,
authorAvatar: users?.userName?.profile?.image?.imageURLLarge ?? "",
postDate: Date(iso8601: createdAt),
postTitle: title,
Expand Down
2 changes: 1 addition & 1 deletion Discussion/Discussion/Domain/Model/UserThread.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public extension DataLayer.ThreadListsResponse {
var domain: ThreadLists {
let threadsReady = threads.map({
UserThread(id: $0.id,
author: $0.author,
author: $0.author ?? DiscussionLocalization.anonymous,
authorLabel: $0.authorLabel ?? "",
createdAt: Date(iso8601: $0.createdAt),
updatedAt: Date(iso8601: $0.updatedAt),
Expand Down
2 changes: 2 additions & 0 deletions Discussion/Discussion/SwiftGen/Strings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import Foundation
// swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length
// swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces
public enum DiscussionLocalization {
/// Anonymous
public static let anonymous = DiscussionLocalization.tr("Localizable", "ANONYMOUS", fallback: "Anonymous")
/// Plural format key: "%#@comments@"
public static func commentsCount(_ p1: Int) -> String {
return DiscussionLocalization.tr("Localizable", "comments_count", p1, fallback: "Plural format key: \"%#@comments@\"")
Expand Down
2 changes: 2 additions & 0 deletions Discussion/Discussion/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@
"SEARCH" = "Search";
"SEARCH.TITLE" = "Search results";
"SEARCH.EMPTY_DESCRIPTION" = "Start typing to find the topics";

"ANONYMOUS" = "Anonymous";
2 changes: 2 additions & 0 deletions Discussion/Discussion/uk.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@

"POST_TYPE.QUESTION" = "питання";
"POST_TYPE.DISCUSSION" = "дискусія";

"ANONYMOUS" = "Анонім";