Fix deprecation warnings

SOBotics · Nov 2, 2017 · f7187b0 · f7187b0
1 parent a7fc3ad
commit f7187b0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Sources/SwiftChatSE/ChatListener.swift b/Sources/SwiftChatSE/ChatListener.swift
@@ -154,7 +154,7 @@ open class ChatListener {
                         for usageComponent in availableUsageComponents {
                             for component in availableComponents {
                                 let distance = Levenshtein.distanceBetween(usageComponent, and: component)
-                                let componentScore = min(distance, usageComponent.characters.count)
+                                let componentScore = min(distance, usageComponent.count)
 
                                 if componentScore < bestMatch?.score ?? Int.max {
                                     bestMatch = (score: componentScore, component: component, usageComponent: usageComponent)
@@ -176,13 +176,13 @@ open class ChatListener {
                     }
                     for _ in args {
                         if !availableComponents.isEmpty {
-                            score += availableComponents.first!.characters.count / 3
+                            score += availableComponents.first!.count / 3
                             availableComponents.removeFirst()
                         }
                     }
 
                     for component in (availableComponents + availableUsageComponents) {
-                        score += component.characters.count
+                        score += component.count
                     }
 
                     commandScores[usage] = score
@@ -200,7 +200,7 @@ open class ChatListener {
                     $0 != "*" && $0 != "..."
                 }.joined(separator: " ")
 
-            if score <= Int(ceil(Float(commandCharacters.characters.count)/2.0)) && score < (lowest?.score ?? Int.max) {
+            if score <= Int(ceil(Float(commandCharacters.count)/2.0)) && score < (lowest?.score ?? Int.max) {
                 lowest = (command, score)
             }
         }
@@ -216,10 +216,10 @@ open class ChatListener {
     open func processMessage(_ room: ChatRoom, message: ChatMessage, isEdit: Bool) {
         let lowercase = message.content.lowercased()
 
-        let shortName = String(name.characters[
-            name.characters.startIndex..<name.characters.index(
-                name.characters.startIndex,
-                offsetBy: min(name.characters.count, minNameCharacters)
+        let shortName = String(name[
+            name.startIndex..<name.index(
+                name.startIndex,
+                offsetBy: min(name.count, minNameCharacters)
             )]
         )
 

diff --git a/Sources/SwiftChatSE/ChatRoom.swift b/Sources/SwiftChatSE/ChatRoom.swift
@@ -407,7 +407,7 @@ open class ChatRoom: NSObject {
     ///- parameter completion: The completion handler to call when the message is posted.
     ///The message ID will be passed to the completion handler.
     open func postMessage(_ message: String, completion: ((Int?) -> Void)? = nil) {
-        if message.characters.count == 0 {
+        if message.count == 0 {
             return
         }
         messageQueue.append((message, completion))

diff --git a/Sources/SwiftChatSE/CommandPrivilege.swift b/Sources/SwiftChatSE/CommandPrivilege.swift
@@ -56,7 +56,7 @@ open class CommandPrivilege: Command {
 			let cleanedName = chatUser.name.replacingOccurrences(of: " ", with: "").lowercased()
 			if chatUser.id == Int(user) ||
 				cleanedName == user.lowercased() ||
-				(user.hasPrefix("@") && cleanedName == String(user.lowercased().characters.dropFirst())) || 
+				(user.hasPrefix("@") && cleanedName == String(user.lowercased().dropFirst())) || 
 				chatUser.id == idFromURL {
 
 				targetUser = chatUser

diff --git a/Sources/SwiftChatSE/Utilites.swift b/Sources/SwiftChatSE/Utilites.swift
@@ -83,9 +83,9 @@ public func makeTable(_ heading: [String], contents: [String]...) -> String {
 	var tableWidth = 0
 
 	for col in 0..<cols {
-		maxLength.append(heading[col].characters.count)
+		maxLength.append(heading[col].count)
 		for row in contents[col] {
-			maxLength[col] = max(row.characters.count, maxLength[col])
+			maxLength[col] = max(row.count, maxLength[col])
 		}
 		rows = max(contents[col].count, rows)
 		alignedHeading.append(heading[col].padding(toLength: maxLength[col], withPad: " ", startingAt: 0))