Commit Graph

6197 Commits

Author SHA1 Message Date
Nathan Mattes 9bf072e827 Remove unused code 2024-01-11 14:07:57 +01:00
Nathan Mattes cfa0e9a2bc Fix indention, fix warnings (IOS-192) 2024-01-09 17:58:48 +01:00
Nathan Mattes e70a67caf0 Move task and async/await to call-site (IOS-192) 2024-01-09 17:45:01 +01:00
Nathan Mattes 97d1ab4e5b Fix build (IOS-192) 2024-01-09 17:44:06 +01:00
Nathan Mattes 923ff39b04
Fix indention
Co-authored-by: Marcus Kida <marcus.kida@bearologics.com>
2024-01-09 17:02:55 +01:00
Nathan Mattes fe5c88254b Fix warnings
I guess that they made their way back into the app due to the merge
2024-01-08 22:48:35 +01:00
Nathan Mattes febbc6f22a Merge branch 'develop' into ios-192-profile-about
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Protocol/Provider/DataSourceFacade+Follow.swift
#	Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift
#	Mastodon/Protocol/Provider/DataSourceFacade+Status.swift
#	Mastodon/Protocol/Provider/DataSourceProvider+NotificationTableViewCellDelegate.swift
#	Mastodon/Protocol/Provider/DataSourceProvider+StatusTableViewCellDelegate.swift
#	Mastodon/Protocol/Provider/DataSourceProvider+UITableViewDelegate.swift
#	Mastodon/Protocol/Provider/DataSourceProvider.swift
#	Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewController+DataSourceProvider.swift
#	Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel+State.swift
#	Mastodon/Scene/Discovery/Community/DiscoveryCommunityViewModel.swift
#	Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewController+DataSourceProvider.swift
#	Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel+State.swift
#	Mastodon/Scene/Discovery/Posts/DiscoveryPostsViewModel.swift
#	Mastodon/Scene/HashtagTimeline/HashtagTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel+State.swift
#	Mastodon/Scene/HashtagTimeline/HashtagTimelineViewModel.swift
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewModel+LoadLatestState.swift
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewModel.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewController.swift
#	Mastodon/Scene/Notification/NotificationTimeline/NotificationTimelineViewModel.swift
#	Mastodon/Scene/Profile/Bookmark/BookmarkViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/Bookmark/BookmarkViewModel+State.swift
#	Mastodon/Scene/Profile/Bookmark/BookmarkViewModel.swift
#	Mastodon/Scene/Profile/Favorite/FavoriteViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/Favorite/FavoriteViewModel+State.swift
#	Mastodon/Scene/Profile/Favorite/FavoriteViewModel.swift
#	Mastodon/Scene/Profile/MeProfileViewModel.swift
#	Mastodon/Scene/Profile/ProfileViewController.swift
#	Mastodon/Scene/Profile/ProfileViewModel.swift
#	Mastodon/Scene/Profile/RemoteProfileViewModel.swift
#	Mastodon/Scene/Profile/Timeline/UserTimelineViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/Timeline/UserTimelineViewModel+State.swift
#	Mastodon/Scene/Profile/Timeline/UserTimelineViewModel.swift
#	Mastodon/Scene/Report/Report/ReportViewModel.swift
#	Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel+State.swift
#	Mastodon/Scene/Report/ReportStatus/ReportStatusViewModel.swift
#	Mastodon/Scene/Root/MainTab/MainTabBarController.swift
#	Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewController+DataSourceProvider.swift
#	Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel+State.swift
#	Mastodon/Scene/Search/SearchDetail/SearchResult/SearchResultViewModel.swift
#	Mastodon/Scene/Share/View/Content/NotificationView+Configuration.swift
#	Mastodon/Scene/Thread/ThreadViewModel.swift
#	MastodonSDK/Sources/MastodonCore/FetchedResultsController/FeedFetchedResultsController.swift
#	MastodonSDK/Sources/MastodonCore/FetchedResultsController/StatusFetchedResultsController.swift
#	MastodonSDK/Sources/MastodonCore/Persistence/FileManager+SearchHistory.swift
#	MastodonSDK/Sources/MastodonCore/Persistence/FileManager+Timeline.swift
#	MastodonSDK/Sources/MastodonCore/Persistence/Persistence.swift
#	MastodonSDK/Sources/MastodonCore/Service/API/APIService+HomeTimeline.swift
#	MastodonSDK/Sources/MastodonCore/Service/API/APIService+Search.swift
#	MastodonSDK/Sources/MastodonSDK/MastodonStatus.swift
#	MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift
#	MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/Publisher/MastodonStatusPublisher.swift
#	MastodonSDK/Sources/MastodonUI/View/Content/StatusView+Configuration.swift
2024-01-08 22:32:57 +01:00
Marcus Kida 976f934df9
Remove Status from CoreData (#1167) 2024-01-08 11:17:40 +01:00
Nathan Mattes 0b959f5bca Remove private-note and notification from user (IOS-192) 2024-01-05 16:50:44 +01:00
Nathan Mattes 7ab194b15d
Remove remaining Tag-stuff (IOS-186) (#1205) 2024-01-05 16:46:49 +01:00
Nathan Mattes 120b9e18b1 Fix warnings 2024-01-05 12:59:59 +01:00
Nathan Mattes 22d0b45be7 Use account on account-switcher (IOS-192) 2024-01-05 12:56:08 +01:00
Nathan Mattes 6b6ed28134 Emojis aren't optional (IOS-192)
meet []
2024-01-05 12:30:36 +01:00
Nathan Mattes c3d40d260d Use accounts for shortcut-extension (IOS-192)
This is broken atm, see #1204
2024-01-05 11:29:25 +01:00
Nathan Mattes 58501da5fa Merge branch 'develop' into ios-192-profile-about
# Conflicts:
#	Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController+DataSourceProvider.swift
#	Mastodon/Scene/Profile/UserList/UserListViewModel+Diffable.swift
#	Mastodon/Scene/Profile/UserList/UserListViewModel+State.swift
2024-01-03 17:30:56 +01:00
Nathan Mattes 2119c9de0b
Merge pull request #1196 from mastodon/ios-214-refactor-userlist
Use accounts on FavoritedBy/RetootedBy-screens (IOS-214)
2024-01-03 17:13:15 +01:00
Nathan Mattes 695d31720a Fix indention 2024-01-03 17:00:38 +01:00
Nathan Mattes b00625c99a Fix Typo (🙈) 2024-01-03 16:36:03 +01:00
Nathan Mattes 9a25d20e02 Replace another user with an account (IOS-192) 2024-01-02 23:10:17 +01:00
Nathan Mattes 5e2b2d3cdf Use accounts for widgets (IOS-192) 2024-01-02 23:09:50 +01:00
Nathan Mattes 45028373d4 Store accounts in container (IOS-192)
In case you see an empty app: Add your account again.

Background: As we need access to the account from the extensions and the extensions can't access the documents-directory but the group-container, well, the accounts will live there from now on.
2024-01-02 23:05:25 +01:00
Nathan Mattes 7f26dfa6d6 Fix warnings and remove unused code (IOS-192) 2024-01-02 15:37:07 +01:00
Nathan Mattes d1b5b9fc98 Localize button-title for blocked domains (IOS-192) 2024-01-02 15:36:26 +01:00
Nathan Mattes bdb1853b18 Merge branch 'remove_status' into ios-192-profile-about 2024-01-02 12:19:28 +01:00
Nathan Mattes 96fddaef27 192-profile-about
# Conflicts:
#	Mastodon/Protocol/Provider/DataSourceFacade+Status.swift
#	Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift
#	Mastodon/Scene/Profile/ProfileViewController.swift
#	MastodonSDK/Sources/MastodonUI/ViewModel/RelationshipViewModel.swift
2024-01-02 12:15:15 +01:00
Nathan Mattes 01eff2b596
Merge pull request #1198 from mastodon/ios-5-domain-blocks
Add Domain Block (IOS-5)
2024-01-02 11:46:49 +01:00
Nathan Mattes 66c152754d Add missing localization (IOS-5) 2024-01-02 11:42:07 +01:00
Marcus Kida 54b020ff61
Remove dead code 2024-01-02 11:32:27 +01:00
Marcus Kida 2018d7c764
Hide loading spinner after network requesty 2024-01-02 11:05:58 +01:00
Nathan Mattes a6aa4291f6 Remove obsolete wrapper-code 2024-01-01 20:10:37 +01:00
Nathan Mattes ab7b0584dd Replace more users with account (IOS-192)
In Edit and notification
2024-01-01 20:10:22 +01:00
Nathan Mattes 4764116efc Use account to determine status-visibility (IOS-192) 2024-01-01 20:10:00 +01:00
Nathan Mattes 953816ea94 Bump version to 2024.01 2024-01-01 17:33:53 +01:00
Nathan Mattes ed01435f2a
Merge pull request #1202 from mastodon/1201-fix-widgets
Restore credentials for widgets (#1201)
2024-01-01 14:59:52 +01:00
Nathan Mattes 6c4e3efbde Restore credentials for widgets (#1201)
Fixes #1201
2023-12-31 16:44:54 +01:00
Nathan Mattes c152c7b3c7 Don't use user but account on Sidebar on iPad (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes a2c03bd6d1 Remove unused code (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 8e7e16870c Fix some warnings (IOS-192)
As relationship-information isn't optional anymore, there' no need for ?? everywhere (I just missed some)
2023-12-31 12:59:39 +01:00
Nathan Mattes 0f6f6adfba Update header after edit (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 922f7116dd Use account for reblogged statuses (stati?) (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 47986262bc Use relationships in Report-process (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes bb3ad77954 Remove persistence for tags (IOS-192)
Was connected to `let me = authenticationBox.authentication.user(in: managedObjectContext)`
2023-12-31 12:59:39 +01:00
Nathan Mattes 77f0f28960 Don't persist follow-requests (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 71b28cb977 We don't use the author when composing toots (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 11235f3f75 Re-enable pending-check (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes c0e08c4482 Fix warnings (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes f241232972 Remove user (IOS-192) 2023-12-31 12:59:39 +01:00
Nathan Mattes 460ede4852 User UserIdentification for search and accounts (IOS-192)
Thanks to @kimar!
2023-12-31 12:59:38 +01:00
Nathan Mattes 2a14e293e9 Move directory-stuff into its own FileManager-file (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 6225c50008 Add some actions to Relationship-action-button (IOS-192)
Well, it's basically just unblock, unmute or follow/unfollow
2023-12-31 12:57:56 +01:00