Replace some LegacyRegex instantiations with regex literals

fwcd · Feb 13, 2024 · d12bb86 · d12bb86
1 parent abf6f26
commit d12bb86
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Sources/D2Commands/CommandCategory.swift b/Sources/D2Commands/CommandCategory.swift
@@ -1,6 +1,6 @@
 import Utils
 
-fileprivate let emojiPattern = try! LegacyRegex(from: ":[^:]:")
+fileprivate let emojiPattern = #/:[^:]:/#
 
 public enum CommandCategory: String, CaseIterable, CustomStringConvertible, Equatable {
     case administration
@@ -57,6 +57,6 @@ public enum CommandCategory: String, CaseIterable, CustomStringConvertible, Equa
         }
     }
     public var plainDescription: String {
-        emojiPattern.replace(in: description, with: "").trimmingCharacters(in: .whitespacesAndNewlines)
+        description.replacing(emojiPattern, with: "").trimmingCharacters(in: .whitespacesAndNewlines)
     }
 }
diff --git a/Sources/D2Commands/administration/GrantPermissionCommand.swift b/Sources/D2Commands/administration/GrantPermissionCommand.swift
@@ -2,7 +2,7 @@ import D2MessageIO
 import D2Permissions
 import Utils
 
-fileprivate let inputPattern = try! LegacyRegex(from: "(?:(?:(?:<\\S+>)|(?:@\\S+))\\s+)+(.+)")
+fileprivate let inputPattern = #/(?:(?:(?:<\S+>)|(?:@\S+))\s+)+(?<level>.+)/#
 
 public class GrantPermissionCommand: StringCommand {
     public let info = CommandInfo(
@@ -18,8 +18,8 @@ public class GrantPermissionCommand: StringCommand {
     }
 
     public func invoke(with input: String, output: any CommandOutput, context: CommandContext) {
-        if let parsedArgs = inputPattern.firstGroups(in: input) {
-            let rawLevel = parsedArgs[1]
+        if let parsedArgs = try? inputPattern.firstMatch(in: input) {
+            let rawLevel = String(parsedArgs.level)
             if let level = PermissionLevel.of(rawLevel) {
                 var response = ""
                 var changedPermissions = false

diff --git a/Sources/D2Commands/administration/RevokePermissionCommand.swift b/Sources/D2Commands/administration/RevokePermissionCommand.swift
@@ -2,7 +2,7 @@ import D2MessageIO
 import D2Permissions
 import Utils
 
-fileprivate let inputPattern = try! LegacyRegex(from: "(?:(?:<\\S+>)|(?:@\\S+))(?:\\s+(?:(?:<\\S+>)|(?:@\\S+)))*\\s*")
+fileprivate let inputPattern = #/(?:(?:<\S+>)|(?:@\S+))(?:\s+(?:(?:<\S+>)|(?:@\S+)))*\s*/#
 
 public class RevokePermissionCommand: StringCommand {
     public let info = CommandInfo(
@@ -18,7 +18,7 @@ public class RevokePermissionCommand: StringCommand {
     }
 
     public func invoke(with input: String, output: any CommandOutput, context: CommandContext) {
-        if inputPattern.matchCount(in: input) > 0 {
+        if input.matches(of: inputPattern).count > 0 {
             var response = ""
             var changedPermissions = false