diff --git a/CoreDataStack/Protocol/Managed.swift b/CoreDataStack/Protocol/Managed.swift
index 4811b9c6b..4bdff9c3e 100644
--- a/CoreDataStack/Protocol/Managed.swift
+++ b/CoreDataStack/Protocol/Managed.swift
@@ -8,7 +8,7 @@
 import Foundation
 import CoreData
 
-public protocol Managed: class, NSFetchRequestResult {
+public protocol Managed: AnyObject, NSFetchRequestResult {
     static var entityName: String { get }
     static var defaultSortDescriptors: [NSSortDescriptor] { get }
 }
diff --git a/Mastodon/Coordinator/NeedsDependency.swift b/Mastodon/Coordinator/NeedsDependency.swift
index 70421a822..d6a24cce3 100644
--- a/Mastodon/Coordinator/NeedsDependency.swift
+++ b/Mastodon/Coordinator/NeedsDependency.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol NeedsDependency: class {
+protocol NeedsDependency: AnyObject {
     var context: AppContext! { get set }
     var coordinator: SceneCoordinator! { get set }
 }
diff --git a/Mastodon/Diffiable/Item/ComposeStatusItem.swift b/Mastodon/Diffiable/Item/ComposeStatusItem.swift
index 88bff36c3..d60a76e82 100644
--- a/Mastodon/Diffiable/Item/ComposeStatusItem.swift
+++ b/Mastodon/Diffiable/Item/ComposeStatusItem.swift
@@ -50,7 +50,7 @@ extension ComposeStatusItem {
     }
 }
 
-protocol ComposePollAttributeDelegate: class {
+protocol ComposePollAttributeDelegate: AnyObject {
     func composePollAttribute(_ attribute: ComposeStatusItem.ComposePollOptionAttribute, pollOptionDidChange: String?)
 }
 
diff --git a/Mastodon/Diffiable/Section/StatusSection.swift b/Mastodon/Diffiable/Section/StatusSection.swift
index b5f9869e2..5989d4f80 100644
--- a/Mastodon/Diffiable/Section/StatusSection.swift
+++ b/Mastodon/Diffiable/Section/StatusSection.swift
@@ -197,6 +197,20 @@ extension StatusSection {
             emojiDict: (status.reblog ?? status).emojiDict
         )
         
+        // set visibility
+        if let visibility = (status.reblog ?? status).visibility {
+            cell.statusView.updateVisibility(visibility: visibility)
+            
+            cell.statusView.revealContentWarningButton.publisher(for: \.isHidden)
+                .receive(on: DispatchQueue.main)
+                .sink { [weak cell] isHidden in
+                    cell?.statusView.visibilityImageView.isHidden = !isHidden
+                }
+                .store(in: &cell.disposeBag)
+        } else {
+            cell.statusView.visibilityImageView.isHidden = true
+        }
+        
         // prepare media attachments
         let mediaAttachments = Array((status.reblog ?? status).mediaAttachments ?? []).sorted { $0.index.compare($1.index) == .orderedAscending }
         
diff --git a/Mastodon/Protocol/ContentOffsetAdjustableTimelineViewControllerDelegate.swift b/Mastodon/Protocol/ContentOffsetAdjustableTimelineViewControllerDelegate.swift
index dbe22c52e..98160eb42 100644
--- a/Mastodon/Protocol/ContentOffsetAdjustableTimelineViewControllerDelegate.swift
+++ b/Mastodon/Protocol/ContentOffsetAdjustableTimelineViewControllerDelegate.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol ContentOffsetAdjustableTimelineViewControllerDelegate: class {
+protocol ContentOffsetAdjustableTimelineViewControllerDelegate: AnyObject {
     func navigationBar() -> UINavigationBar?
 }
 
diff --git a/Mastodon/Protocol/DisposeBagCollectable.swift b/Mastodon/Protocol/DisposeBagCollectable.swift
index a8afde9d4..58bfa8576 100644
--- a/Mastodon/Protocol/DisposeBagCollectable.swift
+++ b/Mastodon/Protocol/DisposeBagCollectable.swift
@@ -8,6 +8,6 @@
 import Foundation
 import Combine
 
-protocol DisposeBagCollectable: class {
+protocol DisposeBagCollectable: AnyObject {
     var disposeBag: Set<AnyCancellable> { get set }
 }
diff --git a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusAttachmentCollectionViewCell.swift b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusAttachmentCollectionViewCell.swift
index 141a944fd..87fe0efaf 100644
--- a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusAttachmentCollectionViewCell.swift
+++ b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusAttachmentCollectionViewCell.swift
@@ -9,7 +9,7 @@ import os.log
 import UIKit
 import Combine
 
-protocol ComposeStatusAttachmentCollectionViewCellDelegate: class {
+protocol ComposeStatusAttachmentCollectionViewCellDelegate: AnyObject {
     func composeStatusAttachmentCollectionViewCell(_ cell: ComposeStatusAttachmentCollectionViewCell, removeButtonDidPressed button: UIButton)
 }
 
diff --git a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollExpiresOptionCollectionViewCell.swift b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollExpiresOptionCollectionViewCell.swift
index 0abe94ba0..8347f5641 100644
--- a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollExpiresOptionCollectionViewCell.swift
+++ b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollExpiresOptionCollectionViewCell.swift
@@ -9,7 +9,7 @@ import os.log
 import UIKit
 import Combine
 
-protocol ComposeStatusPollExpiresOptionCollectionViewCellDelegate: class {
+protocol ComposeStatusPollExpiresOptionCollectionViewCellDelegate: AnyObject {
     func composeStatusPollExpiresOptionCollectionViewCell(_ cell: ComposeStatusPollExpiresOptionCollectionViewCell, didSelectExpiresOption expiresOption: ComposeStatusItem.ComposePollExpiresOptionAttribute.ExpiresOption)
 }
 
diff --git a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionAppendEntryCollectionViewCell.swift b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionAppendEntryCollectionViewCell.swift
index 39a12f954..dbe9ef4ad 100644
--- a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionAppendEntryCollectionViewCell.swift
+++ b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionAppendEntryCollectionViewCell.swift
@@ -8,7 +8,7 @@
 import os.log
 import UIKit
 
-protocol ComposeStatusPollOptionAppendEntryCollectionViewCellDelegate: class {
+protocol ComposeStatusPollOptionAppendEntryCollectionViewCellDelegate: AnyObject {
     func composeStatusPollOptionAppendEntryCollectionViewCellDidPressed(_ cell: ComposeStatusPollOptionAppendEntryCollectionViewCell)
 }
 
diff --git a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionCollectionViewCell.swift b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionCollectionViewCell.swift
index 8846e56ed..ab2117f13 100644
--- a/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionCollectionViewCell.swift
+++ b/Mastodon/Scene/Compose/CollectionViewCell/ComposeStatusPollOptionCollectionViewCell.swift
@@ -9,7 +9,7 @@ import os.log
 import UIKit
 import Combine
 
-protocol ComposeStatusPollOptionCollectionViewCellDelegate: class {
+protocol ComposeStatusPollOptionCollectionViewCellDelegate: AnyObject {
     func composeStatusPollOptionCollectionViewCell(_ cell: ComposeStatusPollOptionCollectionViewCell, textFieldDidBeginEditing textField: UITextField)
     func composeStatusPollOptionCollectionViewCell(_ cell: ComposeStatusPollOptionCollectionViewCell, textBeforeDeleteBackward text: String?)
     func composeStatusPollOptionCollectionViewCell(_ cell: ComposeStatusPollOptionCollectionViewCell, pollOptionTextFieldDidReturn: UITextField)
diff --git a/Mastodon/Scene/Compose/View/ComposeToolbarView.swift b/Mastodon/Scene/Compose/View/ComposeToolbarView.swift
index 2940217e5..6aabc4572 100644
--- a/Mastodon/Scene/Compose/View/ComposeToolbarView.swift
+++ b/Mastodon/Scene/Compose/View/ComposeToolbarView.swift
@@ -9,7 +9,7 @@ import os.log
 import UIKit
 import MastodonSDK
 
-protocol ComposeToolbarViewDelegate: class {
+protocol ComposeToolbarViewDelegate: AnyObject {
     func composeToolbarView(_ composeToolbarView: ComposeToolbarView, cameraButtonDidPressed sender: UIButton, mediaSelectionType type: ComposeToolbarView.MediaSelectionType)
     func composeToolbarView(_ composeToolbarView: ComposeToolbarView, pollButtonDidPressed sender: UIButton)
     func composeToolbarView(_ composeToolbarView: ComposeToolbarView, emojiButtonDidPressed sender: UIButton)
@@ -181,6 +181,15 @@ extension ComposeToolbarView {
             }
         }
         
+        func imageNameForTimeline() -> String {
+            switch self {
+            case .public: return "person.3"
+            case .unlisted: return "eye.slash"
+            case .private: return "person.crop.circle.badge.plus"
+            case .direct: return "at"
+            }
+        }
+        
         var visibility: Mastodon.Entity.Status.Visibility {
             switch self {
             case .public: return .public
diff --git a/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift b/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift
index 242715028..91020f12a 100644
--- a/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift
+++ b/Mastodon/Scene/HomeTimeline/View/HomeTimelineNavigationBarTitleView.swift
@@ -8,7 +8,7 @@
 import os.log
 import UIKit
 
-protocol HomeTimelineNavigationBarTitleViewDelegate: class {
+protocol HomeTimelineNavigationBarTitleViewDelegate: AnyObject {
     func homeTimelineNavigationBarTitleView(_ titleView: HomeTimelineNavigationBarTitleView, buttonDidPressed sender: UIButton)
 }
 
diff --git a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCategoriesCell.swift b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCategoriesCell.swift
index 84ee6017c..5dd0e4008 100644
--- a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCategoriesCell.swift
+++ b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCategoriesCell.swift
@@ -9,7 +9,7 @@ import os.log
 import UIKit
 import MastodonSDK
 
-protocol PickServerCategoriesCellDelegate: class {
+protocol PickServerCategoriesCellDelegate: AnyObject {
     func pickServerCategoriesCell(_ cell: PickServerCategoriesCell, collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath)
 }
 
diff --git a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift
index 9313aa5cc..3bf65756c 100644
--- a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift
+++ b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerCell.swift
@@ -12,7 +12,7 @@ import MastodonSDK
 import AlamofireImage
 import Kanna
 
-protocol PickServerCellDelegate: class {
+protocol PickServerCellDelegate: AnyObject {
     func pickServerCell(_ cell: PickServerCell, expandButtonPressed button: UIButton)
 }
 
diff --git a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift
index fb1be2aad..dc048f67a 100644
--- a/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift
+++ b/Mastodon/Scene/Onboarding/PickServer/TableViewCell/PickServerSearchCell.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol PickServerSearchCellDelegate: class {
+protocol PickServerSearchCellDelegate: AnyObject {
     func pickServerSearchCell(_ cell: PickServerSearchCell, searchTextDidChange searchText: String?)
 }
 
diff --git a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
index 0610ae52f..217ea6584 100644
--- a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
+++ b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
@@ -13,7 +13,7 @@ import AlamofireImage
 import CropViewController
 import TwitterTextEditor
 
-protocol ProfileHeaderViewControllerDelegate: class {
+protocol ProfileHeaderViewControllerDelegate: AnyObject {
     func profileHeaderViewController(_ viewController: ProfileHeaderViewController, viewLayoutDidUpdate view: UIView)
     func profileHeaderViewController(_ viewController: ProfileHeaderViewController, pageSegmentedControlValueChanged segmentedControl: UISegmentedControl, selectedSegmentIndex index: Int)
 }
diff --git a/Mastodon/Scene/Profile/Header/View/ProfileStatusDashboardView.swift b/Mastodon/Scene/Profile/Header/View/ProfileStatusDashboardView.swift
index 4a95fb22f..38c093d1b 100644
--- a/Mastodon/Scene/Profile/Header/View/ProfileStatusDashboardView.swift
+++ b/Mastodon/Scene/Profile/Header/View/ProfileStatusDashboardView.swift
@@ -8,7 +8,7 @@
 import os.log
 import UIKit
 
-protocol ProfileStatusDashboardViewDelegate: class {
+protocol ProfileStatusDashboardViewDelegate: AnyObject {
     func profileStatusDashboardView(_ dashboardView: ProfileStatusDashboardView, postDashboardMeterViewDidPressed dashboardMeterView: ProfileStatusDashboardMeterView)
     func profileStatusDashboardView(_ dashboardView: ProfileStatusDashboardView, followingDashboardMeterViewDidPressed dashboardMeterView: ProfileStatusDashboardMeterView)
     func profileStatusDashboardView(_ dashboardView: ProfileStatusDashboardView, followersDashboardMeterViewDidPressed dashboardMeterView: ProfileStatusDashboardMeterView)
diff --git a/Mastodon/Scene/Profile/Segmented/Paging/ProfilePagingViewController.swift b/Mastodon/Scene/Profile/Segmented/Paging/ProfilePagingViewController.swift
index 568369d66..3b00b1c6f 100644
--- a/Mastodon/Scene/Profile/Segmented/Paging/ProfilePagingViewController.swift
+++ b/Mastodon/Scene/Profile/Segmented/Paging/ProfilePagingViewController.swift
@@ -10,7 +10,7 @@ import UIKit
 import Pageboy
 import Tabman
 
-protocol ProfilePagingViewControllerDelegate: class {
+protocol ProfilePagingViewControllerDelegate: AnyObject {
     func profilePagingViewController(_ viewController: ProfilePagingViewController, didScrollToPostCustomScrollViewContainerController customScrollViewContainerController: ScrollViewContainer, atIndex index: Int)
 }
 
diff --git a/Mastodon/Scene/Settings/View/Cell/SettingsAppearanceTableViewCell.swift b/Mastodon/Scene/Settings/View/Cell/SettingsAppearanceTableViewCell.swift
index 44a7e7574..5b7c53b02 100644
--- a/Mastodon/Scene/Settings/View/Cell/SettingsAppearanceTableViewCell.swift
+++ b/Mastodon/Scene/Settings/View/Cell/SettingsAppearanceTableViewCell.swift
@@ -8,7 +8,7 @@
 import UIKit
 import Combine
 
-protocol SettingsAppearanceTableViewCellDelegate: class {
+protocol SettingsAppearanceTableViewCellDelegate: AnyObject {
     func settingsAppearanceCell(_ cell: SettingsAppearanceTableViewCell, didSelectAppearanceMode appearanceMode: SettingsItem.AppearanceMode)
 }
 
diff --git a/Mastodon/Scene/Settings/View/Cell/SettingsToggleTableViewCell.swift b/Mastodon/Scene/Settings/View/Cell/SettingsToggleTableViewCell.swift
index b4a62635b..86698d840 100644
--- a/Mastodon/Scene/Settings/View/Cell/SettingsToggleTableViewCell.swift
+++ b/Mastodon/Scene/Settings/View/Cell/SettingsToggleTableViewCell.swift
@@ -8,7 +8,7 @@
 import UIKit
 import Combine
 
-protocol SettingsToggleCellDelegate: class {
+protocol SettingsToggleCellDelegate: AnyObject {
     func settingsToggleCell(_ cell: SettingsToggleTableViewCell, switchValueDidChange switch: UISwitch)
 }
 
diff --git a/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift b/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift
index f7a8a1546..272abd37e 100644
--- a/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift
+++ b/Mastodon/Scene/Share/View/Container/PlayerContainerView.swift
@@ -9,7 +9,7 @@ import os.log
 import AVKit
 import UIKit
 
-protocol PlayerContainerViewDelegate: class {
+protocol PlayerContainerViewDelegate: AnyObject {
     func playerContainerView(_ playerContainerView: PlayerContainerView, contentWarningOverlayViewDidPressed contentWarningOverlayView: ContentWarningOverlayView)
 }
 
diff --git a/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift b/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift
index f04a56e9e..ba598a9a0 100644
--- a/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift
+++ b/Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift
@@ -9,7 +9,7 @@ import os.log
 import Foundation
 import UIKit
 
-protocol ContentWarningOverlayViewDelegate: class {
+protocol ContentWarningOverlayViewDelegate: AnyObject {
     func contentWarningOverlayViewDidPressed(_ contentWarningOverlayView: ContentWarningOverlayView)
 }
 
diff --git a/Mastodon/Scene/Share/View/Content/StatusView.swift b/Mastodon/Scene/Share/View/Content/StatusView.swift
index 9655940c4..c06c956e0 100644
--- a/Mastodon/Scene/Share/View/Content/StatusView.swift
+++ b/Mastodon/Scene/Share/View/Content/StatusView.swift
@@ -122,6 +122,13 @@ final class StatusView: UIView {
         return button
     }()
     
+    let visibilityImageView: UIImageView = {
+        let imageView = UIImageView()
+        imageView.tintColor = Asset.Colors.Label.secondary.color
+        imageView.contentMode = .scaleAspectFit
+        return imageView
+    }()
+    
     let statusContainerStackView = UIStackView()    
     let statusMosaicImageViewContainer = MosaicImageViewContainer()
     
@@ -317,6 +324,10 @@ extension StatusView {
         authorContainerStackView.addArrangedSubview(revealContentWarningButton)
         revealContentWarningButton.setContentHuggingPriority(.required - 2, for: .horizontal)
         
+        // visibility ImageView
+        authorContainerStackView.addArrangedSubview(visibilityImageView)
+        visibilityImageView.setContentHuggingPriority(.required - 2, for: .horizontal)
+        
         authorContainerStackView.translatesAutoresizingMaskIntoConstraints = false
         authorContainerView.addSubview(authorContainerStackView)
         NSLayoutConstraint.activate([
@@ -479,6 +490,11 @@ extension StatusView {
         // TODO: a11y
     }
     
+    func updateVisibility(visibility: String) {
+        guard let visibility = ComposeToolbarView.VisibilitySelectionType(rawValue: visibility) else { return }
+        visibilityImageView.image = UIImage(systemName: visibility.imageNameForTimeline(), withConfiguration: UIImage.SymbolConfiguration(pointSize: 13, weight: .regular))
+    }
+    
 }
 
 extension StatusView {
diff --git a/Mastodon/Scene/Share/View/TableviewCell/ThreadReplyLoaderTableViewCell.swift b/Mastodon/Scene/Share/View/TableviewCell/ThreadReplyLoaderTableViewCell.swift
index 10ad0c5c8..03359df51 100644
--- a/Mastodon/Scene/Share/View/TableviewCell/ThreadReplyLoaderTableViewCell.swift
+++ b/Mastodon/Scene/Share/View/TableviewCell/ThreadReplyLoaderTableViewCell.swift
@@ -9,7 +9,7 @@ import os.log
 import UIKit
 import Combine
 
-protocol ThreadReplyLoaderTableViewCellDelegate: class {
+protocol ThreadReplyLoaderTableViewCellDelegate: AnyObject {
     func threadReplyLoaderTableViewCell(_ cell: ThreadReplyLoaderTableViewCell, loadMoreButtonDidPressed button: UIButton)
 }
 
diff --git a/Mastodon/Scene/Share/View/TableviewCell/TimelineMiddleLoaderTableViewCell.swift b/Mastodon/Scene/Share/View/TableviewCell/TimelineMiddleLoaderTableViewCell.swift
index 7438f5bfd..4a0b623ef 100644
--- a/Mastodon/Scene/Share/View/TableviewCell/TimelineMiddleLoaderTableViewCell.swift
+++ b/Mastodon/Scene/Share/View/TableviewCell/TimelineMiddleLoaderTableViewCell.swift
@@ -10,7 +10,7 @@ import CoreData
 import os.log
 import UIKit
 
-protocol TimelineMiddleLoaderTableViewCellDelegate: class {
+protocol TimelineMiddleLoaderTableViewCellDelegate: AnyObject {
     func configure(cell: TimelineMiddleLoaderTableViewCell, upperTimelineStatusID: String?, timelineIndexobjectID:NSManagedObjectID?)
     func timelineMiddleLoaderTableViewCell(_ cell: TimelineMiddleLoaderTableViewCell, loadMoreButtonDidPressed button: UIButton)
 }
diff --git a/Mastodon/Scene/Share/View/TextField/DeleteBackwardResponseTextField.swift b/Mastodon/Scene/Share/View/TextField/DeleteBackwardResponseTextField.swift
index 21c80dcf8..08c085aa9 100644
--- a/Mastodon/Scene/Share/View/TextField/DeleteBackwardResponseTextField.swift
+++ b/Mastodon/Scene/Share/View/TextField/DeleteBackwardResponseTextField.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol DeleteBackwardResponseTextFieldDelegate: class {
+protocol DeleteBackwardResponseTextFieldDelegate: AnyObject {
     func deleteBackwardResponseTextField(_ textField: DeleteBackwardResponseTextField, textBeforeDelete: String?)
 }
 
diff --git a/Mastodon/Scene/Share/View/ToolBar/ActionToolBarContainer.swift b/Mastodon/Scene/Share/View/ToolBar/ActionToolBarContainer.swift
index a2f57dee2..2ed31abb4 100644
--- a/Mastodon/Scene/Share/View/ToolBar/ActionToolBarContainer.swift
+++ b/Mastodon/Scene/Share/View/ToolBar/ActionToolBarContainer.swift
@@ -8,7 +8,7 @@
 import os.log
 import UIKit
 
-protocol ActionToolbarContainerDelegate: class {
+protocol ActionToolbarContainerDelegate: AnyObject {
     func actionToolbarContainer(_ actionToolbarContainer: ActionToolbarContainer, replayButtonDidPressed sender: UIButton)
     func actionToolbarContainer(_ actionToolbarContainer: ActionToolbarContainer, reblogButtonDidPressed sender: UIButton)
     func actionToolbarContainer(_ actionToolbarContainer: ActionToolbarContainer, starButtonDidPressed sender: UIButton)
diff --git a/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift b/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift
index 3a57a9d98..fd95d2634 100644
--- a/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift
+++ b/Mastodon/Service/MastodonAttachmentService/MastodonAttachmentService.swift
@@ -12,7 +12,7 @@ import Kingfisher
 import GameplayKit
 import MastodonSDK
 
-protocol MastodonAttachmentServiceDelegate: class {
+protocol MastodonAttachmentServiceDelegate: AnyObject {
     func mastodonAttachmentService(_ service: MastodonAttachmentService, uploadStateDidChange state: MastodonAttachmentService.UploadState?)
 }