zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity
6,194 Commits 34 Branches 78 Tags 63 MiB
Commit Graph

2110 Commits

Author SHA1 Message Date
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 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 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 7f26dfa6d6 Fix warnings and remove unused code (IOS-192) 2024-01-02 15:37:07 +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 66c152754d Add missing localization (IOS-5) 2024-01-02 11:42:07 +01:00
Marcus Kida 2018d7c764
Hide loading spinner after network requesty 2024-01-02 11:05:58 +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 47986262bc Use relationships in Report-process (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 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
Nathan Mattes 59fe79fe49 Fix bug in follows-you-label (IOS-192) 
🤦 RTFM (and add some docs)
 2023-12-31 12:57:56 +01:00
Nathan Mattes 9e49775201 Make image clickable again (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 1b1274c2f7 Show correct account for "quoted" posts in notifications (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 76304e59e5 Configure Profile-button based on relationship and accounts (IOS-192) 
Also `me` is not optional anymore as we need it
 2023-12-31 12:57:56 +01:00
Nathan Mattes 393722a31d Reenable followers/followees (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes f9492e07a3 Kill some forced unwrapping and hide bio when blocked/blocking (IOS-192) 
First rule of optionals: Don't use forced unwrapping!
 2023-12-31 12:57:56 +01:00
Nathan Mattes 2f0614d9c9 Refactor Mute/Block/HideReblogs to work with relationships (IOS-192) 
Also: Connect Blocking/BlockedBy
 2023-12-31 12:57:56 +01:00
Nathan Mattes b7bb271b40 Re-enable blur-effect for pictures (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 0729fa41f2 Re-enable "Follows you"-indicator (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 099cb724d0 Configure barbutton-items on profile-screen (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes e7c1edbbc3 Persist user after login (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 6aea178609 Add relationship to ProfileViewModel (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 6cc069ec5b Try to fix domain (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes f373506aa3 Remove user from UserItem-lists (IOS-192) 
Also: Remove CoreData and replace User with Account in several places
 2023-12-31 12:57:56 +01:00
Nathan Mattes 3abb80a5df Migrate UserList to use Accounts (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes f51d5b7fe2 Replace MastodonUser.ID with string (IOS-192) 2023-12-31 12:57:56 +01:00
Nathan Mattes 60aafe6330 Add JSON-based account-persistence (IOS-192) 
This is per user.

Also: Fetch authenticated accounts regularly
Also: Move Persistence-stuff to MastodonCore because.
 2023-12-31 12:57:56 +01:00
Nathan Mattes d3c7ba2c7c Show header-meta-information about account (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 873f282ad1 Fix fields (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 34b962e3ca Remove me/remote-profile-viewmodel (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 2be8d5b8df WIP: Comment out and replace user with status (IOS-192) 2023-12-31 12:56:59 +01:00
Nathan Mattes 682fe27319 Sprinkle in some deprecations to see what needs to be done with MastodonUser (IOS-192, IOS-189) 2023-12-31 12:54:09 +01:00