h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 18:42:56 +08:00
Code Issues Releases Wiki Activity

Fixes detection of mentioning of user falsely detects messages where the username is coincidentally contained in words of a message.

Browse Source
This commit is contained in:
tbrose 2021-12-06 23:32:21 +01:00
parent 0a6c221de4
commit 39594b7362
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Online/Chat/MessageNotifier.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -126,10 +127,14 @@ namespace osu.Game.Online.Chat
} }
/// <summary> /// <summary>
/// Checks if <paramref name="message"/> contains <paramref name="username"/>. /// Checks if <paramref name="message"/> mentions <paramref name="username"/>.
/// This will match against the case where underscores are used instead of spaces (which is how osu-stable handles usernames with spaces). /// This will match against the case where underscores are used instead of spaces (which is how osu-stable handles usernames with spaces).
/// </summary> /// </summary>
public static bool checkContainsUsername(string message, string username) => message.Contains(username, StringComparison.OrdinalIgnoreCase) || message.Contains(username.Replace(' ', '_'), StringComparison.OrdinalIgnoreCase); public static bool checkContainsUsername(string message, string username) {
string fullName = Regex.Escape(username);
string underscoreName = Regex.Escape(username.Replace(' ', '_'));
return new Regex($"\\b({fullName}|{underscoreName})\\b", RegexOptions.IgnoreCase).Matches(message).Count > 0;
}
public class PrivateMessageNotification : OpenChannelNotification public class PrivateMessageNotification : OpenChannelNotification
{ {