Tusker/HTMLConverter.swift

@@ -86,12 +86,6 @@ struct HTMLConverter {
                 }
             }
             
-            lazy var currentFont = if attributed.length == 0 {
-                font
-            } else {
-                attributed.attribute(.font, at: 0, effectiveRange: nil) as? UIFont ?? font
-            }
-            
             switch node.tagName() {
             case "br":
                 // need to specify defaultFont here b/c otherwise it uses the default 12pt Helvetica which
@@ -108,8 +102,20 @@ struct HTMLConverter {
             case "p":
                 attributed.append(NSAttributedString(string: "\n\n", attributes: [.font: font]))
             case "em", "i":
+                let currentFont: UIFont
+                if attributed.length == 0 {
+                    currentFont = font
+                } else {
+                    currentFont = attributed.attribute(.font, at: 0, effectiveRange: nil) as? UIFont ?? font
+                }
                 attributed.addAttribute(.font, value: currentFont.withTraits(.traitItalic)!, range: attributed.fullRange)
             case "strong", "b":
+                let currentFont: UIFont
+                if attributed.length == 0 {
+                    currentFont = font
+                } else {
+                    currentFont = attributed.attribute(.font, at: 0, effectiveRange: nil) as? UIFont ?? font
+                }
                 attributed.addAttribute(.font, value: currentFont.withTraits(.traitBold)!, range: attributed.fullRange)
             case "del":
                 attributed.addAttribute(.strikethroughStyle, value: NSUnderlineStyle.single.rawValue, range: attributed.fullRange)
@@ -118,14 +124,6 @@ struct HTMLConverter {
             case "pre":
                 attributed.append(NSAttributedString(string: "\n\n"))
                 attributed.addAttribute(.font, value: monospaceFont, range: attributed.fullRange)
-            case "blockquote":
-                let paragraphStyle = paragraphStyle.mutableCopy() as! NSMutableParagraphStyle
-                paragraphStyle.headIndent = 32
-                paragraphStyle.firstLineHeadIndent = 32
-                attributed.addAttributes([
-                    .font: currentFont.withTraits(.traitItalic)!,
-                    .paragraphStyle: paragraphStyle,
-                ], range: attributed.fullRange)
             default:
                 break
             }

Tusker/Screens/Fast Account Switcher/FastSwitchingAccountView.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import UserAccounts
-import WebURL
 
 class FastSwitchingAccountView: UIView {
     
@@ -127,11 +126,7 @@ class FastSwitchingAccountView: UIView {
     
     private func setupAccount(account: UserAccountInfo) {
         usernameLabel.text = account.username
-        if let domain = WebURL.Domain(account.instanceURL.host!) {
-            instanceLabel.text = domain.render(.uncheckedUnicodeString)
-        } else {
         instanceLabel.text = account.instanceURL.host!
-        }
         let controller = MastodonController.getForAccount(account)
         controller.getOwnAccount { [weak self] (result) in
             guard let self = self,
@@ -145,7 +140,7 @@ class FastSwitchingAccountView: UIView {
             }
         }
         
-        accessibilityLabel = "\(account.username!)@\(instanceLabel.text!)"
+        accessibilityLabel = "\(account.username!)@\(account.instanceURL.host!)"
     }
     
     private func setupPlaceholder() {

Tusker/Screens/Notifications/FollowRequestNotificationCollectionViewCell.swift

@@ -23,7 +23,6 @@ class FollowRequestNotificationCollectionViewCell: UICollectionViewListCell {
         $0.contentMode = .scaleAspectFill
         $0.layer.masksToBounds = true
         $0.layer.cornerCurve = .continuous
-        $0.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30
         NSLayoutConstraint.activate([
             $0.widthAnchor.constraint(equalTo: $0.heightAnchor),
         ])

Tusker/Screens/Preferences/PreferencesView.swift

@@ -7,7 +7,6 @@
 
 import SwiftUI
 import UserAccounts
-import WebURL
 
 struct PreferencesView: View {
     let mastodonController: MastodonController
@@ -42,12 +41,7 @@ struct PreferencesView: View {
                         VStack(alignment: .leading) {
                             Text(verbatim: account.username)
                                 .foregroundColor(.primary)
-                            let instance = if let domain = WebURL.Domain(account.instanceURL.host!) {
+                            Text(verbatim: account.instanceURL.host!)
-                                domain.render(.uncheckedUnicodeString)
-                            } else {
-                                account.instanceURL.host!
-                            }
-                            Text(verbatim: instance)
                                 .font(.caption)
                                 .foregroundColor(.primary)
                         }