CHANGELOG-release.md

@@ -1,18 +1,3 @@
-## 2023.6
-This update fixes a number of bugs and improves stability throughout the app. See below for a list of fixes.
-
-Bugfixes:
-- Fix issues displaying main post in the Conversation screen
-- Fix crash when opening the Compose screen in certain locales
-- Fix issues when collapsing from sidebar to tab bar mode
-- Fix incorrect UI being displayed when accessing certain parts of the app immediately after launch
-- Fix link card images not being blurred on posts marked sensitive
-- Fix links appearing with incorrect accent color intermittently
-- Fix being unable to remove followed hashtags from the Explore screen
-- Akkoma: Fix not being able to follow hashtags
-- Pleroma: Fix refreshing Mentions failing
-- iPhone: Fix ducked Compose screen disappearing when rotating on large phones
-
 ## 2023.5
 This update adds new several Compose-related features, including the ability to edit posts, a share sheet extension, and a post language picker. See below for the full list of improvements and bugfixes.
 

CHANGELOG.md

@@ -1,37 +1,5 @@
 # Changelog
 
-## 2023.6 (100)
-Bugfixes:
-- Fix Conversation main post flashing incorrect background color when touched
-- Fix reblogs count button in Conversation main post not being left-aligned
-- Fix Conversation main post flickering when context loaded
-- Fix context menu not appearing when long pressing finished/voted poll
-- Fix Tip Jar button width changing while purchasing
-- Fix crash when opening Compose screen in certain locales
-- Fix potential issue with Recognize Text context menu action on attachments
-- Fix attachment deletion context menu action not working
-- Fix crash when collapsing from sidebar to tab bar mode
-- Fix crash when post deleted before Notifications screen is loaded
-- Fix race conditions when accessing certain parts of the app immediately upon launch
-- Fix crash when viewing invalid user post notifications
-- Fix non-square avatars not displaying correctly in various places
-- Fix incorrect context menu preview being shown on filtered posts
-- Fix link card images not being blurred on sensitive posts
-- Fix reblog confirmation alert showing incorrect visibilities for non-public posts
-- Fix Home/Notifications tab switchers being cut off with smaller than default Dynamic Type sizes
-- Fix posts using incorrect accent color for links in certain circumstances
-- Fix not being able to remove followed hashtags from Explore screen
-- Fix not being able to attach images from Markup share sheet or Shortcuts share action
-- Fix very wide attachments being untappably short
-- Fix double posting in poor network conditions
-- Fix crash when autocompleting emoji on instances with a large number of custom emoji
-- Akkoma: Fix not being able to follow hashtags
-- Pleroma: Fix refreshing Mentions failing
-- iPhone: Fix ducked Compose screen breaking when rotating on Plus/Max iPhone models
-- iPhone: Fix Compose toolbar not extending to the full width of the screen in landscape on iPhone
-- iPadOS: Fix closing app dismissing in-app Safari
-- iPadOS: Fix reblog confirmation alert not being centered in split view
-
 ## 2023.5 (98)
 Bugfixes:
 - Fix broken animation when opening/closing expanded attachment view on Compose screen

Packages/InstanceFeatures/Sources/InstanceFeatures/InstanceFeatures.swift

@@ -72,7 +72,7 @@ public class InstanceFeatures: ObservableObject {
     
     public var probablySupportsMarkdown: Bool {
         switch instanceType {
-        case .pleroma(_), .mastodon(.glitch, _), .mastodon(.hometown(_), _), .firefish(_):
+        case .pleroma(_), .mastodon(.glitch, _), .mastodon(.hometown(_), _), .calckey(_):
             return true
         default:
             return false
@@ -195,8 +195,8 @@ public class InstanceFeatures: ObservableObject {
             instanceType = .pixelfed
         } else if nodeInfo?.software.name == "gotosocial" {
             instanceType = .gotosocial
-        } else if ver.contains("firefish") || ver.contains("calckey") {
+        } else if ver.contains("calckey") {
-            instanceType = .firefish(nodeInfo?.software.version)
+            instanceType = .calckey(nodeInfo?.software.version)
         } else {
             instanceType = .mastodon(.vanilla, Version(string: ver))
         }
@@ -235,7 +235,7 @@ extension InstanceFeatures {
         case pleroma(PleromaType)
         case pixelfed
         case gotosocial
-        case firefish(String?)
+        case calckey(String?)
         
         var isMastodon: Bool {
             if case .mastodon(_, _) = self {

Tusker.xcodeproj/project.pbxproj

@@ -2390,7 +2390,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2398,7 +2398,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2456,7 +2456,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2465,7 +2465,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2482,7 +2482,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2493,7 +2493,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2511,7 +2511,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2522,7 +2522,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2540,7 +2540,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = ShareExtension;
@@ -2551,7 +2551,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.ShareExtension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2695,7 +2695,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2703,7 +2703,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
@@ -2726,7 +2726,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2734,7 +2734,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				OTHER_CODE_SIGN_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2832,7 +2832,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2841,7 +2841,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -2858,7 +2858,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 100;
+				CURRENT_PROJECT_VERSION = 98;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3;
@@ -2867,7 +2867,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2023.6;
+				MARKETING_VERSION = 2023.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).Tusker.OpenInTusker";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Tusker/Views/Toast/ToastConfiguration.swift

@@ -153,8 +153,8 @@ private func captureError(_ error: Client.Error, in mastodonController: Mastodon
         event.tags!["instance_type"] = "pixelfed"
     case .gotosocial:
         event.tags!["instance_type"] = "gotosocial"
-    case .firefish(let calckeyVersion):
+    case .calckey(let calckeyVersion):
-        event.tags!["instance_type"] = "firefish"
+        event.tags!["instance_type"] = "calckey"
         if let calckeyVersion {
             event.tags!["calckey_version"] = calckeyVersion
         }