CHANGELOG.md

@@ -1,18 +1,5 @@
 # Changelog
 
-## 2022.1 (35)
-Features/Improvements:
-- Add loading indicator to timelines/notifications/profiles
-- Show status preview in reblog confirmation dialog (Preferences -> Behavior -> Require confirmation Before Reblogging)
-- Add reblogging with unlisted/private visibility (requires reblog confirmation to be enabled)
-- Fix controls not hiding on iPhone 14 Pro
-- Improve account switching animation
-
-Bugfixes:
-- Fix crash when resizing window on iPad
-- Fix poll vote count displaying random number
-- Fix crash when opening emoji picker on instances that have duplicate emojis
-
 ## 2022.1 (33)
 Features/Improvements:
 - Show notifications when subscribed to other people's posts

Tusker.xcodeproj/project.pbxproj

@@ -2202,7 +2202,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2232,7 +2232,7 @@
 				CODE_SIGN_ENTITLEMENTS = Tusker/Tusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -2341,7 +2341,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -2368,7 +2368,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenInTusker/OpenInTusker.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 35;
+				CURRENT_PROJECT_VERSION = 33;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = OpenInTusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;

Tusker/InstanceFeatures.swift

@@ -10,11 +10,8 @@ import Foundation
 import Pachyderm
 
 struct InstanceFeatures {
-    private static let pleromaVersionRegex = try! NSRegularExpression(pattern: "\\(compatible; Pleroma (.*)\\)")
-    
     private(set) var instanceType = InstanceType.mastodon
     private(set) var version: Version?
-    private(set) var pleromaVersion: Version?
     private(set) var maxStatusChars = 500
     
     var localOnlyPosts: Bool {
@@ -46,8 +43,7 @@ struct InstanceFeatures {
     }
     
     var reblogVisibility: Bool {
-        (instanceType == .mastodon && hasVersion(2, 8, 0))
-            || (instanceType == .pleroma && hasVersion(2, 0, 0))
+        instanceType == .mastodon && hasVersion(2, 8, 0)
     }
     
     mutating func update(instance: Instance, nodeInfo: NodeInfo?) {
@@ -66,10 +62,6 @@ struct InstanceFeatures {
         
         version = Version(string: ver)
         
-        if let match = InstanceFeatures.pleromaVersionRegex.firstMatch(in: ver, range: NSRange(location: 0, length: ver.utf16.count)) {
-            pleromaVersion = Version(string: (ver as NSString).substring(with: match.range(at: 1)))
-        }
-        
         maxStatusChars = instance.maxStatusCharacters ?? 500
     }
     
@@ -103,8 +95,6 @@ extension InstanceFeatures {
 
 extension InstanceFeatures {
     struct Version: Equatable, Comparable {
-        private static let regex = try! NSRegularExpression(pattern: "^(\\d+)\\.(\\d+)\\.(\\d+).*$")
-        
         let major: Int
         let minor: Int
         let patch: Int
@@ -116,7 +106,8 @@ extension InstanceFeatures {
         }
         
         init?(string: String) {
-            guard let match = Version.regex.firstMatch(in: string, range: NSRange(location: 0, length: string.utf16.count)),
+            let regex = try! NSRegularExpression(pattern: "^(\\d+)\\.(\\d+)\\.(\\d+).*$")
+            guard let match = regex.firstMatch(in: string, range: NSRange(location: 0, length: string.utf16.count)),
                   match.numberOfRanges == 4 else {
                 return nil
             }