From b91b3fa23d8ed5dcf40c9dc35bb26b620c794ab0 Mon Sep 17 00:00:00 2001 From: CMK Date: Sun, 5 Jun 2022 16:41:47 +0800 Subject: [PATCH] fix: use acct instead of username in profile header view --- .../Header/View/ProfileHeaderView+Configuration.swift | 2 +- .../Profile/Header/View/ProfileHeaderView+ViewModel.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift index aa5c32ab9..ac33227cc 100644 --- a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift +++ b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift @@ -33,7 +33,7 @@ extension ProfileHeaderView { .assign(to: \.name, on: viewModel) .store(in: &disposeBag) // username - viewModel.username = user.username + viewModel.acct = user.acctWithDomain // bio user.publisher(for: \.note) .assign(to: \.note, on: viewModel) diff --git a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift index f49abd8ec..808e1d7ba 100644 --- a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift +++ b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift @@ -33,7 +33,7 @@ extension ProfileHeaderView { @Published var name: String? @Published var nameEditing: String? - @Published var username: String? + @Published var acct: String? @Published var note: String? @Published var noteEditing: String? @@ -133,8 +133,8 @@ extension ProfileHeaderView.ViewModel { } .store(in: &disposeBag) // username - $username - .map { username in username.flatMap { "@" + $0 } ?? " " } + $acct + .map { acct in acct.flatMap { "@" + $0 } ?? " " } .assign(to: \.text, on: view.usernameLabel) .store(in: &disposeBag) // bio