fix breakage of @A@b.c mentions

dimkr · Sep 28, 2023 · 970dea3 · 970dea3
1 parent 46388ad
commit 970dea3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/cfg/cfg.go b/cfg/cfg.go
@@ -32,6 +32,6 @@ var (
 )
 
 func init() {
-	flag.StringVar(&Domain, "domain", "localhost", "Domain name")
+	flag.StringVar(&Domain, "domain", "localhost.localdomain", "Domain name")
 	flag.IntVar(&LogLevel, "loglevel", int(slog.LevelInfo), "Logging verbosity")
 }
diff --git a/front/post.go b/front/post.go
@@ -32,7 +32,7 @@ import (
 )
 
 var (
-	mentionRegex = regexp.MustCompile(`\B@(\w+)(?:@(\w+)){0,1}\b`)
+	mentionRegex = regexp.MustCompile(`\B@(\w+)(?:@(\w+\.\w+)){0,1}\b`)
 	hashtagRegex = regexp.MustCompile(`\B#\w{1,32}\b`)
 )
 

diff --git a/test/follow_test.go b/test/follow_test.go
@@ -186,7 +186,7 @@ func TestFollow_AlreadyFollowing(t *testing.T) {
 	assert.Equal(fmt.Sprintf("30 /users/outbox/%x\r\n", sha256.Sum256([]byte(server.Bob.ID))), follow)
 
 	follow = server.Handle(fmt.Sprintf("/users/follow/%x", sha256.Sum256([]byte(server.Bob.ID))), server.Alice)
-	assert.Equal("40 Already following https://localhost/user/bob\r\n", follow)
+	assert.Equal("40 Already following https://localhost.localdomain/user/bob\r\n", follow)
 }
 
 func TestFollow_NoSuchUser(t *testing.T) {

diff --git a/test/inbox_test.go b/test/inbox_test.go
@@ -258,11 +258,11 @@ func TestInbox_NoMentionAndMentionWithHost(t *testing.T) {
 	whisper := server.Handle("/users/whisper?Hello%20alice%21", server.Bob)
 	assert.Regexp("30 /users/view/[0-9a-f]{64}", whisper)
 
-	whisper = server.Handle("/users/whisper?Hello%20%40alice%40localhost%21", server.Carol)
+	whisper = server.Handle("/users/whisper?Hello%20%40alice%40localhost.localdomain%21", server.Carol)
 	assert.Regexp("30 /users/view/[0-9a-f]{64}", whisper)
 
 	today := server.Handle("/users/inbox/today", server.Alice)
-	postWithMention := strings.Index(today, "Hello @alice@localhost!")
+	postWithMention := strings.Index(today, "Hello @alice@localhost.localdomain!")
 	postWithoutMention := strings.Index(today, "Hello alice!")
 	assert.NotEqual(postWithMention, -1)
 	assert.NotEqual(postWithoutMention, -1)

diff --git a/test/resolve_test.go b/test/resolve_test.go
@@ -29,7 +29,7 @@ func TestResolve_LocalUser(t *testing.T) {
 
 	assert := assert.New(t)
 
-	resolve := server.Handle("/users/resolve?alice%40localhost", server.Bob)
+	resolve := server.Handle("/users/resolve?alice%40localhost.localdomain", server.Bob)
 	assert.Equal(fmt.Sprintf("30 /users/outbox/%x\r\n", sha256.Sum256([]byte(server.Alice.ID))), resolve)
 }
 
@@ -49,8 +49,8 @@ func TestResolve_NoSuchLocalUser(t *testing.T) {
 
 	assert := assert.New(t)
 
-	resolve := server.Handle("/users/resolve?troll%40localhost", server.Bob)
-	assert.Equal("40 Failed to resolve troll@localhost\r\n", resolve)
+	resolve := server.Handle("/users/resolve?troll%40localhost.localdomain", server.Bob)
+	assert.Equal("40 Failed to resolve troll@localhost.localdomain\r\n", resolve)
 }
 
 func TestResolve_NoSuchLocalUserByNameOnly(t *testing.T) {
@@ -60,7 +60,7 @@ func TestResolve_NoSuchLocalUserByNameOnly(t *testing.T) {
 	assert := assert.New(t)
 
 	resolve := server.Handle("/users/resolve?troll", server.Bob)
-	assert.Equal("40 Failed to resolve troll@localhost\r\n", resolve)
+	assert.Equal("40 Failed to resolve troll@localhost.localdomain\r\n", resolve)
 }
 
 func TestResolve_NoSuchFederatedUser(t *testing.T) {
@@ -89,7 +89,7 @@ func TestResolve_InvalidEscapeSequence(t *testing.T) {
 
 	assert := assert.New(t)
 
-	resolve := server.Handle("/users/resolve?troll%zzlocalhost ", server.Bob)
+	resolve := server.Handle("/users/resolve?troll%zzlocalhost.localdomain ", server.Bob)
 	assert.Equal("40 Bad input\r\n", resolve)
 }
 
@@ -99,7 +99,7 @@ func TestResolve_InvalidInputFormat(t *testing.T) {
 
 	assert := assert.New(t)
 
-	resolve := server.Handle("/users/resolve?troll%40localhost%400.0.0.0", server.Bob)
+	resolve := server.Handle("/users/resolve?troll%40localhost.localdomain%400.0.0.0", server.Bob)
 	assert.Equal("40 Bad input\r\n", resolve)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ import ( @@
     )
     var (
-    	mentionRegex = regexp.MustCompile(`\B@(\w+)(?:@(\w+)){0,1}\b`)
+    	mentionRegex = regexp.MustCompile(`\B@(\w+)(?:@(\w+\.\w+)){0,1}\b`)
     	hashtagRegex = regexp.MustCompile(`\B#\w{1,32}\b`)
     )
@@ Expand Down @@