permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 03:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow unicode letter characters in nicknames (#435)

Browse Source
This commit is contained in:
Mario Nachbaur
2025-08-12 20:08:53 +02:00
committed by GitHub
parent db3c3b77f5
commit 030d6e0f11
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/ViewModels/ChatViewModel.swift
+5 -5
View File
@@ -122,7 +122,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
// MARK: - Autocomplete Properties // MARK: - Autocomplete Properties
// Autocomplete optimization // Autocomplete optimization
private let mentionRegex = try? NSRegularExpression(pattern: "@([a-zA-Z0-9_]*)$", options: []) private let mentionRegex = try? NSRegularExpression(pattern: "@([\\p{L}0-9_]*)$", options: [])
private var cachedNicknames: [String] = [] private var cachedNicknames: [String] = []
private var lastNicknameUpdate: Date = .distantPast private var lastNicknameUpdate: Date = .distantPast
@@ -1652,7 +1652,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
var processedContent = AttributedString() var processedContent = AttributedString()
// Regular expressions for mentions and hashtags // Regular expressions for mentions and hashtags
let mentionPattern = "@([a-zA-Z0-9_]+)" let mentionPattern = "@([\\p{L}0-9_]+)"
let hashtagPattern = "#([a-zA-Z0-9_]+)" let hashtagPattern = "#([a-zA-Z0-9_]+)"
let mentionRegex = try? NSRegularExpression(pattern: mentionPattern, options: []) let mentionRegex = try? NSRegularExpression(pattern: mentionPattern, options: [])
@@ -1751,7 +1751,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
let content = message.content let content = message.content
let hashtagPattern = "#([a-zA-Z0-9_]+)" let hashtagPattern = "#([a-zA-Z0-9_]+)"
let mentionPattern = "@([a-zA-Z0-9_]+)" let mentionPattern = "@([\\p{L}0-9_]+)"
let hashtagRegex = try? NSRegularExpression(pattern: hashtagPattern, options: []) let hashtagRegex = try? NSRegularExpression(pattern: hashtagPattern, options: [])
let mentionRegex = try? NSRegularExpression(pattern: mentionPattern, options: []) let mentionRegex = try? NSRegularExpression(pattern: mentionPattern, options: [])
@@ -1876,7 +1876,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
var processedContent = AttributedString() var processedContent = AttributedString()
// Regular expression to find @mentions // Regular expression to find @mentions
let pattern = "@([a-zA-Z0-9_]+)" let pattern = "@([\\p{L}0-9_]+)"
let regex = try? NSRegularExpression(pattern: pattern, options: []) let regex = try? NSRegularExpression(pattern: pattern, options: [])
let matches = regex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: contentText.count)) ?? [] let matches = regex?.matches(in: contentText, options: [], range: NSRange(location: 0, length: contentText.count)) ?? []
@@ -3073,7 +3073,7 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
// MARK: - Helper Methods // MARK: - Helper Methods
private func parseMentions(from content: String) -> [String] { private func parseMentions(from content: String) -> [String] {
let pattern = "@([a-zA-Z0-9_]+)" let pattern = "@([\\p{L}0-9_]+)"
let regex = try? NSRegularExpression(pattern: pattern, options: []) let regex = try? NSRegularExpression(pattern: pattern, options: [])
let matches = regex?.matches(in: content, options: [], range: NSRange(location: 0, length: content.count)) ?? [] let matches = regex?.matches(in: content, options: [], range: NSRange(location: 0, length: content.count)) ?? []