File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed
Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -65,10 +65,10 @@ const useStyles = makeStyles((theme) => ({
6565 } ,
6666} ) ) ;
6767
68- const makeUserRE = ( username ) => {
68+ const makeMentionRE = ( username ) => {
6969 username = username . replace ( / [ \\ ^ $ . * + ? ( ) [ \] { } | ] / g, "\\$&" ) ;
7070 username = username . replace ( / ^ a n o n y m o u s / i, "($&)?" ) ;
71- return new RegExp ( `@(all|${ username } )\\b ` , "i " ) ;
71+ return new RegExp ( `@(all|${ username } )(\\W|$) ` , "iu " ) ;
7272} ;
7373
7474/** A chat sidebar element, opens lobby chat when the `gameId` prop is not set. */
@@ -106,10 +106,10 @@ function Chat({
106106 [ databasePath , messageLimit ]
107107 ) ;
108108 const messages = useFirebaseQuery ( messagesQuery ) ;
109- const userRE = useMemo ( ( ) => makeUserRE ( user . name ) , [ user . name ] ) ;
109+ const mentionRE = useMemo ( ( ) => makeMentionRE ( user . name ) , [ user . name ] ) ;
110110
111111 const addMentioned = ( cls , message ) => {
112- return userRE . test ( message ) ? `${ cls } ${ classes . mentioned } ` : cls ;
112+ return mentionRE . test ( message ) ? `${ cls } ${ classes . mentioned } ` : cls ;
113113 } ;
114114
115115 function handleSubmit ( event ) {
You can’t perform that action at this time.
0 commit comments