Compare commits

..

No commits in common. "682d68fd8100c7c5ed6b850484c4c6b527e5f198" and "f0c0376f80002e030ef6027851e941af6dde9ce7" have entirely different histories.

2 changed files with 8 additions and 6 deletions

View File

@ -44,13 +44,16 @@ extension Pagination {
} }
let rel = segments.last?.replacingOccurrences(of: "\"", with: "").trimmingCharacters(in: .whitespaces).components(separatedBy: "=") let rel = segments.last?.replacingOccurrences(of: "\"", with: "").trimmingCharacters(in: .whitespaces).components(separatedBy: "=")
guard let validURL = url, guard let urlStr = url,
let validURL = URL(string: urlStr),
let key = rel?.first, let key = rel?.first,
key == "rel", key == "rel",
let value = rel?.last, let value = rel?.last,
let kind = Kind(rawValue: value), let kind = Kind(rawValue: value),
let components = URLComponents(string: validURL), let components = URLComponents(url: validURL, resolvingAgainstBaseURL: false),
let queryItems = components.queryItems else { return nil } let queryItems = components.queryItems else {
return nil
}
let min = queryItems.first { $0.name == "min_id" }?.value let min = queryItems.first { $0.name == "min_id" }?.value
let since = queryItems.first { $0.name == "since_id" }?.value let since = queryItems.first { $0.name == "since_id" }?.value

View File

@ -160,12 +160,11 @@ class NotificationsTableViewController: EnhancedTableViewController {
let cellConfiguration = (tableView.cellForRow(at: indexPath) as? TableViewSwipeActionProvider)?.trailingSwipeActionsConfiguration() let cellConfiguration = (tableView.cellForRow(at: indexPath) as? TableViewSwipeActionProvider)?.trailingSwipeActionsConfiguration()
let config: UISwipeActionsConfiguration let config: UISwipeActionsConfiguration
if let cellConfiguration = cellConfiguration { if let cellConfiguration = cellConfiguration {
config = UISwipeActionsConfiguration(actions: cellConfiguration.actions + [dismissAction]) config = UISwipeActionsConfiguration(actions: [dismissAction] + cellConfiguration.actions)
config.performsFirstActionWithFullSwipe = cellConfiguration.performsFirstActionWithFullSwipe
} else { } else {
config = UISwipeActionsConfiguration(actions: [dismissAction]) config = UISwipeActionsConfiguration(actions: [dismissAction])
config.performsFirstActionWithFullSwipe = false
} }
config.performsFirstActionWithFullSwipe = true
return config return config
} }