Pachyderm/Response/Pagination.swift

@@ -44,16 +44,13 @@ extension Pagination {
             }
             let rel = segments.last?.replacingOccurrences(of: "\"", with: "").trimmingCharacters(in: .whitespaces).components(separatedBy: "=")
             
-            guard let urlStr = url,
+            guard let validURL = url,
-                let validURL = URL(string: urlStr),
                 let key = rel?.first,
                 key == "rel",
                 let value = rel?.last,
                 let kind = Kind(rawValue: value),
-                let components = URLComponents(url: validURL, resolvingAgainstBaseURL: false),
+                let components = URLComponents(string: validURL),
-                let queryItems = components.queryItems else {
+                let queryItems = components.queryItems else { return nil }
-                    return nil
-            }
             
             let min = queryItems.first { $0.name == "min_id" }?.value
             let since = queryItems.first { $0.name == "since_id" }?.value

Tusker/Preferences/Preferences.swift

@@ -47,7 +47,6 @@ class Preferences: Codable, ObservableObject {
         self.contentWarningCopyMode = try container.decode(ContentWarningCopyMode.self, forKey: .contentWarningCopyMode)
         self.openLinksInApps = try container.decode(Bool.self, forKey: .openLinksInApps)
         
-        self.showFavoriteAndReblogCounts = try container.decode(Bool.self, forKey: .showFavoriteAndReblogCounts)
         self.defaultNotificationsMode = try container.decode(NotificationsMode.self, forKey: .defaultNotificationsType)
         
         self.silentActions = try container.decode([String: Permission].self, forKey: .silentActions)
@@ -66,7 +65,6 @@ class Preferences: Codable, ObservableObject {
         try container.encode(contentWarningCopyMode, forKey: .contentWarningCopyMode)
         try container.encode(openLinksInApps, forKey: .openLinksInApps)
         
-        try container.encode(showFavoriteAndReblogCounts, forKey: .showFavoriteAndReblogCounts)
         try container.encode(defaultNotificationsMode, forKey: .defaultNotificationsType)
         
         try container.encode(silentActions, forKey: .silentActions)
@@ -88,7 +86,6 @@ class Preferences: Codable, ObservableObject {
     @Published var openLinksInApps = true
     
     // MARK: - Digital Wellness
-    @Published var showFavoriteAndReblogCounts = true
     @Published var defaultNotificationsMode = NotificationsMode.allNotifications
     
     // MARK: - Advanced
@@ -105,7 +102,6 @@ class Preferences: Codable, ObservableObject {
         case contentWarningCopyMode
         case openLinksInApps
         
-        case showFavoriteAndReblogCounts
         case defaultNotificationsType
         
         case silentActions

Tusker/Screens/Preferences/WellnessPrefsView.swift

@@ -9,29 +9,14 @@
 import SwiftUI
 
 struct WellnessPrefsView: View {
-    @Preference(\.showFavoriteAndReblogCounts) var showFavoriteAndReblogCounts: Bool
     @Preference(\.defaultNotificationsMode) var defaultNotificationsMode: NotificationsMode
-    
     var body: some View {
         List {
-            showFavAndReblogCountSection
             notificationsModeSection
         }.listStyle(GroupedListStyle())
             .navigationBarTitle(Text("Digital Wellness"))
     }
     
-    var showFavAndReblogCountSection: some View {
-        Section(footer: showFavAndReblogCountFooter) {
-            Toggle(isOn: _showFavoriteAndReblogCounts.binding) {
-                Text("Show Favorite and Reblog Counts")
-            }
-        }
-    }
-    
-    var showFavAndReblogCountFooter: some View {
-        Text("Control whether total favorite and reblog counts are shown for the main post in conversations.")
-    }
-    
     var notificationsModeSection: some View {
         Section(footer: notificationsModeFooter) {
             Picker(selection: _defaultNotificationsMode.binding, label: Text("Default Notifications Mode")) {

Tusker/Views/Status/ConversationMainStatusTableViewCell.swift

@@ -31,7 +31,6 @@ class ConversationMainStatusTableViewCell: UITableViewCell {
     @IBOutlet weak var collapseButton: UIButton!
     @IBOutlet weak var contentLabel: StatusContentLabel!
     @IBOutlet weak var avatarImageView: UIImageView!
-    @IBOutlet weak var favoriteAndReblogCountStackView: UIStackView!
     @IBOutlet weak var totalFavoritesButton: UIButton!
     @IBOutlet weak var totalReblogsButton: UIButton!
     @IBOutlet weak var timestampAndClientLabel: UILabel!
@@ -159,7 +158,6 @@ class ConversationMainStatusTableViewCell: UITableViewCell {
         
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
         displayNameLabel.text = account.realDisplayName
-        favoriteAndReblogCountStackView.isHidden = !Preferences.shared.showFavoriteAndReblogCounts
     }
 
     override func prepareForReuse() {

Tusker/Views/Status/ConversationMainStatusTableViewCell.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,7 +13,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="291"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="GuG-Qd-B8I">
+                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="GuG-Qd-B8I">
                     <rect key="frame" x="16" y="8" width="343" height="275"/>
                     <subviews>
                         <view contentMode="scaleToFill" verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="Cnd-Fj-B7l">
@@ -53,7 +53,7 @@
                             </constraints>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Content Warning" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cwQ-mR-L1b">
-                            <rect key="frame" x="0.0" y="58" width="138" height="20.5"/>
+                            <rect key="frame" x="0.0" y="58" width="343" height="20.5"/>
                             <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                             <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -73,30 +73,30 @@
                             </connections>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="251" verticalHuggingPriority="249" text="Content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TgY-hs-Klo" customClass="StatusContentLabel" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="124.5" width="70" height="55.5"/>
+                            <rect key="frame" x="0.0" y="124.5" width="343" height="47"/>
                             <fontDescription key="fontDescription" type="system" pointSize="20"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IF9-9U-Gk0" customClass="AttachmentsContainerView" customModule="Tusker" customModuleProvider="target">
-                            <rect key="frame" x="0.0" y="184" width="343" height="0.0"/>
+                            <rect key="frame" x="0.0" y="175.5" width="343" height="0.0"/>
                             <color key="backgroundColor" systemColor="secondarySystemBackgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" priority="999" constant="200" id="UMv-Bk-ZyY"/>
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ejU-sO-Og5">
-                            <rect key="frame" x="0.0" y="188" width="343" height="0.5"/>
+                            <rect key="frame" x="0.0" y="179.5" width="343" height="0.5"/>
                             <color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="0.5" id="DRI-lB-TyG"/>
                             </constraints>
                         </view>
                         <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="HZv-qj-gi6">
-                            <rect key="frame" x="0.0" y="196.5" width="142" height="18"/>
+                            <rect key="frame" x="0.0" y="188" width="343" height="18"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="252" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yyj-Bs-Vjq">
-                                    <rect key="frame" x="0.0" y="0.0" width="75" height="18"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="163.5" height="18"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="18" id="F9W-LW-swd"/>
                                     </constraints>
@@ -107,8 +107,15 @@
                                         <action selector="totalFavoritesPressed:" destination="iN0-l3-epB" eventType="touchUpInside" id="cj1-BB-TuR"/>
                                     </connections>
                                 </button>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dYU-Hk-ee3">
+                                    <rect key="frame" x="171.5" y="0.0" width="0.5" height="18"/>
+                                    <color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="0.5" id="kcB-YZ-hDW"/>
+                                    </constraints>
+                                </view>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dem-vG-cPB">
-                                    <rect key="frame" x="83" y="0.0" width="59" height="18"/>
+                                    <rect key="frame" x="180" y="0.0" width="163" height="18"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="18" id="k0P-W7-wMF"/>
                                     </constraints>
@@ -120,9 +127,19 @@
                                     </connections>
                                 </button>
                             </subviews>
+                            <constraints>
+                                <constraint firstItem="dem-vG-cPB" firstAttribute="width" secondItem="yyj-Bs-Vjq" secondAttribute="width" id="gcs-mS-vcQ"/>
+                            </constraints>
                         </stackView>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pcy-jH-lL9">
+                            <rect key="frame" x="0.0" y="214" width="343" height="0.5"/>
+                            <color key="backgroundColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="0.5" id="0Ga-Fr-g0g"/>
+                            </constraints>
+                        </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sep 7, 2019 12:12:53 PM • Web" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YHN-wG-YWi">
-                            <rect key="frame" x="0.0" y="222.5" width="213.5" height="18"/>
+                            <rect key="frame" x="0.0" y="222.5" width="343" height="18"/>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                             <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -174,7 +191,7 @@
                     <constraints>
                         <constraint firstItem="Cnd-Fj-B7l" firstAttribute="width" secondItem="GuG-Qd-B8I" secondAttribute="width" id="2hS-RG-81T"/>
                         <constraint firstItem="IF9-9U-Gk0" firstAttribute="width" secondItem="GuG-Qd-B8I" secondAttribute="width" id="8A8-wi-7sg"/>
-                        <constraint firstItem="8r8-O8-Agh" firstAttribute="width" secondItem="GuG-Qd-B8I" secondAttribute="width" id="bZv-bR-jJ3"/>
+                        <constraint firstItem="pcy-jH-lL9" firstAttribute="width" secondItem="GuG-Qd-B8I" secondAttribute="width" id="bPY-g6-swp"/>
                         <constraint firstItem="ejU-sO-Og5" firstAttribute="width" secondItem="GuG-Qd-B8I" secondAttribute="width" id="biK-oQ-SLy"/>
                         <constraint firstItem="3Bg-XP-d13" firstAttribute="width" secondItem="GuG-Qd-B8I" secondAttribute="width" id="iIq-gh-90O"/>
                         <constraint firstItem="3Fp-Nj-sVj" firstAttribute="width" secondItem="GuG-Qd-B8I" secondAttribute="width" id="kfI-WN-ouW"/>
@@ -197,7 +214,6 @@
                 <outlet property="contentLabel" destination="TgY-hs-Klo" id="SEi-B2-VQf"/>
                 <outlet property="contentWarningLabel" destination="cwQ-mR-L1b" id="5sm-PC-FIN"/>
                 <outlet property="displayNameLabel" destination="lZY-2e-17d" id="7og-23-eHy"/>
-                <outlet property="favoriteAndReblogCountStackView" destination="HZv-qj-gi6" id="jC9-cA-dXg"/>
                 <outlet property="favoriteButton" destination="DhN-rJ-jdA" id="b2Q-ch-kSP"/>
                 <outlet property="reblogButton" destination="GUG-f7-Hdy" id="WtT-Ph-DQm"/>
                 <outlet property="timestampAndClientLabel" destination="YHN-wG-YWi" id="Onb-fe-qwG"/>