forked from shadowfacts/Tusker
Fix replied-to account not being first mention
This commit is contained in:
parent
b2fe2fdf9a
commit
6bd2eacb88
|
@ -11,10 +11,10 @@ import Foundation
|
|||
extension Array {
|
||||
func uniques<ID: Hashable>(by identify: (Element) -> ID) -> [Element] {
|
||||
var uniques = Set<Hashed<Element, ID>>()
|
||||
for elem in self {
|
||||
uniques.insert(Hashed(element: elem, id: identify(elem)))
|
||||
for (index, elem) in self.enumerated() {
|
||||
uniques.insert(Hashed(element: elem, id: identify(elem), origIndex: index))
|
||||
}
|
||||
return uniques.map(\.element)
|
||||
return uniques.sorted(by: { $0.origIndex < $1.origIndex }).map(\.element)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -27,6 +27,7 @@ extension Array where Element: Hashable {
|
|||
fileprivate struct Hashed<Element, ID: Hashable>: Hashable {
|
||||
let element: Element
|
||||
let id: ID
|
||||
let origIndex: Int
|
||||
|
||||
static func ==(lhs: Self, rhs: Self) -> Bool {
|
||||
return lhs.id == rhs.id
|
||||
|
|
|
@ -19,6 +19,12 @@ final class ArrayUniqueTests: XCTestCase {
|
|||
XCTAssertEqual([a, b].uniques(by: \.string), [a])
|
||||
}
|
||||
|
||||
func testUniquesOrder() {
|
||||
let a = Test(string: "a")
|
||||
let b = Test(string: "b")
|
||||
XCTAssertEqual([a, b].uniques(), [a, b])
|
||||
}
|
||||
|
||||
class Test: NSObject {
|
||||
let id = UUID()
|
||||
let string: String
|
||||
|
|
Loading…
Reference in New Issue