Tusker.xcodeproj/project.pbxproj

@@ -128,6 +128,8 @@
 		D6538945214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6538944214D6D7500E3CEFC /* TableViewSwipeActionProvider.swift */; };
 		D65A37F321472F300087646E /* SwiftSoup.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6BED16E212663DA00F02DA0 /* SwiftSoup.framework */; };
 		D65F613423AEAB6600F3CFD3 /* OnboardingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D65F613323AEAB6600F3CFD3 /* OnboardingTests.swift */; };
+		D65F613623AFD65900F3CFD3 /* Ambassador.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D65F613523AFD65900F3CFD3 /* Ambassador.framework */; };
+		D65F613823AFD65D00F3CFD3 /* Embassy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D65F613723AFD65D00F3CFD3 /* Embassy.framework */; };
 		D663625D2135C74800C9CBA2 /* ConversationMainStatusTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D663625C2135C74800C9CBA2 /* ConversationMainStatusTableViewCell.xib */; };
 		D663625F2135C75500C9CBA2 /* ConversationMainStatusTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663625E2135C75500C9CBA2 /* ConversationMainStatusTableViewCell.swift */; };
 		D663626221360B1900C9CBA2 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D663626121360B1900C9CBA2 /* Preferences.swift */; };
@@ -163,8 +165,6 @@
 		D6945C3423AC6431005C403C /* AddSavedHashtagViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6945C3323AC6431005C403C /* AddSavedHashtagViewController.swift */; };
 		D6945C3823AC739F005C403C /* InstanceTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6945C3723AC739F005C403C /* InstanceTimelineViewController.swift */; };
 		D6945C3A23AC75E2005C403C /* FindInstanceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6945C3923AC75E2005C403C /* FindInstanceViewController.swift */; };
-		D6969E9E240C81B9002843CE /* NSTextAttachment+Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6969E9D240C81B9002843CE /* NSTextAttachment+Emoji.swift */; };
-		D6969EA0240C8384002843CE /* EmojiLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6969E9F240C8384002843CE /* EmojiLabel.swift */; };
 		D6A3BC7723218E1300FD64D5 /* TimelineSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7323218C6E00FD64D5 /* TimelineSegment.swift */; };
 		D6A3BC7923218E9200FD64D5 /* NotificationGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7823218E9200FD64D5 /* NotificationGroup.swift */; };
 		D6A3BC7C232195C600FD64D5 /* ActionNotificationGroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7A232195C600FD64D5 /* ActionNotificationGroupTableViewCell.swift */; };
@@ -181,8 +181,6 @@
 		D6A5BB3123BBAD87003BF21D /* JSONResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A5BB3023BBAD87003BF21D /* JSONResponse.swift */; };
 		D6A5FAF1217B7E05003DB2D9 /* ComposeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A5FAF0217B7E05003DB2D9 /* ComposeViewController.xib */; };
 		D6AC956723C4347E008C9946 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AC956623C4347E008C9946 /* SceneDelegate.swift */; };
-		D6ACE1AC240C3BAD004EA8E2 /* Ambassador.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D65F613023AE99E000F3CFD3 /* Ambassador.framework */; };
-		D6ACE1AD240C3BAD004EA8E2 /* Embassy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D65F612D23AE990C00F3CFD3 /* Embassy.framework */; };
 		D6AEBB3E2321638100E5038B /* UIActivity+Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB3D2321638100E5038B /* UIActivity+Types.swift */; };
 		D6AEBB412321642700E5038B /* SendMesasgeActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB402321642700E5038B /* SendMesasgeActivity.swift */; };
 		D6AEBB432321685E00E5038B /* OpenInSafariActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6AEBB422321685E00E5038B /* OpenInSafariActivity.swift */; };
@@ -445,8 +443,6 @@
 		D6945C3323AC6431005C403C /* AddSavedHashtagViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSavedHashtagViewController.swift; sourceTree = "<group>"; };
 		D6945C3723AC739F005C403C /* InstanceTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceTimelineViewController.swift; sourceTree = "<group>"; };
 		D6945C3923AC75E2005C403C /* FindInstanceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FindInstanceViewController.swift; path = Tusker/Screens/FindInstanceViewController.swift; sourceTree = SOURCE_ROOT; };
-		D6969E9D240C81B9002843CE /* NSTextAttachment+Emoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextAttachment+Emoji.swift"; sourceTree = "<group>"; };
-		D6969E9F240C8384002843CE /* EmojiLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiLabel.swift; sourceTree = "<group>"; };
 		D6A3BC7323218C6E00FD64D5 /* TimelineSegment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineSegment.swift; sourceTree = "<group>"; };
 		D6A3BC7823218E9200FD64D5 /* NotificationGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationGroup.swift; sourceTree = "<group>"; };
 		D6A3BC7A232195C600FD64D5 /* ActionNotificationGroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionNotificationGroupTableViewCell.swift; sourceTree = "<group>"; };
@@ -535,6 +531,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D65F613823AFD65D00F3CFD3 /* Embassy.framework in Frameworks */,
+				D65F613623AFD65900F3CFD3 /* Ambassador.framework in Frameworks */,
 				D61099C02144B0CC00432DC2 /* Pachyderm.framework in Frameworks */,
 				D6B0539F23BD2BA300A066FA /* SheetController in Frameworks */,
 				D65A37F321472F300087646E /* SwiftSoup.framework in Frameworks */,
@@ -554,8 +552,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D6ACE1AC240C3BAD004EA8E2 /* Ambassador.framework in Frameworks */,
-				D6ACE1AD240C3BAD004EA8E2 /* Embassy.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -978,7 +974,6 @@
 				D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */,
 				D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */,
 				D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */,
-				D6969E9D240C81B9002843CE /* NSTextAttachment+Emoji.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -1118,7 +1113,6 @@
 				D620483323D3801D008A63EF /* LinkTextView.swift */,
 				D620483523D38075008A63EF /* ContentTextView.swift */,
 				D620483723D38190008A63EF /* StatusContentTextView.swift */,
-				D6969E9F240C8384002843CE /* EmojiLabel.swift */,
 				D641C77E213DC78A004B4513 /* InlineTextAttachment.swift */,
 				04ED00B021481ED800567C53 /* SteppedProgressView.swift */,
 				D627943A23A55BA600D38C68 /* NavigableTableViewCell.swift */,
@@ -1520,7 +1514,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#if [ \"${CONFIGURATION}\" == \"Debug\" ]; then\n#    echo \"Embedding ${SCRIPT_INPUT_FILE_0}\"\n#    cp -R $SCRIPT_INPUT_FILE_0 $SCRIPT_OUTPUT_FILE_0\n#    codesign --force --verbose --sign $EXPANDED_CODE_SIGN_IDENTITY $SCRIPT_OUTPUT_FILE_0\n#    \n#    echo \"Embedding ${SCRIPT_INPUT_FILE_1}\"\n#    cp -R $SCRIPT_INPUT_FILE_1 $SCRIPT_OUTPUT_FILE_1\n#    codesign --force --verbose --sign $EXPANDED_CODE_SIGN_IDENTITY $SCRIPT_OUTPUT_FILE_1\n#else\n#    echo \"Skipping embedding debug frameworks\"\n#fi\n";
+			shellScript = "if [ \"${CONFIGURATION}\" == \"Debug\" ]; then\n    echo \"Embedding ${SCRIPT_INPUT_FILE_0}\"\n    cp -R $SCRIPT_INPUT_FILE_0 $SCRIPT_OUTPUT_FILE_0\n    codesign --force --verbose --sign $EXPANDED_CODE_SIGN_IDENTITY $SCRIPT_OUTPUT_FILE_0\n    \n    echo \"Embedding ${SCRIPT_INPUT_FILE_1}\"\n    cp -R $SCRIPT_INPUT_FILE_1 $SCRIPT_OUTPUT_FILE_1\n    codesign --force --verbose --sign $EXPANDED_CODE_SIGN_IDENTITY $SCRIPT_OUTPUT_FILE_1\nelse\n    echo \"Skipping embedding debug frameworks\"\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -1595,7 +1589,6 @@
 				04DACE8C212CB14B009840C4 /* MainTabBarViewController.swift in Sources */,
 				D6AEBB412321642700E5038B /* SendMesasgeActivity.swift in Sources */,
 				D6BC9DB1232C61BC002CA326 /* NotificationsPageViewController.swift in Sources */,
-				D6969E9E240C81B9002843CE /* NSTextAttachment+Emoji.swift in Sources */,
 				D6BC9DB3232D4C07002CA326 /* WellnessPrefsView.swift in Sources */,
 				0454DDAF22B462EF00B8BB8E /* GalleryExpandAnimationController.swift in Sources */,
 				D64BC18F23C18B9D000D0238 /* FollowRequestNotificationTableViewCell.swift in Sources */,
@@ -1668,7 +1661,6 @@
 				D627943E23A564D400D38C68 /* ExploreViewController.swift in Sources */,
 				D6B053AB23BD2F1400A066FA /* AssetCollectionViewCell.swift in Sources */,
 				D6434EB3215B1856001A919A /* XCBRequest.swift in Sources */,
-				D6969EA0240C8384002843CE /* EmojiLabel.swift in Sources */,
 				D64BC18623C1253A000D0238 /* AssetPreviewViewController.swift in Sources */,
 				D663626221360B1900C9CBA2 /* Preferences.swift in Sources */,
 				D626493823C0FD0000612E6E /* AllPhotosTableViewCell.swift in Sources */,
@@ -2010,7 +2002,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -2018,7 +2009,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2020.1;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Tusker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2035,7 +2025,6 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = V4WK9KR9U2;
 				INFOPLIST_FILE = Tusker/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -2043,7 +2032,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2020.1;
 				PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Tusker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Tusker/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,98 @@
 {
   "images" : [
     {
-      "filename" : "20x20@2x.png",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "size" : "20x20",
-      "size" : "20x20"
+      "scale" : "2x"
     },
     {
-      "filename" : "20x20@3x.png",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "size" : "20x20",
-      "size" : "20x20"
+      "scale" : "3x"
     },
     {
-      "filename" : "29x29@2x.png",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "size" : "29x29",
-      "size" : "29x29"
+      "scale" : "2x"
     },
     {
-      "filename" : "29x29@3x.png",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "size" : "29x29",
-      "size" : "29x29"
+      "scale" : "3x"
     },
     {
-      "filename" : "40x40@2x.png",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "size" : "40x40",
-      "size" : "40x40"
+      "scale" : "2x"
     },
     {
-      "filename" : "40x40@3x.png",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "size" : "40x40",
-      "size" : "40x40"
+      "scale" : "3x"
     },
     {
-      "filename" : "60x60@2x.png",
       "idiom" : "iphone",
-      "scale" : "2x",
+      "size" : "60x60",
-      "size" : "60x60"
+      "scale" : "2x"
     },
     {
-      "filename" : "60x60@3x.png",
       "idiom" : "iphone",
-      "scale" : "3x",
+      "size" : "60x60",
-      "size" : "60x60"
+      "scale" : "3x"
     },
     {
-      "filename" : "20x20@1x.png",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "size" : "20x20",
-      "size" : "20x20"
+      "scale" : "1x"
     },
     {
-      "filename" : "20x20@2x-1.png",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "size" : "20x20",
-      "size" : "20x20"
+      "scale" : "2x"
     },
     {
-      "filename" : "29x29@1x.png",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "size" : "29x29",
-      "size" : "29x29"
+      "scale" : "1x"
     },
     {
-      "filename" : "29x29@2x-1.png",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "size" : "29x29",
-      "size" : "29x29"
+      "scale" : "2x"
     },
     {
-      "filename" : "40x40@1x.png",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "size" : "40x40",
-      "size" : "40x40"
+      "scale" : "1x"
     },
     {
-      "filename" : "40x40@2x-1.png",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "size" : "40x40",
-      "size" : "40x40"
+      "scale" : "2x"
     },
     {
-      "filename" : "76x76@1x.png",
       "idiom" : "ipad",
-      "scale" : "1x",
+      "size" : "76x76",
-      "size" : "76x76"
+      "scale" : "1x"
     },
     {
-      "filename" : "76x76@2x.png",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "size" : "76x76",
-      "size" : "76x76"
+      "scale" : "2x"
     },
     {
-      "filename" : "83.5x83.5@2x.png",
       "idiom" : "ipad",
-      "scale" : "2x",
+      "size" : "83.5x83.5",
-      "size" : "83.5x83.5"
+      "scale" : "2x"
     },
     {
-      "filename" : "1024x1024@1x.png",
       "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "size" : "1024x1024",
-      "size" : "1024x1024"
+      "scale" : "1x"
     }
   ],
   "info" : {
-    "author" : "xcode",
+    "version" : 1,
-    "version" : 1
+    "author" : "xcode"
   }
 }

Tusker/Extensions/Account+Preferences.swift

@@ -11,22 +11,16 @@ import Pachyderm
 
 extension Account {
     
-    var displayOrUserName: String {
+    var realDisplayName: String {
         if displayName.isEmpty {
             return username
+        } else if Preferences.shared.hideCustomEmojiInUsernames {
+            return stripCustomEmoji(from: displayName)
         } else {
             return displayName
         }
     }
     
-    var displayNameWithoutCustomEmoji: String {
-        if displayName.isEmpty {
-            return username
-        } else {
-            return stripCustomEmoji(from: displayName)
-        }
-    }
-    
     private static let customEmojiRegex = try! NSRegularExpression(pattern: ":[a-zA-Z0-9_]+:", options: [])
     
     private func stripCustomEmoji(from string: String) -> String {

Tusker/Extensions/NSTextAttachment+Emoji.swift

@@ -1,29 +0,0 @@
-//
-//  NSTextAttachment+Emoji.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 3/1/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-
-extension NSTextAttachment {
-    // Based on https://github.com/ReticentJohn/Amaroq/blob/7c5b7088eb9fd1611dcb0f47d43bf8df093e142c/DireFloof/InlineImageHelpers.m
-    convenience init(emojiImage image: UIImage, in font: UIFont, with textColor: UIColor = .label) {
-        let adjustedCapHeight = font.capHeight - 1
-        var imageSizeMatchingFontSize = CGSize(width: image.size.width * (adjustedCapHeight / image.size.height), height: adjustedCapHeight)
-        
-        let defaultScale: CGFloat = 1.4
-        imageSizeMatchingFontSize = CGSize(width: imageSizeMatchingFontSize.width * defaultScale, height: imageSizeMatchingFontSize.height * defaultScale)
-        
-        UIGraphicsBeginImageContextWithOptions(imageSizeMatchingFontSize, false, 0.0)
-        textColor.set()
-        image.draw(in: CGRect(origin: .zero, size: imageSizeMatchingFontSize))
-        let attachmentImage = UIGraphicsGetImageFromCurrentImageContext()
-        UIGraphicsEndImageContext()
-        
-        self.init()
-        self.image = attachmentImage
-    }
-}

Tusker/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>1.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

Tusker/Screens/Compose/ComposeViewController.swift

@@ -203,7 +203,7 @@ class ComposeViewController: UIViewController {
         replyAvatarImageViewTopConstraint!.isActive = true
         
         inReplyToContainer.isHidden = false
-        inReplyToLabel.text = "In reply to \(inReplyTo.account.displayOrUserName)"
+        inReplyToLabel.text = "In reply to \(inReplyTo.account.realDisplayName)"
     }
     
     override func viewWillAppear(_ animated: Bool) {

Tusker/Screens/Profile/ProfileTableViewController.swift

@@ -129,7 +129,7 @@ class ProfileTableViewController: EnhancedTableViewController {
     
     @objc func updateUIForPreferences() {
         guard let accountID = accountID, let account = mastodonController.cache.account(for: accountID) else { return }
-        navigationItem.title = account.displayOrUserName
+        navigationItem.title = account.realDisplayName
     }
     
     func getStatuses(for range: RequestRange = .default, onlyPinned: Bool = false, completion: @escaping Client.Callback<[Status]>) {

Tusker/Shortcuts/UserActivityManager.swift

@@ -37,8 +37,8 @@ class UserActivityManager {
         activity.isEligibleForPrediction = true
         if let mentioning = mentioning {
             activity.userInfo = ["mentioning": mentioning.acct]
-            activity.title = "Send a message to \(mentioning.displayOrUserName)"
+            activity.title = "Send a message to \(mentioning.realDisplayName)"
-            activity.suggestedInvocationPhrase = "Send a message to \(mentioning.displayOrUserName)"
+            activity.suggestedInvocationPhrase = "Send a message to \(mentioning.realDisplayName)"
         } else {
             activity.userInfo = [:]
             activity.title = "New Post"

Tusker/Views/Account Cell/AccountTableViewCell.swift

@@ -14,7 +14,7 @@ class AccountTableViewCell: UITableViewCell {
     var mastodonController: MastodonController! { delegate?.apiController }
     
     @IBOutlet weak var avatarImageView: UIImageView!
-    @IBOutlet weak var displayNameLabel: EmojiLabel!
+    @IBOutlet weak var displayNameLabel: UILabel!
     @IBOutlet weak var usernameLabel: UILabel!
     
     var accountID: String!
@@ -35,7 +35,7 @@ class AccountTableViewCell: UITableViewCell {
         guard let account = mastodonController.cache.account(for: accountID) else {
             fatalError("Missing cached account \(accountID!)")
         }
-        displayNameLabel.updateForAccountDisplayName(account: account)
+        displayNameLabel.text = account.realDisplayName
     }
     
     func updateUI(accountID: String) {

Tusker/Views/Account Cell/AccountTableViewCell.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16082.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -26,7 +26,7 @@
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Iif-9m-vM5">
                         <rect key="frame" x="74" y="11" width="230" height="44"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Display Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fhc-bZ-lkB" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Display Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fhc-bZ-lkB">
                                 <rect key="frame" x="0.0" y="0.0" width="230" height="26"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>

Tusker/Views/Account Detail/LargeAccountDetailView.swift

@@ -12,7 +12,7 @@ import Pachyderm
 class LargeAccountDetailView: UIView {
 
     var avatarImageView = UIImageView()
-    var displayNameLabel = EmojiLabel()
+    var displayNameLabel = UILabel()
     var usernameLabel = UILabel()
     
     var avatarRequest: ImageCache.Request?
@@ -66,7 +66,7 @@ class LargeAccountDetailView: UIView {
     }
     
     func update(account: Account) {
-        displayNameLabel.updateForAccountDisplayName(account: account)
+        displayNameLabel.text = account.realDisplayName
         usernameLabel.text = "@\(account.acct)"
         
         avatarRequest = ImageCache.avatars.get(account.avatar) { [weak self] (data) in

Tusker/Views/Compose Status Reply/ComposeStatusReplyView.swift

@@ -14,7 +14,7 @@ class ComposeStatusReplyView: UIView {
     weak var mastodonController: MastodonController?
 
     @IBOutlet weak var avatarImageView: UIImageView!
-    @IBOutlet weak var displayNameLabel: EmojiLabel!
+    @IBOutlet weak var displayNameLabel: UILabel!
     @IBOutlet weak var usernameLabel: UILabel!
     @IBOutlet weak var statusContentTextView: StatusContentTextView!
     
@@ -40,7 +40,7 @@ class ComposeStatusReplyView: UIView {
     }
     
     func updateUI(for status: Status) {
-        displayNameLabel.updateForAccountDisplayName(account: status.account)
+        displayNameLabel.text = status.account.realDisplayName
         usernameLabel.text = "@\(status.account.acct)"
         statusContentTextView.overrideMastodonController = mastodonController
         statusContentTextView.statusID = status.id

Tusker/Views/Compose Status Reply/ComposeStatusReplyView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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="16082.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -23,7 +23,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2cE-sS-Uut">
                     <rect key="frame" x="66" y="8" width="301" height="651"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sdv-dB-Plm" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sdv-dB-Plm">
                             <rect key="frame" x="0.0" y="0.0" width="107" height="20.5"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                             <nil key="textColor"/>

Tusker/Views/ContentTextView.swift

@@ -69,7 +69,7 @@ class ContentTextView: LinkTextView {
                     continue
                 }
                 
-                let attachment = NSTextAttachment(emojiImage: emojiImage, in: self.font!, with: self.textColor ?? .label)
+                let attachment = self.createEmojiTextAttachment(image: emojiImage, index: match.range.location)
                 let attachmentStr = NSAttributedString(attachment: attachment)
                 mutAttrString.replaceCharacters(in: match.range, with: attachmentStr)
             }
@@ -80,6 +80,28 @@ class ContentTextView: LinkTextView {
         }
     }
     
+    // Based on https://github.com/ReticentJohn/Amaroq/blob/7c5b7088eb9fd1611dcb0f47d43bf8df093e142c/DireFloof/InlineImageHelpers.m
+    private func createEmojiTextAttachment(image: UIImage, index: Int) -> NSTextAttachment {
+        let font = self.font!
+        
+        let adjustedCapHeight = font.capHeight - 1
+        var imageSizeMatchingFontSize = CGSize(width: image.size.width * (adjustedCapHeight / image.size.height), height: adjustedCapHeight)
+        
+        let defaultScale: CGFloat = 1.4
+        imageSizeMatchingFontSize = CGSize(width: imageSizeMatchingFontSize.width * defaultScale, height: imageSizeMatchingFontSize.height * defaultScale)
+        let textColor = self.textColor ?? UIColor.label
+        
+        UIGraphicsBeginImageContextWithOptions(imageSizeMatchingFontSize, false, 0.0)
+        textColor.set()
+        image.draw(in: CGRect(origin: .zero, size: imageSizeMatchingFontSize))
+        let attachmentImage = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+        
+        let attachment = NSTextAttachment()
+        attachment.image = attachmentImage
+        return attachment
+    }
+
     // MARK: - HTML Parsing
     func setTextFromHtml(_ html: String) {
         let doc = try! SwiftSoup.parse(html)

Tusker/Views/EmojiLabel.swift

@@ -1,94 +0,0 @@
-//
-//  EmojiLabel.swift
-//  Tusker
-//
-//  Created by Shadowfacts on 3/1/20.
-//  Copyright © 2020 Shadowfacts. All rights reserved.
-//
-
-import UIKit
-import Pachyderm
-
-private let emojiRegex = try! NSRegularExpression(pattern: ":(\\w+):", options: [])
-
-class EmojiLabel: UILabel {
-    
-    private var emojiIdentifier: String?
-    private var emojiRequests: [ImageCache.Request] = []
-    
-    func setEmojis(_ emojis: [Emoji], identifier: String) {
-        guard emojis.count > 0, self.emojiIdentifier != identifier, let attributedText = attributedText else { return }
-        
-        self.emojiIdentifier = identifier
-        emojiRequests.forEach { $0.cancel() }
-        emojiRequests = []
-        
-        let matches = emojiRegex.matches(in: attributedText.string, options: [], range: attributedText.fullRange)
-        let emojiImages = CachedDictionary<UIImage>(name: "EmojiLabel Emoji Images")
-        
-        let group = DispatchGroup()
-        
-        for emoji in emojis {
-            // only make requests for emojis that are present in the text to avoid making unnecessary network requests
-            guard matches.contains(where: { (match) in
-                let matchShortcode = (attributedText.string as NSString).substring(with: match.range(at: 1))
-                return emoji.shortcode == matchShortcode
-            }) else {
-                continue
-            }
-            
-            group.enter()
-            let request = ImageCache.emojis.get(emoji.url) { (data) in
-                defer { group.leave() }
-                guard let data = data, let image = UIImage(data: data) else {
-                    return
-                }
-                emojiImages[emoji.shortcode] = image
-            }
-            if let request = request {
-                emojiRequests.append(request)
-            }
-        }
-        
-        group.notify(queue: .main) { [weak self] in
-            // if e.g. the account changes before all emojis are loaded, don't bother trying to set them
-            guard let self = self, self.emojiIdentifier == identifier else { return }
-            
-            let mutAttrString = NSMutableAttributedString(attributedString: attributedText)
-            // replaces the emojis starting from the end of the string as to not alter the indicies of preceeding emojis
-            for match in matches.reversed() {
-                let shortcode = (mutAttrString.string as NSString).substring(with: match.range(at: 1))
-                guard let emojiImage = emojiImages[shortcode] else {
-                    continue
-                }
-                
-                let attachment = NSTextAttachment(emojiImage: emojiImage, in: self.font, with: self.textColor)
-                let attachmentStr = NSAttributedString(attachment: attachment)
-                mutAttrString.replaceCharacters(in: match.range, with: attachmentStr)
-            }
-            
-            self.attributedText = mutAttrString
-            self.setNeedsLayout()
-            self.setNeedsDisplay()
-        }
-    }
-    
-    func removeEmojis() {
-        emojiIdentifier = nil
-        emojiRequests.forEach { $0.cancel() }
-        emojiRequests = []
-    }
-    
-}
-
-extension EmojiLabel {
-    func updateForAccountDisplayName(account: Account) {
-        if Preferences.shared.hideCustomEmojiInUsernames {
-            self.text = account.displayNameWithoutCustomEmoji
-            self.removeEmojis()
-        } else {
-            self.text = account.displayOrUserName
-            self.setEmojis(account.emojis, identifier: account.id)
-        }
-    }
-}

Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift

@@ -115,10 +115,8 @@ class ActionNotificationGroupTableViewCell: UITableViewCell {
             delay = nil
         }
         if let delay = delay {
-            if updateTimestampWorkItem == nil {
+            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                self.updateTimestamp()
-                    self?.updateTimestamp()
-                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {
@@ -140,11 +138,11 @@ class ActionNotificationGroupTableViewCell: UITableViewCell {
         // todo: figure out how to localize this
         switch people.count {
         case 1:
-            peopleStr = people.first!.displayOrUserName
+            peopleStr = people.first!.realDisplayName
         case 2:
-            peopleStr = people.first!.displayOrUserName + " and " + people.last!.displayOrUserName
+            peopleStr = people.first!.realDisplayName + " and " + people.last!.realDisplayName
         default:
-            peopleStr = people.dropLast().map { $0.displayOrUserName }.joined(separator: ", ") + ", and " + people.last!.displayOrUserName
+            peopleStr = people.dropLast().map { $0.realDisplayName }.joined(separator: ", ") + ", and " + people.last!.realDisplayName
         }
         actionLabel.text = "\(verb) by \(peopleStr)"
     }

Tusker/Views/Notifications/FollowNotificationGroupTableViewCell.swift

@@ -76,11 +76,11 @@ class FollowNotificationGroupTableViewCell: UITableViewCell {
         let peopleStr: String
         switch people.count {
         case 1:
-            peopleStr = people.first!.displayOrUserName
+            peopleStr = people.first!.realDisplayName
         case 2:
-            peopleStr = people.first!.displayOrUserName + " and " + people.last!.displayOrUserName
+            peopleStr = people.first!.realDisplayName + " and " + people.last!.realDisplayName
         default:
-            peopleStr = people.dropLast().map { $0.displayOrUserName }.joined(separator: ", ") + ", and " + people.last!.displayOrUserName
+            peopleStr = people.dropLast().map { $0.realDisplayName }.joined(separator: ", ") + ", and " + people.last!.realDisplayName
 
         }
         actionLabel.text = "Followed by \(peopleStr)"
@@ -104,10 +104,8 @@ class FollowNotificationGroupTableViewCell: UITableViewCell {
             delay = nil
         }
         if let delay = delay {
-            if updateTimestampWorkItem == nil {
+            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                self.updateTimestamp()
-                    self?.updateTimestamp()
-                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {

Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.swift

@@ -17,7 +17,7 @@ class FollowRequestNotificationTableViewCell: UITableViewCell {
     @IBOutlet weak var stackView: UIStackView!
     @IBOutlet weak var avatarImageView: UIImageView!
     @IBOutlet weak var timestampLabel: UILabel!
-    @IBOutlet weak var actionLabel: EmojiLabel!
+    @IBOutlet weak var actionLabel: UILabel!
     @IBOutlet weak var actionButtonsStackView: UIStackView!
     @IBOutlet weak var acceptButton: UIButton!
     @IBOutlet weak var rejectButton: UIButton!
@@ -53,13 +53,7 @@ class FollowRequestNotificationTableViewCell: UITableViewCell {
     
     func updateUI(account: Account) {
         self.account = account
-        if Preferences.shared.hideCustomEmojiInUsernames {
+        actionLabel.text = "Request to follow from \(account.realDisplayName)"
-            actionLabel.text = "Request to follow from \(account.displayNameWithoutCustomEmoji)"
-            actionLabel.removeEmojis()
-        } else {
-            actionLabel.text = "Request to follow from \(account.displayOrUserName)"
-            actionLabel.setEmojis(account.emojis, identifier: account.id)
-        }
         avatarRequest = ImageCache.avatars.get(account.avatar) { [weak self] (data) in
             guard let self = self, self.account == account, let data = data, let image = UIImage(data: data) else { return }
             self.avatarRequest = nil
@@ -84,10 +78,8 @@ class FollowRequestNotificationTableViewCell: UITableViewCell {
             delay = nil
         }
         if let delay = delay {
-            if updateTimestampWorkItem == nil {
+            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                self.updateTimestamp()
-                    self?.updateTimestamp()
-                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {

Tusker/Views/Notifications/FollowRequestNotificationTableViewCell.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16082.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -40,7 +40,7 @@
                                     </label>
                                 </subviews>
                             </stackView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Request to follow by Person 1" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aM6-C6-9QH" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Request to follow by Person 1" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aM6-C6-9QH">
                                 <rect key="frame" x="0.0" y="34" width="230" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -102,8 +102,8 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="checkmark.circle.fill" catalog="system" width="128" height="121"/>
+        <image name="checkmark.circle.fill" catalog="system" width="64" height="60"/>
-        <image name="person.fill" catalog="system" width="128" height="120"/>
+        <image name="person.fill" catalog="system" width="64" height="60"/>
-        <image name="xmark.circle.fill" catalog="system" width="128" height="121"/>
+        <image name="xmark.circle.fill" catalog="system" width="64" height="60"/>
     </resources>
 </document>

Tusker/Views/Profile Header/ProfileHeaderTableViewCell.swift

@@ -22,7 +22,7 @@ class ProfileHeaderTableViewCell: UITableViewCell {
     @IBOutlet weak var headerImageView: UIImageView!
     @IBOutlet weak var avatarContainerView: UIView!
     @IBOutlet weak var avatarImageView: UIImageView!
-    @IBOutlet weak var displayNameLabel: EmojiLabel!
+    @IBOutlet weak var displayNameLabel: UILabel!
     @IBOutlet weak var usernameLabel: UILabel!
     @IBOutlet weak var followsYouLabel: UILabel!
     @IBOutlet weak var noteTextView: StatusContentTextView!
@@ -136,7 +136,7 @@ class ProfileHeaderTableViewCell: UITableViewCell {
         
         avatarContainerView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarContainerView)
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
-        displayNameLabel.updateForAccountDisplayName(account: account)
+        displayNameLabel.text = account.realDisplayName
     }
     
     override func prepareForReuse() {

Tusker/Views/Profile Header/ProfileHeaderTableViewCell.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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="16082.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -45,7 +45,7 @@
                         <constraint firstItem="tH8-sR-DHC" firstAttribute="centerY" secondItem="KyB-ey-l11" secondAttribute="centerY" id="nYu-RE-MfA"/>
                     </constraints>
                 </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="LjK-72-Bez" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="LjK-72-Bez">
                     <rect key="frame" x="144" y="158" width="215" height="24"/>
                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
                     <nil key="textColor"/>
@@ -173,6 +173,6 @@
         </view>
     </objects>
     <resources>
-        <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="ellipsis" catalog="system" width="64" height="18"/>
     </resources>
 </document>

Tusker/Views/Status/BaseStatusTableViewCell.swift

@@ -25,7 +25,7 @@ class BaseStatusTableViewCell: UITableViewCell {
     var mastodonController: MastodonController! { overrideMastodonController ?? delegate?.apiController }
 
     @IBOutlet weak var avatarImageView: UIImageView!
-    @IBOutlet weak var displayNameLabel: EmojiLabel!
+    @IBOutlet weak var displayNameLabel: UILabel!
     @IBOutlet weak var usernameLabel: UILabel!
     @IBOutlet weak var contentWarningLabel: UILabel!
     @IBOutlet weak var collapseButton: UIButton!
@@ -190,7 +190,7 @@ class BaseStatusTableViewCell: UITableViewCell {
     @objc func updateUIForPreferences() {
         guard let account = mastodonController.cache.account(for: accountID) else { return }
         avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
-        displayNameLabel.updateForAccountDisplayName(account: account)
+        displayNameLabel.text = account.realDisplayName
         attachmentsView.contentHidden = Preferences.shared.blurAllMedia || (mastodonController.cache.status(for: statusID)?.sensitive ?? false)
     }
     

Tusker/Views/Status/ConversationMainStatusTableViewCell.swift

@@ -60,7 +60,7 @@ class ConversationMainStatusTableViewCell: BaseStatusTableViewCell {
     override func updateUI(account: Account) {
         super.updateUI(account: account)
 
-        profileAccessibilityElement.accessibilityLabel = account.displayNameWithoutCustomEmoji
+        profileAccessibilityElement.accessibilityLabel = account.realDisplayName
     }
     
     @objc override func updateUIForPreferences() {

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="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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="16082.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -26,7 +26,7 @@
                                         <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" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lZY-2e-17d" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                                <label opaque="NO" contentMode="left" verticalHuggingPriority="251" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lZY-2e-17d">
                                     <rect key="frame" x="58" y="0.0" width="277" height="29"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="24"/>
                                     <nil key="textColor"/>
@@ -224,10 +224,10 @@
         </view>
     </objects>
     <resources>
-        <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
+        <image name="arrowshape.turn.up.left.fill" catalog="system" width="64" height="52"/>
-        <image name="chevron.down" catalog="system" width="128" height="72"/>
+        <image name="chevron.down" catalog="system" width="64" height="36"/>
-        <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="ellipsis" catalog="system" width="64" height="18"/>
-        <image name="repeat" catalog="system" width="128" height="99"/>
+        <image name="repeat" catalog="system" width="64" height="48"/>
-        <image name="star.fill" catalog="system" width="128" height="116"/>
+        <image name="star.fill" catalog="system" width="64" height="58"/>
     </resources>
 </document>

Tusker/Views/Status/TimelineStatusTableViewCell.swift

@@ -19,7 +19,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
         return formatter
     }()
     
-    @IBOutlet weak var reblogLabel: EmojiLabel!
+    @IBOutlet weak var reblogLabel: UILabel!
     @IBOutlet weak var timestampLabel: UILabel!
     @IBOutlet weak var pinImageView: UIImageView!
     
@@ -91,13 +91,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
     }
     
     private func updateRebloggerLabel(reblogger: Account) {
-        if Preferences.shared.hideCustomEmojiInUsernames {
+        reblogLabel.text = "Reblogged by \(reblogger.realDisplayName)"
-            reblogLabel.text = "Reblogged by \(reblogger.displayNameWithoutCustomEmoji)"
-            reblogLabel.removeEmojis()
-        } else {
-            reblogLabel.text = "Reblogged by \(reblogger.displayOrUserName)"
-            reblogLabel.setEmojis(reblogger.emojis, identifier: reblogger.id)
-        }
     }
     
     func updateTimestamp() {
@@ -116,10 +110,8 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             delay = nil
         }
         if let delay = delay {
-            if updateTimestampWorkItem == nil {
+            updateTimestampWorkItem = DispatchWorkItem { [unowned self] in
-                updateTimestampWorkItem = DispatchWorkItem { [weak self] in
+                self.updateTimestamp()
-                    self?.updateTimestamp()
-                }
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: updateTimestampWorkItem!)
         } else {

Tusker/Views/Status/TimelineStatusTableViewCell.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16092.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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="16082.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,7 +16,7 @@
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="yNh-ac-v6c">
                     <rect key="frame" x="16" y="8" width="343" height="224"/>
                     <subviews>
-                        <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Reblogged by Person" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lDH-50-AJZ" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                        <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Reblogged by Person" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lDH-50-AJZ">
                             <rect key="frame" x="0.0" y="0.0" width="163.5" height="20.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
@@ -42,7 +42,7 @@
                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="3Sm-P0-ySf">
                                             <rect key="frame" x="0.0" y="0.0" width="277" height="20.5"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="752" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gll-xe-FSr" customClass="EmojiLabel" customModule="Tusker" customModuleProvider="target">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="752" text="Display name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gll-xe-FSr">
                                                     <rect key="frame" x="0.0" y="0.0" width="107" height="20.5"/>
                                                     <accessibility key="accessibilityConfiguration">
                                                         <accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
@@ -206,11 +206,11 @@
         </view>
     </objects>
     <resources>
-        <image name="arrowshape.turn.up.left.fill" catalog="system" width="128" height="106"/>
+        <image name="arrowshape.turn.up.left.fill" catalog="system" width="64" height="52"/>
-        <image name="chevron.down" catalog="system" width="128" height="72"/>
+        <image name="chevron.down" catalog="system" width="64" height="36"/>
-        <image name="ellipsis" catalog="system" width="128" height="37"/>
+        <image name="ellipsis" catalog="system" width="64" height="18"/>
-        <image name="pin.fill" catalog="system" width="119" height="128"/>
+        <image name="pin.fill" catalog="system" width="58" height="64"/>
-        <image name="repeat" catalog="system" width="128" height="99"/>
+        <image name="repeat" catalog="system" width="64" height="48"/>
-        <image name="star.fill" catalog="system" width="128" height="116"/>
+        <image name="star.fill" catalog="system" width="64" height="58"/>
     </resources>
 </document>

Tusker/XCallbackURL/XCBActions.swift

@@ -314,7 +314,7 @@ struct XCBActions {
                 DispatchQueue.main.async {
                     show(vc)
                 }
-                let alertController = UIAlertController(title: "Follow \(account.displayNameWithoutCustomEmoji)?", message: nil, preferredStyle: .alert)
+                let alertController = UIAlertController(title: "Follow \(account.realDisplayName)?", message: nil, preferredStyle: .alert)
                 alertController.addAction(UIAlertAction(title: "Ok", style: .default, handler: { (_) in
                     performAction(account)
                 }))