Merge branch 'release/1.0.1' into support-japanese

.github/ISSUE_TEMPLATE/issue.md

@@ -0,0 +1,32 @@
+## Description
+<!--Brief description for bug-->
+
+
+## App version 
+> You can check the version and build number in app setting footer.
+
+<!--Version Code here-->
+- Version: v0.0.0
+- Build: 0
+
+## Detail
+
+### Steps to reproduce
+
+<!--How to reproduce this bug?-->
+
+1. Tap …
+2. …
+
+### Actual Behavior
+
+<!--What happened?-->
+
+The app …
+
+###  Expected behavior
+
+<!--What is the expected behavior-->
+
+The app …
+

Mastodon.xcodeproj/project.pbxproj

@@ -4491,7 +4491,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = Mastodon/Info.plist;
@@ -4499,7 +4499,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4518,7 +4518,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = Mastodon/Info.plist;
@@ -4526,7 +4526,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4781,7 +4781,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = MastodonIntent/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4789,7 +4789,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.MastodonIntent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -4805,7 +4805,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = MastodonIntent/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4813,7 +4813,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.MastodonIntent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -4829,7 +4829,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = MastodonIntent/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4837,7 +4837,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.MastodonIntent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -4853,7 +4853,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = MastodonIntent/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4861,7 +4861,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.MastodonIntent;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -4877,7 +4877,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = ShareActionExtension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4885,7 +4885,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.ShareActionExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -4901,7 +4901,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = ShareActionExtension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4909,7 +4909,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.ShareActionExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -4925,7 +4925,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = ShareActionExtension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4933,7 +4933,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.ShareActionExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -4949,7 +4949,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = ShareActionExtension/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4957,7 +4957,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.ShareActionExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -5039,7 +5039,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = Mastodon/Info.plist;
@@ -5047,7 +5047,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5153,7 +5153,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -5161,7 +5161,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.NotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -5273,7 +5273,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = Mastodon/Info.plist;
@@ -5281,7 +5281,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5387,7 +5387,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -5395,7 +5395,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.NotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -5441,7 +5441,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -5449,7 +5449,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.NotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -5464,7 +5464,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50;
+				CURRENT_PROJECT_VERSION = 51;
 				DEVELOPMENT_TEAM = 5Z4GVSS33P;
 				INFOPLIST_FILE = NotificationService/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -5472,7 +5472,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app.NotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>AppShared.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>25</integer>
 		</dict>
 		<key>CoreDataStack.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>24</integer>
 		</dict>
 		<key>Mastodon - ASDK.xcscheme_^#shared#^_</key>
 		<dict>
@@ -37,7 +37,7 @@
 		<key>MastodonIntent.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>27</integer>
 		</dict>
 		<key>MastodonIntents.xcscheme_^#shared#^_</key>
 		<dict>
@@ -57,7 +57,7 @@
 		<key>ShareActionExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>23</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

Mastodon/Diffiable/Item/SettingsItem.swift

@@ -58,6 +58,7 @@ extension SettingsItem {
     
     enum Link: CaseIterable, Hashable {
         case accountSettings
+        case github
         case termsOfService
         case privacyPolicy
         case clearMediaCache
@@ -66,6 +67,7 @@ extension SettingsItem {
         var title: String {
             switch self {
             case .accountSettings:   return L10n.Scene.Settings.Section.BoringZone.accountSettings
+            case .github:            return "GitHub"
             case .termsOfService:    return L10n.Scene.Settings.Section.BoringZone.terms
             case .privacyPolicy:     return L10n.Scene.Settings.Section.BoringZone.privacy
             case .clearMediaCache:   return L10n.Scene.Settings.Section.SpicyZone.clear
@@ -76,6 +78,7 @@ extension SettingsItem {
         var textColor: UIColor {
             switch self {
             case .accountSettings:   return Asset.Colors.brandBlue.color
+            case .github:            return Asset.Colors.brandBlue.color
             case .termsOfService:    return Asset.Colors.brandBlue.color
             case .privacyPolicy:     return Asset.Colors.brandBlue.color
             case .clearMediaCache:   return .systemRed

Mastodon/Extension/MetaLabel.swift

@@ -66,7 +66,7 @@ extension MetaLabel {
 
         case .settingTableFooter:
             font = .preferredFont(forTextStyle: .body)
-            textColor = Asset.Colors.Label.primary.color
+            textColor = Asset.Colors.Label.secondary.color
             numberOfLines = 0
             textContainer.maximumNumberOfLines = 0
             paragraphStyle.alignment = .center

Mastodon/Scene/Compose/ComposeViewModel.swift

@@ -95,7 +95,36 @@ final class ComposeViewModel: NSObject {
         case .post, .hashtag, .mention:       self.title = CurrentValueSubject(L10n.Scene.Compose.Title.newPost)
         case .reply:                          self.title = CurrentValueSubject(L10n.Scene.Compose.Title.newReply)
         }
-        self.selectedStatusVisibility = CurrentValueSubject(context.authenticationService.activeMastodonAuthentication.value?.user.locked == true ? .private : .public)
+        self.selectedStatusVisibility = {
+            // default private when user locked
+            var visibility: ComposeToolbarView.VisibilitySelectionType = context.authenticationService.activeMastodonAuthentication.value?.user.locked == true ? .private : .public
+            // set visibility for reply post
+            switch composeKind {
+            case .reply(let repliedToStatusObjectID):
+                context.managedObjectContext.performAndWait {
+                    guard let status = try? context.managedObjectContext.existingObject(with: repliedToStatusObjectID) as? Status else {
+                        assertionFailure()
+                        return
+                    }
+                    guard let repliedStatusVisibility = status.visibilityEnum else { return }
+                    switch repliedStatusVisibility {
+                    case .public, .unlisted:
+                        // keep default
+                        break
+                    case .private:
+                        visibility = .private
+                    case .direct:
+                        visibility = .direct
+                    case ._other:
+                        assertionFailure()
+                        break
+                    }
+                }
+            default:
+                break
+            }
+            return CurrentValueSubject(visibility)
+        }()
         self.activeAuthentication = CurrentValueSubject(context.authenticationService.activeMastodonAuthentication.value)
         self.activeAuthenticationBox = CurrentValueSubject(context.authenticationService.activeMastodonAuthenticationBox.value)
         super.init()

Mastodon/Scene/HomeTimeline/HomeTimelineViewController.swift

@@ -388,7 +388,7 @@ extension HomeTimelineViewController: LoadMoreConfigurableTableViewContainer {
     typealias BottomLoaderTableViewCell = TimelineBottomLoaderTableViewCell
     typealias LoadingState = HomeTimelineViewModel.LoadOldestState.Loading
     var loadMoreConfigurableTableView: UITableView { return tableView }
-    var loadMoreConfigurableStateMachine: GKStateMachine { return viewModel.loadLatestStateMachine }
+    var loadMoreConfigurableStateMachine: GKStateMachine { return viewModel.loadOldestStateMachine }
 }
 
 // MARK: - UITableViewDelegate

Mastodon/Scene/Onboarding/Register/MastodonRegisterViewController.swift

@@ -744,13 +744,33 @@ extension MastodonRegisterViewController {
         let username = viewModel.username.value
         let email = viewModel.email.value
         let password = viewModel.password.value
+        
+        let locale: String = {
+            let fallbackLanguageCode = Locale.current.languageCode ?? "en"
+            guard let identifier = Locale.preferredLanguages.first else {
+                return fallbackLanguageCode
+            }
+            let local = Locale(identifier: identifier)
+            guard let languageCode = local.languageCode else {
+                return fallbackLanguageCode
+            }
+            switch languageCode {
+            case "zh":
+                // Check Simplified Chinese / Traditional Chinese
+                // https://github.com/gunchleoc/mastodon/blob/ed6153b8f24d3a8f5a124cc95683bd1f20aec882/app/helpers/settings_helper.rb
+                guard let regionCode = local.regionCode else { return languageCode }
+                return "zh" + "-" + regionCode
+            default:
+                return languageCode
+            }
+        }()
         let query = Mastodon.API.Account.RegisterQuery(
             reason: viewModel.reason.value,
             username: username,
             email: email,
             password: password,
             agreement: true, // user confirmed in the server rules scene
-            locale: Locale.current.languageCode ?? "en"
+            locale: locale
         )
  
         // register without show server rules

Mastodon/Scene/Settings/SettingsViewController.swift

@@ -105,18 +105,18 @@ class SettingsViewController: UIViewController, NeedsDependency {
     }()
 
     let tableFooterLabel = MetaLabel(style: .settingTableFooter)
-//    lazy var tableFooterView: UIView = {
+    lazy var tableFooterView: UIView = {
-//        // init with a frame to fix a conflict ('UIView-Encapsulated-Layout-Height' UIStackView:0x7ffe41e47da0.height == 0)
+        // init with a frame to fix a conflict ('UIView-Encapsulated-Layout-Height' UIStackView:0x7ffe41e47da0.height == 0)
-//        let view = UIStackView(frame: CGRect(x: 0, y: 0, width: 320, height: 320))
+        let view = UIStackView(frame: CGRect(x: 0, y: 0, width: 320, height: 320))
-//        view.isLayoutMarginsRelativeArrangement = true
+        view.isLayoutMarginsRelativeArrangement = true
-//        view.layoutMargins = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
+        view.layoutMargins = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
-//        view.axis = .vertical
+        view.axis = .vertical
-//        view.alignment = .center
+        view.alignment = .center
-//
+
-//        tableFooterLabel.linkDelegate = self
+        // tableFooterLabel.linkDelegate = self
-//        view.addArrangedSubview(tableFooterLabel)
+        view.addArrangedSubview(tableFooterLabel)
-//        return view
+        return view
-//    }()
+    }()
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -188,24 +188,31 @@ class SettingsViewController: UIViewController, NeedsDependency {
             }
             .store(in: &disposeBag)
 
-        viewModel.currentInstance
+        
-            .receive(on: RunLoop.main)
+        let footer = "Mastodon v\(UIApplication.appVersion()) (\(UIApplication.appBuild()))"
-            .sink { [weak self] instance in
+        let metaContent = PlaintextMetaContent(string: footer)
-                guard let self = self else { return }
+        tableFooterLabel.configure(content: metaContent)
-                let version = instance?.version ?? "-"
+        
-                let link = #"<a href="https://github.com/mastodon/mastodon">mastodon/mastodon</a>"#
+        // FIXME:
-                let content = L10n.Scene.Settings.Footer.mastodonDescription(link, version)
+        // needs a workaround for GitHub link
-                let mastodonContent = MastodonContent(content: content, emojis: [:])
+//        viewModel.currentInstance
-                do {
+//            .receive(on: RunLoop.main)
-                    let metaContent = try MastodonMetaContent.convert(document: mastodonContent)
+//            .sink { [weak self] instance in
-                    self.tableFooterLabel.configure(content: metaContent)
+//                guard let self = self else { return }
-                } catch {
+//                let version = instance?.version ?? "-"
-                    let metaContent = PlaintextMetaContent(string: "")
+//                let link = #"<a href="https://github.com/mastodon/mastodon">mastodon/mastodon</a>"#
-                    self.tableFooterLabel.configure(content: metaContent)
+//                let content = L10n.Scene.Settings.Footer.mastodonDescription(link, version)
-                    assertionFailure()
+//                let mastodonContent = MastodonContent(content: content, emojis: [:])
-                }
+//                do {
-            }
+//                    let metaContent = try MastodonMetaContent.convert(document: mastodonContent)
-            .store(in: &disposeBag)
+//                    self.tableFooterLabel.configure(content: metaContent)
+//                } catch {
+//                    let metaContent = PlaintextMetaContent(string: "")
+//                    self.tableFooterLabel.configure(content: metaContent)
+//                    assertionFailure()
+//                }
+//            }
+//            .store(in: &disposeBag)
     }
     
     private func setupView() {
@@ -259,7 +266,7 @@ class SettingsViewController: UIViewController, NeedsDependency {
             settingsAppearanceTableViewCellDelegate: self,
             settingsToggleCellDelegate: self
         )
-        // tableView.tableFooterView = tableFooterView
+        tableView.tableFooterView = tableFooterView
     }
     
     func alertToSignout() {
@@ -376,6 +383,13 @@ extension SettingsViewController: UITableViewDelegate {
                 guard let box = context.authenticationService.activeMastodonAuthenticationBox.value,
                       let url = URL(string: "https://\(box.domain)/auth/edit") else { return }
                 viewModel.openAuthenticationPage(authenticateURL: url, presentationContextProvider: self)
+            case .github:
+                guard let url = URL(string: "https://github.com/mastodon/mastodon-ios") else { break }
+                coordinator.present(
+                    scene: .safari(url: url),
+                    from: self,
+                    transition: .safariPresent(animated: true, completion: nil)
+                )
             case .termsOfService, .privacyPolicy:
                 // same URL
                 guard let url = viewModel.privacyURL else { break }

Mastodon/Scene/Settings/SettingsViewModel.swift

@@ -130,6 +130,7 @@ extension SettingsViewModel {
         let boringZoneSettingsItems: [SettingsItem] = {
             let links: [SettingsItem.Link] = [
                 .accountSettings,
+                .github,
                 .termsOfService,
                 .privacyPolicy
             ]

Podfile.lock

@@ -78,6 +78,6 @@ SPEC CHECKSUMS:
   Texture: 2f109e937850d94d1d07232041c9c7313ccddb81
   "UITextField+Shake": 298ac5a0f239d731bdab999b19b628c956ca0ac3
 
-PODFILE CHECKSUM: 1ea006302c191ee52b6206e4957aa78fb66fe690
+PODFILE CHECKSUM: 4db0bdf969729c5758bd923e33d9e097cb892086
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.2