mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2026-01-04 23:03:17 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into instance-custom-css

Browse source
This commit is contained in:
tobi 2024-12-02 10:55:05 +01:00
commit 7cd9b0eae0
947 changed files with 689490 additions and 178161 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/validate/formvalidation.go
View file

@ -200,11 +200,11 @@ func InstanceCustomCSS(customCSS string) error {
}
// EmojiShortcode just runs the given shortcode through the regular expression
// for emoji shortcodes, to figure out whether it's a valid shortcode, ie., 2-30 characters,
// for emoji shortcodes, to figure out whether it's a valid shortcode, ie., 1-30 characters,
// a-zA-Z, numbers, and underscores.
func EmojiShortcode(shortcode string) error {
if !regexes.EmojiValidator.MatchString(shortcode) {
return fmt.Errorf("shortcode %s did not pass validation, must be between 2 and 30 characters, letters, numbers, and underscores only", shortcode)
return fmt.Errorf("shortcode %s did not pass validation, must be between 1 and 30 characters, letters, numbers, and underscores only", shortcode)
}
return nil
}

6
internal/validate/formvalidation_test.go
View file

@ -345,7 +345,7 @@ func (suite *ValidationTestSuite) TestValidateEmojiShortcode() {
},
{
shortcode: "p",
ok: false,
ok: true,
},
{
shortcode: "pp",
@ -361,6 +361,10 @@ func (suite *ValidationTestSuite) TestValidateEmojiShortcode() {
},
{
shortcode: "_",
ok: true,
},
{
shortcode: "",
ok: false,
},
{