summaryrefslogtreecommitdiff
path: root/internal/util
diff options
context:
space:
mode:
Diffstat (limited to 'internal/util')
-rw-r--r--internal/util/namestring.go59
-rw-r--r--internal/util/namestring_test.go118
-rw-r--r--internal/util/statustools.go17
3 files changed, 177 insertions, 17 deletions
diff --git a/internal/util/namestring.go b/internal/util/namestring.go
new file mode 100644
index 000000000..611a1c0eb
--- /dev/null
+++ b/internal/util/namestring.go
@@ -0,0 +1,59 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package util
+
+import (
+ "fmt"
+ "strings"
+
+ "github.com/superseriousbusiness/gotosocial/internal/regexes"
+)
+
+// ExtractNamestringParts extracts the username test_user and
+// the domain example.org from a string like @test_user@example.org.
+//
+// If nothing is matched, it will return an error.
+func ExtractNamestringParts(mention string) (username, host string, err error) {
+ matches := regexes.MentionName.FindStringSubmatch(mention)
+ switch len(matches) {
+ case 2:
+ return matches[1], "", nil
+ case 3:
+ return matches[1], matches[2], nil
+ default:
+ return "", "", fmt.Errorf("couldn't match mention %s", mention)
+ }
+}
+
+// ExtractWebfingerParts returns username test_user and
+// domain example.org from a string like acct:test_user@example.org,
+// or acct:@test_user@example.org.
+//
+// If nothing is extracted, it will return an error.
+func ExtractWebfingerParts(webfinger string) (username, host string, err error) {
+ // remove the acct: prefix if it's present
+ webfinger = strings.TrimPrefix(webfinger, "acct:")
+
+ // prepend an @ if necessary
+ if webfinger[0] != '@' {
+ webfinger = "@" + webfinger
+ }
+
+ return ExtractNamestringParts(webfinger)
+}
diff --git a/internal/util/namestring_test.go b/internal/util/namestring_test.go
new file mode 100644
index 000000000..4561a5233
--- /dev/null
+++ b/internal/util/namestring_test.go
@@ -0,0 +1,118 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package util_test
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/suite"
+ "github.com/superseriousbusiness/gotosocial/internal/util"
+)
+
+type NamestringSuite struct {
+ suite.Suite
+}
+
+func (suite *NamestringSuite) TestExtractWebfingerParts1() {
+ webfinger := "acct:stonerkitty.monster@stonerkitty.monster"
+ username, host, err := util.ExtractWebfingerParts(webfinger)
+ suite.NoError(err)
+
+ suite.Equal("stonerkitty.monster", username)
+ suite.Equal("stonerkitty.monster", host)
+}
+
+func (suite *NamestringSuite) TestExtractWebfingerParts2() {
+ webfinger := "@stonerkitty.monster@stonerkitty.monster"
+ username, host, err := util.ExtractWebfingerParts(webfinger)
+ suite.NoError(err)
+
+ suite.Equal("stonerkitty.monster", username)
+ suite.Equal("stonerkitty.monster", host)
+}
+
+func (suite *NamestringSuite) TestExtractWebfingerParts3() {
+ webfinger := "acct:someone@somewhere"
+ username, host, err := util.ExtractWebfingerParts(webfinger)
+ suite.NoError(err)
+
+ suite.Equal("someone", username)
+ suite.Equal("somewhere", host)
+}
+
+func (suite *NamestringSuite) TestExtractWebfingerParts4() {
+ webfinger := "@stoner-kitty.monster@stonerkitty.monster"
+ username, host, err := util.ExtractWebfingerParts(webfinger)
+ suite.NoError(err)
+
+ suite.Equal("stoner-kitty.monster", username)
+ suite.Equal("stonerkitty.monster", host)
+}
+
+func (suite *NamestringSuite) TestExtractWebfingerParts5() {
+ webfinger := "@stonerkitty.monster"
+ username, host, err := util.ExtractWebfingerParts(webfinger)
+ suite.NoError(err)
+
+ suite.Equal("stonerkitty.monster", username)
+ suite.Empty(host)
+}
+
+func (suite *NamestringSuite) TestExtractWebfingerParts6() {
+ webfinger := "@@stonerkitty.monster"
+ _, _, err := util.ExtractWebfingerParts(webfinger)
+ suite.EqualError(err, "couldn't match mention @@stonerkitty.monster")
+}
+
+func (suite *NamestringSuite) TestExtractNamestringParts1() {
+ namestring := "@stonerkitty.monster@stonerkitty.monster"
+ username, host, err := util.ExtractNamestringParts(namestring)
+ suite.NoError(err)
+
+ suite.Equal("stonerkitty.monster", username)
+ suite.Equal("stonerkitty.monster", host)
+}
+
+func (suite *NamestringSuite) TestExtractNamestringParts2() {
+ namestring := "@stonerkitty.monster"
+ username, host, err := util.ExtractNamestringParts(namestring)
+ suite.NoError(err)
+
+ suite.Equal("stonerkitty.monster", username)
+ suite.Empty(host)
+}
+
+func (suite *NamestringSuite) TestExtractNamestringParts3() {
+ namestring := "@someone@somewhere"
+ username, host, err := util.ExtractWebfingerParts(namestring)
+ suite.NoError(err)
+
+ suite.Equal("someone", username)
+ suite.Equal("somewhere", host)
+}
+
+func (suite *NamestringSuite) TestExtractNamestringParts4() {
+ namestring := ""
+ _, _, err := util.ExtractNamestringParts(namestring)
+ suite.EqualError(err, "couldn't match mention ")
+}
+
+func TestNamestringSuite(t *testing.T) {
+ suite.Run(t, &NamestringSuite{})
+}
diff --git a/internal/util/statustools.go b/internal/util/statustools.go
index 08032a8f4..b2b7fffa1 100644
--- a/internal/util/statustools.go
+++ b/internal/util/statustools.go
@@ -19,7 +19,6 @@
package util
import (
- "fmt"
"strings"
"github.com/superseriousbusiness/gotosocial/internal/regexes"
@@ -59,19 +58,3 @@ func DeriveEmojisFromText(text string) []string {
}
return UniqueStrings(emojis)
}
-
-// ExtractMentionParts extracts the username test_user and the domain example.org
-// from a mention string like @test_user@example.org.
-//
-// If nothing is matched, it will return an error.
-func ExtractMentionParts(mention string) (username, domain string, err error) {
- matches := regexes.MentionName.FindStringSubmatch(mention)
- switch len(matches) {
- case 2:
- return matches[1], "", nil
- case 3:
- return matches[1], matches[2], nil
- default:
- return "", "", fmt.Errorf("couldn't match mention %s", mention)
- }
-}
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-13 11:01:20 +0000