From e12a82b47688d768886760eb40819c971b97fdda Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sun, 23 Jan 2022 10:58:36 -0500
Subject: [PATCH] Show local only posts on hometown instances

#130
---
 Tusker.xcodeproj/project.pbxproj              |  4 +
 .../Status/BaseStatusTableViewCell.swift      | 19 ++---
 .../ConversationMainStatusTableViewCell.swift |  3 +
 .../ConversationMainStatusTableViewCell.xib   | 32 ++++---
 .../Status/StatusMetaIndicatorsView.swift     | 85 +++++++++++++++++++
 .../Status/TimelineStatusTableViewCell.swift  |  9 +-
 .../Status/TimelineStatusTableViewCell.xib    | 45 +++-------
 7 files changed, 135 insertions(+), 62 deletions(-)
 create mode 100644 Tusker/Views/Status/StatusMetaIndicatorsView.swift

diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj
index 5aafa842..290817d2 100644
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@@ -117,6 +117,7 @@
 		D62D2424217ABF3F005076CC /* NSUserActivity+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2423217ABF3F005076CC /* NSUserActivity+Extensions.swift */; };
 		D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2425217ABF63005076CC /* UserActivityType.swift */; };
 		D62E9985279CA23900C26176 /* URLSession+Development.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9984279CA23900C26176 /* URLSession+Development.swift */; };
+		D62E9987279D094F00C26176 /* StatusMetaIndicatorsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9986279D094F00C26176 /* StatusMetaIndicatorsView.swift */; };
 		D62FF04823D7CDD700909D6E /* AttributedStringHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62FF04723D7CDD700909D6E /* AttributedStringHelperTests.swift */; };
 		D6311C5025B3765B00B27539 /* ImageDataCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6311C4F25B3765B00B27539 /* ImageDataCache.swift */; };
 		D6333B372137838300CE884A /* AttributedString+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B362137838300CE884A /* AttributedString+Helpers.swift */; };
@@ -523,6 +524,7 @@
 		D62D2423217ABF3F005076CC /* NSUserActivity+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSUserActivity+Extensions.swift"; sourceTree = "<group>"; };
 		D62D2425217ABF63005076CC /* UserActivityType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivityType.swift; sourceTree = "<group>"; };
 		D62E9984279CA23900C26176 /* URLSession+Development.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSession+Development.swift"; sourceTree = "<group>"; };
+		D62E9986279D094F00C26176 /* StatusMetaIndicatorsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusMetaIndicatorsView.swift; sourceTree = "<group>"; };
 		D62FF04723D7CDD700909D6E /* AttributedStringHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedStringHelperTests.swift; sourceTree = "<group>"; };
 		D6311C4F25B3765B00B27539 /* ImageDataCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageDataCache.swift; sourceTree = "<group>"; };
 		D6333B362137838300CE884A /* AttributedString+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AttributedString+Helpers.swift"; sourceTree = "<group>"; };
@@ -1222,6 +1224,7 @@
 				D663625E2135C75500C9CBA2 /* ConversationMainStatusTableViewCell.swift */,
 				D6C1B2072545D1EC00DAAA66 /* StatusCardView.swift */,
 				D6EE63FA2551F7F60065485C /* StatusCollapseButton.swift */,
+				D62E9986279D094F00C26176 /* StatusMetaIndicatorsView.swift */,
 			);
 			path = Status;
 			sourceTree = "<group>";
@@ -2256,6 +2259,7 @@
 				D6BC9DB5232D4CE3002CA326 /* NotificationsMode.swift in Sources */,
 				D68015402401A6BA00D6103B /* ComposingPrefsView.swift in Sources */,
 				D67895BC24671E6D00D4CD9E /* PKDrawing+Render.swift in Sources */,
+				D62E9987279D094F00C26176 /* StatusMetaIndicatorsView.swift in Sources */,
 				04D14BB022B34A2800642648 /* GalleryViewController.swift in Sources */,
 				D6C1B2082545D1EC00DAAA66 /* StatusCardView.swift in Sources */,
 				D6412B0524B0227D00F5412E /* ProfileViewController.swift in Sources */,
diff --git a/Tusker/Views/Status/BaseStatusTableViewCell.swift b/Tusker/Views/Status/BaseStatusTableViewCell.swift
index 0af7cd84..088c6f75 100644
--- a/Tusker/Views/Status/BaseStatusTableViewCell.swift
+++ b/Tusker/Views/Status/BaseStatusTableViewCell.swift
@@ -28,7 +28,7 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
     @IBOutlet weak var avatarImageView: UIImageView!
     @IBOutlet weak var displayNameLabel: EmojiLabel!
     @IBOutlet weak var usernameLabel: UILabel!
-    @IBOutlet weak var visibilityImageView: UIImageView!
+    @IBOutlet weak var metaIndicatorsView: StatusMetaIndicatorsView!
     @IBOutlet weak var contentWarningLabel: EmojiLabel!
     @IBOutlet weak var collapseButton: UIButton!
     @IBOutlet weak var contentTextView: StatusContentTextView!
@@ -43,27 +43,27 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
     private(set) var nextThreadLinkView: UIView?
     
     var statusID: String!
-    var accountID: String!
+    private(set) var accountID: String!
 
-    var favorited = false {
+    private var favorited = false {
         didSet {
             favoriteButton.tintColor = favorited ? UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1) : tintColor
         }
     }
-    var reblogged = false {
+    private var reblogged = false {
         didSet {
             reblogButton.tintColor = reblogged ? UIColor(displayP3Red: 1, green: 0.8, blue: 0, alpha: 1) : tintColor
         }
     }
     
-    var statusState: StatusState!
+    private(set) var statusState: StatusState!
     var collapsible = false {
         didSet {
             collapseButton.isHidden = !collapsible
             statusState?.collapsible = collapsible
         }
     }
-    var collapsed = false {
+    private var collapsed = false {
         didSet {
             statusState?.collapsed = collapsed
         }
@@ -242,11 +242,8 @@ class BaseStatusTableViewCell: UITableViewCell, MenuPreviewProvider {
     }
     
     func updateStatusIconsForPreferences(_ status: StatusMO) {
-        visibilityImageView.isHidden = !Preferences.shared.alwaysShowStatusVisibilityIcon
-        if Preferences.shared.alwaysShowStatusVisibilityIcon {
-            visibilityImageView.image = UIImage(systemName: status.visibility.unfilledImageName)
-            visibilityImageView.accessibilityLabel = String(format: NSLocalizedString("Visibility: %@", comment: "status visibility indicator accessibility label"), status.visibility.displayName)
-        }
+        metaIndicatorsView.updateUI(status: status)
+        
         let reblogButtonImage: UIImage
         if Preferences.shared.alwaysShowStatusVisibilityIcon || reblogButton.isEnabled {
             reblogButtonImage = UIImage(systemName: "repeat")!
diff --git a/Tusker/Views/Status/ConversationMainStatusTableViewCell.swift b/Tusker/Views/Status/ConversationMainStatusTableViewCell.swift
index 61d9ecda..fabc01ba 100644
--- a/Tusker/Views/Status/ConversationMainStatusTableViewCell.swift
+++ b/Tusker/Views/Status/ConversationMainStatusTableViewCell.swift
@@ -52,6 +52,9 @@ class ConversationMainStatusTableViewCell: BaseStatusTableViewCell {
         contentTextView.defaultFont = .systemFont(ofSize: 18)
         
         profileDetailContainerView.addInteraction(UIContextMenuInteraction(delegate: self))
+        
+        metaIndicatorsView.allowedIndicators = [.visibility, .localOnly]
+        metaIndicatorsView.squeezeHorizontal = true
     }
     
     override func doUpdateUI(status: StatusMO, state: StatusState) {
diff --git a/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib b/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib
index b91edc52..fe52bd1b 100644
--- a/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib
+++ b/Tusker/Views/Status/ConversationMainStatusTableViewCell.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" 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="18093"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -28,8 +29,8 @@
                                         <constraint firstAttribute="width" constant="50" id="Yxp-Vr-dfl"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" contentMode="left" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lZY-2e-17d" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
-                                    <rect key="frame" x="58" y="0.0" width="255" height="29"/>
+                                <label opaque="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="12" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lZY-2e-17d" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                                    <rect key="frame" x="58" y="0.0" width="146.5" height="29"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="24"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -40,29 +41,27 @@
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="globe" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="3Qu-IO-5wt">
-                                    <rect key="frame" x="321" y="0.5" width="22" height="20.5"/>
-                                    <color key="tintColor" systemColor="secondaryLabelColor"/>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xD6-dy-0XV" customClass="StatusMetaIndicatorsView" customModule="Tusker" customModuleProvider="target">
+                                    <rect key="frame" x="212.5" y="0.0" width="130.5" height="22"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="22" id="Kqh-qI-dSa"/>
-                                        <constraint firstAttribute="width" constant="22" id="QY1-tL-QHr"/>
+                                        <constraint firstAttribute="height" constant="22" placeholder="YES" id="wF5-Ii-LO5"/>
                                     </constraints>
-                                    <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="thin"/>
-                                </imageView>
+                                </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="trailing" secondItem="SWg-Ka-QyP" secondAttribute="trailing" id="4g6-BT-eW4"/>
+                                <constraint firstItem="xD6-dy-0XV" firstAttribute="top" secondItem="Cnd-Fj-B7l" secondAttribute="top" id="7Io-sX-c9k"/>
                                 <constraint firstItem="lZY-2e-17d" firstAttribute="top" secondItem="Cnd-Fj-B7l" secondAttribute="top" id="8fU-y9-K5Z"/>
                                 <constraint firstItem="lZY-2e-17d" firstAttribute="leading" secondItem="mB9-HO-1vf" secondAttribute="trailing" constant="8" id="Aqj-co-Szp"/>
-                                <constraint firstItem="3Qu-IO-5wt" firstAttribute="leading" secondItem="lZY-2e-17d" secondAttribute="trailing" constant="8" id="MS8-zq-SWT"/>
-                                <constraint firstAttribute="trailing" secondItem="3Qu-IO-5wt" secondAttribute="trailing" id="NWa-lL-aLk"/>
+                                <constraint firstItem="xD6-dy-0XV" firstAttribute="leading" secondItem="lZY-2e-17d" secondAttribute="trailing" constant="8" id="PfV-YZ-k9j"/>
                                 <constraint firstItem="mB9-HO-1vf" firstAttribute="top" secondItem="Cnd-Fj-B7l" secondAttribute="top" id="R7P-rD-Gbm"/>
                                 <constraint firstAttribute="bottom" secondItem="mB9-HO-1vf" secondAttribute="bottom" id="Wd0-Qh-idS"/>
                                 <constraint firstItem="mB9-HO-1vf" firstAttribute="leading" secondItem="Cnd-Fj-B7l" secondAttribute="leading" id="bxq-Fs-1aH"/>
                                 <constraint firstItem="SWg-Ka-QyP" firstAttribute="leading" secondItem="mB9-HO-1vf" secondAttribute="trailing" constant="8" id="e45-gE-myI"/>
                                 <constraint firstItem="SWg-Ka-QyP" firstAttribute="top" secondItem="lZY-2e-17d" secondAttribute="bottom" id="lvX-1b-8cN"/>
-                                <constraint firstItem="3Qu-IO-5wt" firstAttribute="top" secondItem="Cnd-Fj-B7l" secondAttribute="top" id="pPU-WS-Y6B"/>
+                                <constraint firstAttribute="trailing" secondItem="xD6-dy-0XV" secondAttribute="trailing" id="tfq-dR-UT7"/>
                             </constraints>
                         </view>
                         <label opaque="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" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
@@ -247,6 +246,7 @@
                 <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="metaIndicatorsView" destination="xD6-dy-0XV" id="Smp-ox-cvj"/>
                 <outlet property="moreButton" destination="Ujo-Ap-dmK" id="2ba-5w-HDx"/>
                 <outlet property="pollView" destination="TLv-Xu-tT1" id="hJX-YD-lNr"/>
                 <outlet property="profileDetailContainerView" destination="Cnd-Fj-B7l" id="wco-VB-VQx"/>
@@ -256,7 +256,6 @@
                 <outlet property="totalFavoritesButton" destination="yyj-Bs-Vjq" id="4pV-Qi-Z2X"/>
                 <outlet property="totalReblogsButton" destination="dem-vG-cPB" id="i9E-Qn-d76"/>
                 <outlet property="usernameLabel" destination="SWg-Ka-QyP" id="h2I-g4-AD9"/>
-                <outlet property="visibilityImageView" destination="3Qu-IO-5wt" id="sFB-ni-FcZ"/>
             </connections>
             <point key="canvasLocation" x="40.799999999999997" y="-122.78860569715144"/>
         </view>
@@ -265,8 +264,7 @@
         <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
         <image name="chevron.down" catalog="system" width="128" height="72"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
-        <image name="globe" catalog="system" width="128" height="121"/>
-        <image name="repeat" catalog="system" width="128" height="99"/>
+        <image name="repeat" catalog="system" width="128" height="98"/>
         <image name="star.fill" catalog="system" width="128" height="116"/>
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/Tusker/Views/Status/StatusMetaIndicatorsView.swift b/Tusker/Views/Status/StatusMetaIndicatorsView.swift
new file mode 100644
index 00000000..0524c4c0
--- /dev/null
+++ b/Tusker/Views/Status/StatusMetaIndicatorsView.swift
@@ -0,0 +1,85 @@
+//
+//  StatusMetaIndicatorsView.swift
+//  Tusker
+//
+//  Created by Shadowfacts on 1/22/22.
+//  Copyright © 2022 Shadowfacts. All rights reserved.
+//
+
+import UIKit
+import Pachyderm
+
+class StatusMetaIndicatorsView: UIView {
+    
+    var allowedIndicators: Indicator = .all
+    var squeezeHorizontal = false
+    private var images: [UIImageView] = []
+    
+    func updateUI(status: StatusMO) {
+        images.forEach { $0.removeFromSuperview() }
+        
+        var images: [UIImage] = []
+        
+        if allowedIndicators.contains(.reply) && Preferences.shared.showIsStatusReplyIcon && status.inReplyToID != nil {
+            images.append(UIImage(systemName: "bubble.left.and.bubble.right")!)
+        }
+        
+        if allowedIndicators.contains(.visibility) && Preferences.shared.alwaysShowStatusVisibilityIcon {
+            images.append(UIImage(systemName: status.visibility.unfilledImageName)!)
+        }
+        
+        if allowedIndicators.contains(.localOnly) && status.localOnly {
+            images.append(UIImage(systemName: "house")!)
+        }
+        
+        self.images = []
+        for (index, image) in images.enumerated() {
+            let v = UIImageView(image: image)
+            v.translatesAutoresizingMaskIntoConstraints = false
+            v.contentMode = .scaleAspectFit
+            v.tintColor = .secondaryLabel
+            v.preferredSymbolConfiguration = .init(weight: .thin)
+            addSubview(v)
+            
+            v.heightAnchor.constraint(equalToConstant: 22).isActive = true
+            if index % 2 == 0 {
+                if index == images.count - 1 {
+                    v.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
+                    v.leadingAnchor.constraint(greaterThanOrEqualTo: leadingAnchor).isActive = true
+                } else {
+                    v.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
+                }
+            } else {
+                if squeezeHorizontal {
+                    v.leadingAnchor.constraint(equalTo: self.images[index - 1].trailingAnchor, constant: 4).isActive = true
+                } else {
+                    v.leadingAnchor.constraint(greaterThanOrEqualTo: self.images[index - 1].trailingAnchor, constant: 4).isActive = true
+                }
+                v.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
+            }
+            
+            let row = index / 2
+            if row == 0 {
+                v.topAnchor.constraint(equalTo: topAnchor).isActive = true
+            } else {
+                v.topAnchor.constraint(equalTo: self.images[index - 1].bottomAnchor, constant: 4).isActive = true
+            }
+            v.bottomAnchor.constraint(lessThanOrEqualTo: bottomAnchor).isActive = true
+            
+            self.images.append(v)
+        }
+    }
+    
+}
+
+extension StatusMetaIndicatorsView {
+    struct Indicator: OptionSet {
+        let rawValue: Int
+        
+        static let reply = Indicator(rawValue: 1 << 0)
+        static let visibility = Indicator(rawValue: 1 << 1)
+        static let localOnly = Indicator(rawValue: 1 << 2)
+        
+        static let all: Indicator = [.reply, .visibility, .localOnly]
+    }
+}
diff --git a/Tusker/Views/Status/TimelineStatusTableViewCell.swift b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
index 9d43650d..8f34340a 100644
--- a/Tusker/Views/Status/TimelineStatusTableViewCell.swift
+++ b/Tusker/Views/Status/TimelineStatusTableViewCell.swift
@@ -22,7 +22,6 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     @IBOutlet weak var reblogLabel: EmojiLabel!
     @IBOutlet weak var timestampLabel: UILabel!
     @IBOutlet weak var pinImageView: UIImageView!
-    @IBOutlet weak var replyImageView: UIImageView!
     
     var reblogStatusID: String?
     var rebloggerID: String?
@@ -80,6 +79,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             updateRebloggerLabel(reblogger: status.account)
             
             status = rebloggedStatus
+            // necessary b/c statusID is initially set to the reblog status ID in updateUI(statusID:state:)
             statusID = rebloggedStatus.id
         } else {
             reblogStatusID = nil
@@ -117,9 +117,12 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     }
     
     override func updateStatusIconsForPreferences(_ status: StatusMO) {
+        if showReplyIndicator {
+            metaIndicatorsView.allowedIndicators = .all
+        } else {
+            metaIndicatorsView.allowedIndicators = .all.subtracting(.reply)
+        }
         super.updateStatusIconsForPreferences(status)
-        
-        replyImageView.isHidden = !Preferences.shared.showIsStatusReplyIcon || !showReplyIndicator || status.inReplyToID == nil
     }
     
     private func updateTimestamp() {
diff --git a/Tusker/Views/Status/TimelineStatusTableViewCell.xib b/Tusker/Views/Status/TimelineStatusTableViewCell.xib
index 38e5bb56..d015a92d 100644
--- a/Tusker/Views/Status/TimelineStatusTableViewCell.xib
+++ b/Tusker/Views/Status/TimelineStatusTableViewCell.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19115.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19107.4"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -141,28 +141,13 @@
                                         </label>
                                     </subviews>
                                 </stackView>
-                                <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="oie-wK-IpU">
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qBn-Gk-DCa" customClass="StatusMetaIndicatorsView" customModule="Tusker" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="54" width="50" height="22"/>
-                                    <subviews>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bubble.left.and.bubble.right" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="KdQ-Zn-IhD">
-                                            <rect key="frame" x="0.0" y="0.0" width="25.5" height="21.5"/>
-                                            <color key="tintColor" systemColor="secondaryLabelColor"/>
-                                            <accessibility key="accessibilityConfiguration" label="Is a reply"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="22" id="x0C-Qo-YVA"/>
-                                            </constraints>
-                                            <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="thin"/>
-                                        </imageView>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="globe" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="LRh-Cc-1br">
-                                            <rect key="frame" x="30.5" y="0.5" width="19.5" height="20.5"/>
-                                            <color key="tintColor" systemColor="secondaryLabelColor"/>
-                                            <constraints>
-                                                <constraint firstAttribute="height" constant="22" id="3Mk-NN-6fY"/>
-                                            </constraints>
-                                            <preferredSymbolConfiguration key="preferredSymbolConfiguration" weight="thin"/>
-                                        </imageView>
-                                    </subviews>
-                                </stackView>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="22" placeholder="YES" id="ipd-WE-P20"/>
+                                    </constraints>
+                                </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TUP-Nz-5Yh">
                                     <rect key="frame" x="0.0" y="169.5" width="335" height="26"/>
                                     <subviews>
@@ -226,15 +211,16 @@
                                 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="8" id="2Ao-Gj-fY3"/>
                                 <constraint firstItem="TUP-Nz-5Yh" firstAttribute="trailing" secondItem="ve3-Y1-NQH" secondAttribute="trailingMargin" id="3l0-tE-Ak1"/>
                                 <constraint firstItem="TUP-Nz-5Yh" firstAttribute="top" secondItem="gIY-Wp-RSk" secondAttribute="bottom" constant="-4" id="4KL-a3-qyf"/>
-                                <constraint firstItem="oie-wK-IpU" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="4" id="7Mp-WS-FhY"/>
-                                <constraint firstItem="TUP-Nz-5Yh" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="oie-wK-IpU" secondAttribute="bottom" id="7Xp-Sa-Rfk"/>
+                                <constraint firstItem="gIY-Wp-RSk" firstAttribute="leading" secondItem="qBn-Gk-DCa" secondAttribute="trailing" constant="8" id="AQs-QN-j49"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="top" secondItem="ve3-Y1-NQH" secondAttribute="top" id="PC4-Bi-QXm"/>
-                                <constraint firstItem="oie-wK-IpU" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="QKi-ny-jOJ"/>
                                 <constraint firstItem="TUP-Nz-5Yh" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="QZ2-iO-ckC"/>
                                 <constraint firstItem="gIY-Wp-RSk" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="top" id="fEd-wN-kuQ"/>
-                                <constraint firstItem="gIY-Wp-RSk" firstAttribute="leading" secondItem="oie-wK-IpU" secondAttribute="trailing" constant="8" id="fqd-p6-oGe"/>
+                                <constraint firstItem="TUP-Nz-5Yh" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="qBn-Gk-DCa" secondAttribute="bottom" id="gxb-hp-7lU"/>
                                 <constraint firstAttribute="trailingMargin" secondItem="gIY-Wp-RSk" secondAttribute="trailing" id="hKk-kO-wFT"/>
+                                <constraint firstItem="qBn-Gk-DCa" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="iLD-VU-ixJ"/>
                                 <constraint firstAttribute="bottom" secondItem="TUP-Nz-5Yh" secondAttribute="bottom" id="rmQ-QM-Llu"/>
+                                <constraint firstItem="qBn-Gk-DCa" firstAttribute="top" secondItem="QMP-j2-HLn" secondAttribute="bottom" constant="4" id="tKU-VP-n8P"/>
+                                <constraint firstItem="qBn-Gk-DCa" firstAttribute="width" secondItem="QMP-j2-HLn" secondAttribute="width" id="v1v-Pp-ubE"/>
                                 <constraint firstItem="QMP-j2-HLn" firstAttribute="leading" secondItem="ve3-Y1-NQH" secondAttribute="leading" id="zeW-tQ-uJl"/>
                             </constraints>
                         </view>
@@ -262,26 +248,23 @@
                 <outlet property="contentWarningLabel" destination="inI-Og-YiU" id="C7a-eK-qcx"/>
                 <outlet property="displayNameLabel" destination="gll-xe-FSr" id="vVS-WM-Wqx"/>
                 <outlet property="favoriteButton" destination="x0t-TR-jJ4" id="guV-yz-Lm6"/>
+                <outlet property="metaIndicatorsView" destination="qBn-Gk-DCa" id="HTg-JD-7zH"/>
                 <outlet property="moreButton" destination="982-J4-NGl" id="Pux-tL-aWe"/>
                 <outlet property="pinImageView" destination="wtt-8G-Ua1" id="mE8-oe-m1l"/>
                 <outlet property="pollView" destination="x3b-Zl-9F0" id="WIF-Oz-cnm"/>
                 <outlet property="reblogButton" destination="6tW-z8-Qh9" id="u2t-8D-kOn"/>
                 <outlet property="reblogLabel" destination="lDH-50-AJZ" id="uJf-Pt-cEP"/>
                 <outlet property="replyButton" destination="rKF-yF-KIa" id="rka-q1-o4a"/>
-                <outlet property="replyImageView" destination="KdQ-Zn-IhD" id="jqs-FK-K1N"/>
                 <outlet property="timestampLabel" destination="35d-EA-ReR" id="Ny2-nV-nqP"/>
                 <outlet property="usernameLabel" destination="j89-zc-SFa" id="bXX-FZ-fCp"/>
-                <outlet property="visibilityImageView" destination="LRh-Cc-1br" id="pxm-JK-jAz"/>
             </connections>
             <point key="canvasLocation" x="29.600000000000001" y="79.160419790104953"/>
         </view>
     </objects>
     <resources>
         <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
-        <image name="bubble.left.and.bubble.right" catalog="system" width="128" height="96"/>
         <image name="chevron.down" catalog="system" width="128" height="72"/>
         <image name="ellipsis" catalog="system" width="128" height="37"/>
-        <image name="globe" catalog="system" width="128" height="121"/>
         <image name="pin.fill" catalog="system" width="119" height="128"/>
         <image name="repeat" catalog="system" width="128" height="98"/>
         <image name="star.fill" catalog="system" width="128" height="116"/>