Fahim
/
Tusker
forked from shadowfacts/Tusker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't show Follow activity for user's own account

This commit is contained in:
Shadowfacts 2020-06-19 23:00:59 -04:00
parent ba3e9e7491
commit 393a134648
Signed by untrusted user: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Tusker/Screens/Profile/ProfileTableViewController.swift
View File

@ -303,19 +303,27 @@ extension ProfileTableViewController: ProfileHeaderTableViewCellDelegate {
func showMoreOptions(cell: ProfileHeaderTableViewCell) { func showMoreOptions(cell: ProfileHeaderTableViewCell) {
let account = mastodonController.persistentContainer.account(for: accountID)! let account = mastodonController.persistentContainer.account(for: accountID)!
let request = Client.getRelationships(accounts: [account.id]) func showActivityController(activities: [UIActivity]) {
mastodonController.run(request) { (response) in let activityController = UIActivityViewController(activityItems: [account.url, AccountActivityItemSource(account)], applicationActivities: activities)
var customActivities: [UIActivity] = [OpenInSafariActivity()] activityController.completionWithItemsHandler = OpenInSafariActivity.completionHandler(viewController: self, url: account.url)
if case let .success(results, _) = response, let relationship = results.first { activityController.popoverPresentationController?.sourceView = cell.moreButtonVisualEffectView
let toggleFollowActivity = relationship.following ? UnfollowAccountActivity() : FollowAccountActivity() self.present(activityController, animated: true)
customActivities.insert(toggleFollowActivity, at: 0) }
}
if account.id == mastodonController.account.id {
DispatchQueue.main.async { showActivityController(activities: [OpenInSafariActivity()])
let activityController = UIActivityViewController(activityItems: [account.url, AccountActivityItemSource(account)], applicationActivities: customActivities) } else {
activityController.completionWithItemsHandler = OpenInSafariActivity.completionHandler(viewController: self, url: account.url) let request = Client.getRelationships(accounts: [account.id])
activityController.popoverPresentationController?.sourceView = cell.moreButtonVisualEffectView mastodonController.run(request) { (response) in
self.present(activityController, animated: true) var customActivities: [UIActivity] = [OpenInSafariActivity()]
if case let .success(results, _) = response, let relationship = results.first {
let toggleFollowActivity = relationship.following ? UnfollowAccountActivity() : FollowAccountActivity()
customActivities.insert(toggleFollowActivity, at: 0)
}
DispatchQueue.main.async {
showActivityController(activities: customActivities)
}
} }
} }
} }