+ This GoToSocial instance is currently down for maintenance, starting up, or running database migrations. Please wait.
+If you are the admin of this instance, check your GoToSocial logs for more details, and make sure to not interrupt any running database migrations!
+Hi @1happyturtle, can I reply?
ℹ️ Note from localhost:8080: This reply is pending your approval. You can quickly accept it by liking, boosting or replying to it. You can also accept or reject it at the following link: http://localhost:8080/settings/user/interaction_requests/01J5QVXCCEATJYSXM9H6MZT4JR.
", + "content": "Hi @1happyturtle, can I reply?
", "reblog": null, "application": { "name": "superseriousbusiness", diff --git a/internal/typeutils/util.go b/internal/typeutils/util.go index 1747dbdcd..b4f2e41aa 100644 --- a/internal/typeutils/util.go +++ b/internal/typeutils/util.go @@ -128,12 +128,14 @@ func misskeyReportInlineURLs(content string) []*url.URL { // // Example: // -//ℹ️ Note from your.instance.com: 2 attachment(s) in this status were not downloaded. Treat the following external link(s) with care:
-//Nobody tells you about the </code><del>SECRET CODE</del><code>, do they?
here's a simple status that uses hashtag #Hashtag!
" + withTamilHashtag = "here's a simple status that uses a hashtag in Tamil #தமிழ்" + withTamilHashtagExpected = "here's a simple status that uses a hashtag in Tamil #தமிழ்
" mdWithHTML = "# Title\n\nHere's a simple text in markdown.\n\nHere's a link.\n\nHere's an image:![\"The](\"https://gts.superseriousbusiness.org/assets/logo.png\"){kind=logo}
"
mdWithHTMLExpected = "Here's a simple text in markdown.
Here's a link.
Here's an image:
" mdWithCheekyHTML = "# Title\n\nHere's a simple text in markdown.\n\nHere's a cheeky little script: " @@ -121,6 +123,12 @@ func (suite *MarkdownTestSuite) TestParseWithHashtag() { suite.Equal(withHashtagExpected, formatted.HTML) } +// Regressiom test for https://github.com/superseriousbusiness/gotosocial/issues/3618 +func (suite *MarkdownTestSuite) TestParseWithTamilHashtag() { + formatted := suite.FromMarkdown(withTamilHashtag) + suite.Equal(withTamilHashtagExpected, formatted.HTML) +} + func (suite *MarkdownTestSuite) TestParseWithHTML() { formatted := suite.FromMarkdown(mdWithHTML) suite.Equal(mdWithHTMLExpected, formatted.HTML) diff --git a/internal/text/normalize.go b/internal/text/normalize.go index d2e633d1e..ea266fb33 100644 --- a/internal/text/normalize.go +++ b/internal/text/normalize.go @@ -50,17 +50,16 @@ func NormalizeHashtag(text string) (string, bool) { // Validate normalized result. var ( - notJustUnderscores = false - onlyPermittedChars = true - lengthOK = true + atLeastOneRequiredChar = false + onlyPermittedChars = true + lengthOK = true ) for i, r := range normalized { - if r != '_' { - // This isn't an underscore, - // so the whole hashtag isn't - // just underscores. - notJustUnderscores = true + if !isPermittedIfNotEntireHashtag(r) { + // This isn't an underscore, mark, etc, + // so the hashtag contains at least one + atLeastOneRequiredChar = true } if i >= maximumHashtagLength { @@ -74,5 +73,5 @@ func NormalizeHashtag(text string) (string, bool) { } } - return normalized, (lengthOK && onlyPermittedChars && notJustUnderscores) + return normalized, lengthOK && onlyPermittedChars && atLeastOneRequiredChar } diff --git a/internal/text/plain_test.go b/internal/text/plain_test.go index fac54a38e..ffa64ce44 100644 --- a/internal/text/plain_test.go +++ b/internal/text/plain_test.go @@ -118,20 +118,20 @@ func (suite *PlainTestSuite) TestDeriveHashtagsOK() { ` tags := suite.FromPlain(statusText).Tags - suite.Len(tags, 13) - suite.Equal("testing123", tags[0].Name) - suite.Equal("also", tags[1].Name) - suite.Equal("thisshouldwork", tags[2].Name) - suite.Equal("dupe", tags[3].Name) - suite.Equal("ThisShouldAlsoWork", tags[4].Name) - suite.Equal("this_should_not_be_split", tags[5].Name) - suite.Equal("111111", tags[6].Name) - suite.Equal("alimentación", tags[7].Name) - suite.Equal("saúde", tags[8].Name) - suite.Equal("lävistää", tags[9].Name) - suite.Equal("ö", tags[10].Name) - suite.Equal("네", tags[11].Name) - suite.Equal("ThisOneIsThirteyCharactersLong", tags[12].Name) + if suite.Len(tags, 12) { + suite.Equal("testing123", tags[0].Name) + suite.Equal("also", tags[1].Name) + suite.Equal("thisshouldwork", tags[2].Name) + suite.Equal("dupe", tags[3].Name) + suite.Equal("ThisShouldAlsoWork", tags[4].Name) + suite.Equal("this_should_not_be_split", tags[5].Name) + suite.Equal("alimentación", tags[6].Name) + suite.Equal("saúde", tags[7].Name) + suite.Equal("lävistää", tags[8].Name) + suite.Equal("ö", tags[9].Name) + suite.Equal("네", tags[10].Name) + suite.Equal("ThisOneIsThirteyCharactersLong", tags[11].Name) + } statusText = `#올빼미 hej` tags = suite.FromPlain(statusText).Tags @@ -170,8 +170,17 @@ func (suite *PlainTestSuite) TestDeriveMultiple() { func (suite *PlainTestSuite) TestZalgoHashtag() { statusText := `yo who else loves #praying to #z̸͉̅a̸͚͋l̵͈̊g̸̫͌ỏ̷̪?` f := suite.FromPlain(statusText) - suite.Len(f.Tags, 1) - suite.Equal("praying", f.Tags[0].Name) + if suite.Len(f.Tags, 2) { + suite.Equal("praying", f.Tags[0].Name) + // NFC doesn't do much for Zalgo text, but it's difficult to strip marks without affecting non-Latin text. + suite.Equal("z̸͉̅a̸͚͋l̵͈̊g̸̫͌ỏ̷̪", f.Tags[1].Name) + } +} + +func (suite *PlainTestSuite) TestNumbersAreNotHashtags() { + statusText := `yo who else thinks #19_98 is #1?` + f := suite.FromPlain(statusText) + suite.Len(f.Tags, 0) } func TestPlainTestSuite(t *testing.T) { diff --git a/internal/text/util.go b/internal/text/util.go index af45cfaf0..47b2416dd 100644 --- a/internal/text/util.go +++ b/internal/text/util.go @@ -19,19 +19,14 @@ import "unicode" -func isPlausiblyInHashtag(r rune) bool { - // Marks are allowed during parsing - // prior to normalization, but not after, - // since they may be combined into letters - // during normalization. - return unicode.IsMark(r) || - isPermittedInHashtag(r) +func isPermittedInHashtag(r rune) bool { + return unicode.IsLetter(r) || isPermittedIfNotEntireHashtag(r) } -func isPermittedInHashtag(r rune) bool { - return unicode.IsLetter(r) || - unicode.IsNumber(r) || - r == '_' +// isPermittedIfNotEntireHashtag is true for characters that may be in a hashtag +// but are not allowed to be the only characters making up the hashtag. +func isPermittedIfNotEntireHashtag(r rune) bool { + return unicode.IsNumber(r) || unicode.IsMark(r) || r == '_' } // isHashtagBoundary returns true if rune r From 8a9422aa783e7d053a0d35eaac14914b7882b479 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 31 Jan 2025 13:45:39 +0100 Subject: [PATCH 10/13] [bugfix] shut down LE server nicely (#3714) * [bugfix] shut down LE server nicely --- internal/router/router.go | 51 +++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/internal/router/router.go b/internal/router/router.go index cf9033059..c2bf18b4f 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -48,6 +48,7 @@ type Router struct { engine *gin.Engine srv *http.Server + leSrv *http.Server } // New returns a new Router, which wraps @@ -185,15 +186,38 @@ func (r *Router) Start() error { // Stop shuts down the router nicely. func (r *Router) Stop() error { - log.Infof(nil, "shutting down http router with %s grace period", shutdownTimeout) - timeout, cancel := context.WithTimeout(context.Background(), shutdownTimeout) - defer cancel() + ctx := context.Background() - if err := r.srv.Shutdown(timeout); err != nil { - return fmt.Errorf("error shutting down http router: %s", err) + // Shut down "main" server. + if err := stopServer(ctx, r.srv, "http server"); err != nil { + return err } - log.Info(nil, "http router closed connections and shut down gracefully") + // Shut down letsencrypt + // server if enabled. + if r.leSrv != nil { + if err := stopServer(ctx, r.leSrv, "letsencrypt http server"); err != nil { + return err + } + } + + return nil +} + +func stopServer( + ctx context.Context, + s *http.Server, + name string, +) error { + timeout, cancel := context.WithTimeout(ctx, shutdownTimeout) + defer cancel() + + log.Infof(nil, "shutting down %s with %s grace period", name, shutdownTimeout) + if err := s.Shutdown(timeout); err != nil { + return fmt.Errorf("error shutting down %s: %w", name, err) + } + + log.Infof(ctx, "%s closed connections and shut down gracefully", name) return nil } @@ -228,8 +252,8 @@ func (r *Router) customTLS( // letsEncryptTLS modifies the router's underlying http // server to use LetsEncrypt via an ACME Autocert manager. // -// It also starts a listener on the configured LetsEncrypt -// port to validate LE requests. +// It also sets r.leSrv and starts a listener on the +// configured LetsEncrypt port to validate LE requests. func (r *Router) letsEncryptTLS() (func() error, error) { acm := &autocert.Manager{ Prompt: autocert.AcceptTOS, @@ -261,17 +285,18 @@ func (r *Router) letsEncryptTLS() (func() error, error) { // Take our own copy of the HTTP server, // and update it to serve LetsEncrypt // requests via the autocert manager. - leSrv := (*r.srv) //nolint:govet - leSrv.Handler = acm.HTTPHandler(fallback) - leSrv.Addr = fmt.Sprintf("%s:%d", + r.leSrv = new(http.Server) //nolint:gosec + *r.leSrv = (*r.srv) //nolint:govet + r.leSrv.Handler = acm.HTTPHandler(fallback) + r.leSrv.Addr = fmt.Sprintf("%s:%d", config.GetBindAddress(), config.GetLetsEncryptPort(), ) go func() { // Start the LetsEncrypt autocert manager HTTP server. - log.Infof(nil, "letsencrypt listening on %s", leSrv.Addr) - if err := leSrv.ListenAndServe(); err != nil && + log.Infof(nil, "letsencrypt listening on %s", r.leSrv.Addr) + if err := r.leSrv.ListenAndServe(); err != nil && err != http.ErrServerClosed { log.Panicf(nil, "letsencrypt: listen: %v", err) } From fc895ade0262e27aff6a49bf33a460158a744beb Mon Sep 17 00:00:00 2001 From: Vyr Cossont