Comments (fixes #4)

2025-08-06 18:54:11 +00:00 · 2021-12-04 20:35:41 +01:00
parent eb537676e6
commit 19a3f08336
29 changed files with 688 additions and 68 deletions
--- a/Shared/Defaults.swift
+++ b/Shared/Defaults.swift
@@ -2,10 +2,11 @@ import Defaults
 import Foundation

 extension Defaults.Keys {
+    static let kavinPipedInstanceID = "kavin-piped"
    static let instances = Key<[Instance]>("instances", default: [
        .init(
            app: .piped,
-            id: "default-piped-instance",
+            id: kavinPipedInstanceID,
            name: "Kavin",
            apiURL: "https://pipedapi.kavin.rocks",
            frontendURL: "https://piped.kavin.rocks"
@@ -32,6 +33,7 @@ extension Defaults.Keys {
    static let playerSidebar = Key<PlayerSidebarSetting>("playerSidebar", default: PlayerSidebarSetting.defaultValue)
    static let playerInstanceID = Key<Instance.ID?>("playerInstance")
    static let showKeywords = Key<Bool>("showKeywords", default: false)
+    static let commentsInstanceID = Key<Instance.ID?>("commentsInstance", default: kavinPipedInstanceID)

    static let recentlyOpened = Key<[RecentItem]>("recentlyOpened", default: [])

--- a/Shared/Navigation/AppSidebarNavigation.swift
+++ b/Shared/Navigation/AppSidebarNavigation.swift
@@ -6,11 +6,19 @@ import SwiftUI

 struct AppSidebarNavigation: View {
    @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<CommentsModel> private var comments
+    @EnvironmentObject<InstancesModel> private var instances
+    @EnvironmentObject<NavigationModel> private var navigation
+    @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<PlaylistsModel> private var playlists
+    @EnvironmentObject<RecentsModel> private var recents
+    @EnvironmentObject<SearchModel> private var search
+    @EnvironmentObject<SubscriptionsModel> private var subscriptions
+    @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel

    @Default(.visibleSections) private var visibleSections

    #if os(iOS)
-        @EnvironmentObject<NavigationModel> private var navigation
        @State private var didApplyPrimaryViewWorkAround = false
    #endif

@@ -42,15 +50,50 @@ struct AppSidebarNavigation: View {
                .frame(minWidth: sidebarMinWidth)

            VStack {
-                Image(systemName: "play.tv")
-                    .renderingMode(.original)
-                    .font(.system(size: 60))
-                    .foregroundColor(.accentColor)
+                PlayerControlsView {
+                    HStack(alignment: .center) {
+                        Spacer()
+                        Image(systemName: "play.tv")
+                            .renderingMode(.original)
+                            .font(.system(size: 60))
+                            .foregroundColor(.accentColor)
+                        Spacer()
+                    }
+                }
            }
        }
+        #if os(iOS)
+        .background(
+            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
+                videoPlayer
+                    .environment(\.navigationStyle, .sidebar)
+            }
+        )
+        #elseif os(macOS)
+        .background(
+            EmptyView().sheet(isPresented: $player.presentingPlayer) {
+                videoPlayer
+                    .frame(minWidth: 1000, minHeight: 750)
+                    .environment(\.navigationStyle, .sidebar)
+            }
+        )
+        #endif
        .environment(\.navigationStyle, .sidebar)
    }

+    private var videoPlayer: some View {
+        VideoPlayerView()
+            .environmentObject(accounts)
+            .environmentObject(comments)
+            .environmentObject(instances)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(playlists)
+            .environmentObject(recents)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+    }
+
    var toolbarContent: some ToolbarContent {
        Group {
            #if os(iOS)
--- a/Shared/Navigation/AppTabNavigation.swift
+++ b/Shared/Navigation/AppTabNavigation.swift
@@ -3,10 +3,15 @@ import SwiftUI

 struct AppTabNavigation: View {
    @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<CommentsModel> private var comments
+    @EnvironmentObject<InstancesModel> private var instances
    @EnvironmentObject<NavigationModel> private var navigation
    @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<PlaylistsModel> private var playlists
    @EnvironmentObject<RecentsModel> private var recents
    @EnvironmentObject<SearchModel> private var search
+    @EnvironmentObject<SubscriptionsModel> private var subscriptions
+    @EnvironmentObject<ThumbnailsModel> private var thumbnailsModel

    @Default(.visibleSections) private var visibleSections

@@ -67,6 +72,12 @@ struct AppTabNavigation: View {
                }
            }
        )
+        .background(
+            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
+                videoPlayer
+                    .environment(\.navigationStyle, .sidebar)
+            }
+        )
    }

    private var favoritesNavigationView: some View {
@@ -155,6 +166,19 @@ struct AppTabNavigation: View {
        }
    }

+    private var videoPlayer: some View {
+        VideoPlayerView()
+            .environmentObject(accounts)
+            .environmentObject(comments)
+            .environmentObject(instances)
+            .environmentObject(navigation)
+            .environmentObject(player)
+            .environmentObject(playlists)
+            .environmentObject(recents)
+            .environmentObject(subscriptions)
+            .environmentObject(thumbnailsModel)
+    }
+
    var toolbarContent: some ToolbarContent {
        #if os(iOS)
            Group {
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -8,6 +8,7 @@ import SwiftUI

 struct ContentView: View {
    @StateObject private var accounts = AccountsModel()
+    @StateObject private var comments = CommentsModel()
    @StateObject private var instances = InstancesModel()
    @StateObject private var navigation = NavigationModel()
    @StateObject private var player = PlayerModel()
@@ -40,6 +41,7 @@ struct ContentView: View {
        .onAppear(perform: configure)

        .environmentObject(accounts)
+        .environmentObject(comments)
        .environmentObject(instances)
        .environmentObject(navigation)
        .environmentObject(player)
@@ -58,20 +60,6 @@ struct ContentView: View {
                    .environmentObject(navigation)
            }
        )
-        #if os(iOS)
-        .background(
-            EmptyView().fullScreenCover(isPresented: $player.presentingPlayer) {
-                videoPlayer
-            }
-        )
-        #elseif os(macOS)
-        .background(
-            EmptyView().sheet(isPresented: $player.presentingPlayer) {
-                videoPlayer
-                    .frame(minWidth: 1000, minHeight: 750)
-            }
-        )
-        #endif
        #if !os(tvOS)
        .handlesExternalEvents(preferring: Set(["*"]), allowing: Set(["*"]))
        .onOpenURL(perform: handleOpenedURL)
@@ -98,17 +86,6 @@ struct ContentView: View {
        #endif
    }

-    private var videoPlayer: some View {
-        VideoPlayerView()
-            .environmentObject(accounts)
-            .environmentObject(instances)
-            .environmentObject(navigation)
-            .environmentObject(player)
-            .environmentObject(playlists)
-            .environmentObject(subscriptions)
-            .environmentObject(thumbnailsModel)
-    }
-
    func configure() {
        SiestaLog.Category.enabled = .common
        SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)
@@ -128,15 +105,20 @@ struct ContentView: View {
            navigation.presentingWelcomeScreen = true
        }

-        player.accounts = accounts
        playlists.accounts = accounts
        search.accounts = accounts
        subscriptions.accounts = accounts

+        comments.accounts = accounts
+        comments.player = player
+
        menu.accounts = accounts
        menu.navigation = navigation
        menu.player = player

+        player.accounts = accounts
+        player.comments = comments
+
        if !accounts.current.isNil {
            player.loadHistoryDetails()
        }
--- a/Shared/Player/CommentView.swift
+++ b/Shared/Player/CommentView.swift
@@ -0,0 +1,221 @@
+import SDWebImageSwiftUI
+
+import SwiftUI
+
+struct CommentView: View {
+    let comment: Comment
+    @Binding var repliesID: Comment.ID?
+
+    #if os(iOS)
+        @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+    #endif
+    @Environment(\.navigationStyle) private var navigationStyle
+
+    @EnvironmentObject<CommentsModel> private var comments
+    @EnvironmentObject<NavigationModel> private var navigation
+    @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<RecentsModel> private var recents
+
+    var body: some View {
+        VStack(alignment: .leading) {
+            HStack(alignment: .center, spacing: 10) {
+                authorAvatar
+
+                #if os(iOS)
+                    Group {
+                        if horizontalSizeClass == .regular {
+                            HStack(spacing: 20) {
+                                authorAndTime
+
+                                Spacer()
+
+                                Group {
+                                    statusIcons
+                                    likes
+                                }
+                            }
+                        } else {
+                            HStack(alignment: .center, spacing: 20) {
+                                authorAndTime
+
+                                Spacer()
+
+                                VStack(spacing: 5) {
+                                    likes
+                                    statusIcons
+                                }
+                            }
+                        }
+                    }
+                    .font(.system(size: 15))
+
+                #else
+                    HStack(spacing: 20) {
+                        authorAndTime
+
+                        Spacer()
+
+                        statusIcons
+                        likes
+                    }
+                #endif
+            }
+
+            Group {
+                commentText
+
+                if comment.hasReplies {
+                    repliesButton
+
+                    if comment.id == repliesID {
+                        repliesList
+                    }
+                }
+            }
+        }
+        #if os(tvOS)
+        .padding(.horizontal, 20)
+        #endif
+    }
+
+    private var authorAvatar: some View {
+        WebImage(url: URL(string: comment.authorAvatarURL)!)
+            .resizable()
+            .placeholder {
+                Rectangle().fill(Color("PlaceholderColor"))
+            }
+            .retryOnAppear(false)
+            .indicator(.activity)
+            .mask(RoundedRectangle(cornerRadius: 60))
+            .frame(width: 45, height: 45, alignment: .leading)
+            .contextMenu {
+                Button(action: openChannelAction) {
+                    Label("\(comment.channel.name) Channel", systemImage: "rectangle.stack.fill.badge.person.crop")
+                }
+            }
+        #if os(tvOS)
+            .focusable()
+        #endif
+    }
+
+    private var authorAndTime: some View {
+        VStack(alignment: .leading) {
+            Text(comment.author)
+                .fontWeight(.bold)
+
+            Text(comment.time)
+                .foregroundColor(.secondary)
+        }
+        .lineLimit(1)
+    }
+
+    private var statusIcons: some View {
+        HStack(spacing: 15) {
+            if comment.pinned {
+                Image(systemName: "pin.fill")
+            }
+            if comment.hearted {
+                Image(systemName: "heart.fill")
+            }
+        }
+        .foregroundColor(.secondary)
+    }
+
+    private var likes: some View {
+        Group {
+            if comment.likeCount > 0 {
+                HStack(spacing: 5) {
+                    Image(systemName: "hand.thumbsup")
+                    Text("\(comment.likeCount.formattedAsAbbreviation())")
+                }
+            }
+        }
+        .foregroundColor(.secondary)
+    }
+
+    private var repliesButton: some View {
+        Button {
+            repliesID = repliesID == comment.id ? nil : comment.id
+
+            if repliesID.isNil {
+                comments.replies = []
+            }
+
+            guard !repliesID.isNil, !comment.repliesPage.isNil else {
+                return
+            }
+
+            comments.loadReplies(page: comment.repliesPage!)
+        } label: {
+            HStack(spacing: 5) {
+                Image(systemName: self.repliesID == comment.id ? "arrow.turn.left.up" : "arrow.turn.right.down")
+                Text("Replies")
+            }
+            #if os(tvOS)
+            .padding(10)
+            #endif
+        }
+
+        .buttonStyle(.plain)
+        .padding(.top, 2)
+        #if os(tvOS)
+            .padding(.leading, 5)
+        #else
+            .foregroundColor(.secondary)
+        #endif
+    }
+
+    private var repliesList: some View {
+        Group {
+            let last = comments.replies.last
+            ForEach(comments.replies) { comment in
+                CommentView(comment: comment, repliesID: $repliesID)
+                #if os(tvOS)
+                    .focusable()
+                #endif
+
+                if comment != last {
+                    Divider()
+                        .padding(.vertical, 5)
+                }
+            }
+            .padding(.leading, 22)
+        }
+    }
+
+    private var commentText: some View {
+        Group {
+            let text = Text(comment.text)
+            #if os(macOS)
+                .font(.system(size: 14))
+            #elseif os(iOS)
+                .font(.system(size: 15))
+            #endif
+                .lineSpacing(3)
+                .fixedSize(horizontal: false, vertical: true)
+
+            if #available(iOS 15.0, macOS 12.0, *) {
+                text
+                #if !os(tvOS)
+                .textSelection(.enabled)
+                #endif
+            } else {
+                text
+            }
+        }
+    }
+
+    private func openChannelAction() {
+        player.presentingPlayer = false
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            let recent = RecentItem(from: comment.channel)
+            recents.add(recent)
+            navigation.presentingChannel = true
+
+            if navigationStyle == .sidebar {
+                navigation.sidebarSectionChanged.toggle()
+                navigation.tabSelection = .recentlyOpened(recent.tag)
+            }
+        }
+    }
+}
--- a/Shared/Player/CommentsView.swift
+++ b/Shared/Player/CommentsView.swift
@@ -0,0 +1,59 @@
+import SwiftUI
+
+struct CommentsView: View {
+    @State private var repliesID: Comment.ID?
+
+    @EnvironmentObject<CommentsModel> private var comments
+    @EnvironmentObject<PlayerModel> private var player
+
+    var body: some View {
+        ScrollView(.vertical, showsIndicators: false) {
+            VStack(alignment: .leading) {
+                let last = comments.all.last
+                ForEach(comments.all) { comment in
+                    CommentView(comment: comment, repliesID: $repliesID)
+
+                    if comment != last {
+                        Divider()
+                            .padding(.vertical, 5)
+                    }
+                }
+
+                HStack {
+                    if comments.nextPageAvailable {
+                        Button {
+                            comments.loadNextPage()
+                        } label: {
+                            Label("Show more", systemImage: "arrow.turn.down.right")
+                        }
+                    }
+
+                    if !comments.firstPage {
+                        Button {
+                            comments.load(page: nil)
+                        } label: {
+                            Label("Show first", systemImage: "arrow.turn.down.left")
+                        }
+                    }
+                }
+                .buttonStyle(.plain)
+                .padding(.vertical, 5)
+                .foregroundColor(.secondary)
+            }
+        }
+        .padding(.horizontal)
+    }
+}
+
+struct CommentsView_Previews: PreviewProvider {
+    static var previews: some View {
+        if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) {
+            CommentsView()
+                .previewInterfaceOrientation(.landscapeRight)
+                .injectFixtureEnvironmentObjects()
+        }
+
+        CommentsView()
+            .injectFixtureEnvironmentObjects()
+    }
+}
--- a/Shared/Player/Player.swift
+++ b/Shared/Player/Player.swift
@@ -2,6 +2,7 @@ import Defaults
 import SwiftUI

 struct Player: UIViewControllerRepresentable {
+    @EnvironmentObject<CommentsModel> private var comments
    @EnvironmentObject<NavigationModel> private var navigation
    @EnvironmentObject<PlayerModel> private var player

@@ -18,6 +19,7 @@ struct Player: UIViewControllerRepresentable {

        let controller = PlayerViewController()

+        controller.commentsModel = comments
        controller.navigationModel = navigation
        controller.playerModel = player
        player.controller = controller
--- a/Shared/Player/PlayerViewController.swift
+++ b/Shared/Player/PlayerViewController.swift
@@ -4,6 +4,7 @@ import SwiftUI

 final class PlayerViewController: UIViewController {
    var playerLoaded = false
+    var commentsModel: CommentsModel!
    var navigationModel: NavigationModel!
    var playerModel: PlayerModel!
    var playerViewController = AVPlayerViewController()
@@ -45,6 +46,7 @@ final class PlayerViewController: UIViewController {
        #if os(tvOS)
            playerModel.avPlayerViewController = playerViewController
            playerViewController.customInfoViewControllers = [
+                infoViewController([.comments], title: "Comments"),
                infoViewController([.related], title: "Related"),
                infoViewController([.playingNext, .playedPreviously], title: "Playing Next")
            ]
@@ -62,6 +64,7 @@ final class PlayerViewController: UIViewController {
                AnyView(
                    NowPlayingView(sections: sections, inInfoViewController: true)
                        .frame(maxHeight: 600)
+                        .environmentObject(commentsModel)
                        .environmentObject(playerModel)
                )
            )
--- a/Shared/Player/VideoDetails.swift
+++ b/Shared/Player/VideoDetails.swift
@@ -4,7 +4,7 @@ import SwiftUI

 struct VideoDetails: View {
    enum Page {
-        case details, queue, related
+        case info, queue, related, comments
    }

    @Binding var sidebarQueue: Bool
@@ -16,7 +16,7 @@ struct VideoDetails: View {
    @State private var presentingShareSheet = false
    @State private var shareURL: URL?

-    @State private var currentPage = Page.details
+    @State private var currentPage = Page.info

    @Environment(\.presentationMode) private var presentationMode
    @Environment(\.inNavigationView) private var inNavigationView
@@ -65,7 +65,7 @@ struct VideoDetails: View {
                }
                .padding(.horizontal)

-                if !sidebarQueue {
+                if CommentsModel.enabled {
                    pagePicker
                        .padding(.horizontal)
                }
@@ -89,7 +89,7 @@ struct VideoDetails: View {
            )

            switch currentPage {
-            case .details:
+            case .info:
                ScrollView(.vertical) {
                    detailsPage
                }
@@ -100,6 +100,9 @@ struct VideoDetails: View {
            case .related:
                RelatedView()
                    .edgesIgnoringSafeArea(.horizontal)
+            case .comments:
+                CommentsView()
+                    .edgesIgnoringSafeArea(.horizontal)
            }
        }
        .padding(.top, inNavigationView && fullScreen ? 10 : 0)
@@ -116,7 +119,7 @@ struct VideoDetails: View {
        .onChange(of: sidebarQueue) { queue in
            if queue {
                if currentPage == .queue {
-                    currentPage = .details
+                    currentPage = .info
                }
            } else if video.isNil {
                currentPage = .queue
@@ -131,7 +134,7 @@ struct VideoDetails: View {
            if video != nil {
                Text(video!.title)
                    .onAppear {
-                        currentPage = .details
+                        currentPage = .info
                    }
                    .contextMenu {
                        Button {
@@ -239,15 +242,23 @@ struct VideoDetails: View {
    var pagePicker: some View {
        Picker("Page", selection: $currentPage) {
            if !video.isNil {
-                Text("Details").tag(Page.details)
-                Text("Related").tag(Page.related)
+                Text("Info").tag(Page.info)
+                if !sidebarQueue {
+                    Text("Related").tag(Page.related)
+                }
+                if CommentsModel.enabled {
+                    Text("Comments")
+                        .tag(Page.comments)
+                }
+            }
+            if !sidebarQueue {
+                Text("Queue").tag(Page.queue)
            }
-            Text("Queue").tag(Page.queue)
        }
        .labelsHidden()
        .pickerStyle(.segmented)
        .onDisappear {
-            currentPage = .details
+            currentPage = .info
        }
    }

@@ -297,19 +308,19 @@ struct VideoDetails: View {
                    Spacer()

                    if let views = video.viewsCount {
-                        videoDetail(label: "Views", value: views, symbol: "eye.fill")
+                        videoDetail(label: "Views", value: views, symbol: "eye")
                    }

                    if let likes = video.likesCount {
                        Divider()

-                        videoDetail(label: "Likes", value: likes, symbol: "hand.thumbsup.circle.fill")
+                        videoDetail(label: "Likes", value: likes, symbol: "hand.thumbsup")
                    }

                    if let dislikes = video.dislikesCount {
                        Divider()

-                        videoDetail(label: "Dislikes", value: dislikes, symbol: "hand.thumbsdown.circle.fill")
+                        videoDetail(label: "Dislikes", value: dislikes, symbol: "hand.thumbsdown")
                    }

                    Spacer()
@@ -378,7 +389,8 @@ struct VideoDetails: View {
                            }
                        }
                        .frame(maxWidth: .infinity, alignment: .leading)
-                        .font(.caption)
+                        .font(.system(size: 14))
+                        .lineSpacing(3)
                        .padding(.bottom, 4)
                    } else {
                        Text("No description")
--- a/Shared/Search/SearchField.swift
+++ b/Shared/Search/SearchField.swift
@@ -6,6 +6,12 @@ struct SearchTextField: View {
    @EnvironmentObject<RecentsModel> private var recents
    @EnvironmentObject<SearchModel> private var state

+    @Binding var favoriteItem: FavoriteItem?
+
+    init(favoriteItem: Binding<FavoriteItem?>? = nil) {
+        _favoriteItem = favoriteItem ?? .constant(nil)
+    }
+
    var body: some View {
        ZStack {
            #if os(macOS)
@@ -37,7 +43,14 @@ struct SearchTextField: View {
                .padding(.leading)
                .padding(.trailing, 15)
                #endif
+
                if !self.state.queryText.isEmpty {
+                    #if os(iOS)
+                        FavoriteButton(item: favoriteItem)
+                            .id(favoriteItem?.id)
+                            .labelStyle(.iconOnly)
+                            .padding(.trailing)
+                    #endif
                    clearButton
                }
            }
--- a/Shared/Search/SearchView.swift
+++ b/Shared/Search/SearchView.swift
@@ -42,7 +42,7 @@ struct SearchView: View {
        PlayerControlsView {
            #if os(iOS)
                VStack {
-                    SearchTextField()
+                    SearchTextField(favoriteItem: $favoriteItem)

                    if state.query.query != state.queryText, !state.queryText.isEmpty, !state.querySuggestions.collection.isEmpty {
                        SearchSuggestions()
@@ -93,15 +93,6 @@ struct SearchView: View {
                        .transaction { t in t.animation = .none }
                    }

-                    #if os(iOS)
-                        Spacer()
-
-                        FavoriteButton(item: favoriteItem)
-                            .id(favoriteItem?.id)
-
-                        Spacer()
-                    #endif
-
                    if accounts.app.supportsSearchFilters {
                        filtersMenu
                    }
--- a/Shared/Settings/PlaybackSettings.swift
+++ b/Shared/Settings/PlaybackSettings.swift
@@ -57,7 +57,7 @@ struct PlaybackSettings: View {
            Text("Best available stream").tag(String?.none)

            ForEach(instances) { instance in
-                Text(instance.longDescription).tag(Optional(instance.id))
+                Text(instance.description).tag(Optional(instance.id))
            }
        }
        .labelsHidden()
--- a/Shared/Settings/ServicesSettings.swift
+++ b/Shared/Settings/ServicesSettings.swift
@@ -4,8 +4,13 @@ import SwiftUI
 struct ServicesSettings: View {
    @Default(.sponsorBlockInstance) private var sponsorBlockInstance
    @Default(.sponsorBlockCategories) private var sponsorBlockCategories
+    @Default(.commentsInstanceID) private var commentsInstanceID

    var body: some View {
+        Section(header: SettingsHeader(text: "Comments")) {
+            commentsInstancePicker
+        }
+
        Section(header: SettingsHeader(text: "SponsorBlock API")) {
            TextField(
                "SponsorBlock API Instance",
@@ -52,6 +57,22 @@ struct ServicesSettings: View {
        }
    }

+    private var commentsInstancePicker: some View {
+        Picker("Comments", selection: $commentsInstanceID) {
+            Text("Disabled").tag(String?.none)
+
+            ForEach(InstancesModel.all.filter { $0.app.supportsComments }) { instance in
+                Text(instance.description).tag(Optional(instance.id))
+            }
+        }
+        .labelsHidden()
+        #if os(iOS)
+            .pickerStyle(.automatic)
+        #elseif os(tvOS)
+            .pickerStyle(.inline)
+        #endif
+    }
+
    func toggleCategory(_ category: String, value: Bool) {
        if let index = sponsorBlockCategories.firstIndex(where: { $0 == category }), !value {
            sponsorBlockCategories.remove(at: index)
--- a/Shared/Views/ChannelVideosView.swift
+++ b/Shared/Views/ChannelVideosView.swift
@@ -90,9 +90,14 @@ struct ChannelVideosView: View {

                ToolbarItem {
                    HStack {
-                        Text("**\(store.item?.subscriptionsString ?? "loading")** subscribers")
-                            .foregroundColor(.secondary)
-                            .opacity(store.item?.subscriptionsString != nil ? 1 : 0)
+                        HStack(spacing: 3) {
+                            Text("\(store.item?.subscriptionsString ?? "loading")")
+                                .fontWeight(.bold)
+                            Text(" subscribers")
+                        }
+                        .allowsTightening(true)
+                        .foregroundColor(.secondary)
+                        .opacity(store.item?.subscriptionsString != nil ? 1 : 0)

                        subscriptionToggleButton

--- a/Shared/Views/SignInRequiredView.swift
+++ b/Shared/Views/SignInRequiredView.swift
@@ -34,9 +34,9 @@ struct SignInRequiredView<Content: View>: View {

            Group {
                if instances.isEmpty {
-                    Text("You need to create an instance and accounts\nto access **\(title)** section")
+                    Text("You need to create an instance and accounts\nto access \(title) section")
                } else {
-                    Text("You need to select an account\nto access **\(title)** section")
+                    Text("You need to select an account\nto access \(title) section")
                }
            }
            .multilineTextAlignment(.center)