Compare commits

...

2 Commits

2 changed files with 6 additions and 8 deletions

View File

@ -44,16 +44,13 @@ 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 urlStr = url, guard let validURL = 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(url: validURL, resolvingAgainstBaseURL: false), let components = URLComponents(string: validURL),
let queryItems = components.queryItems else { let queryItems = components.queryItems else { return nil }
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,11 +160,12 @@ 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: [dismissAction] + cellConfiguration.actions) config = UISwipeActionsConfiguration(actions: cellConfiguration.actions + [dismissAction])
config.performsFirstActionWithFullSwipe = cellConfiguration.performsFirstActionWithFullSwipe
} else { } else {
config = UISwipeActionsConfiguration(actions: [dismissAction]) config = UISwipeActionsConfiguration(actions: [dismissAction])
config.performsFirstActionWithFullSwipe = false
} }
config.performsFirstActionWithFullSwipe = true
return config return config
} }