diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-12-27 11:23:52 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-12-27 11:23:52 +0100 |
| commit | 0ff52b71f2c0e970b1f0d43793c019bbed93e112 (patch) | |
| tree | eff120472b4b6f837121536ada03f530d213b13e /internal/typeutils | |
| parent | [bugfix] :innocent: (#2476) (diff) | |
| download | gotosocial-0ff52b71f2c0e970b1f0d43793c019bbed93e112.tar.xz | |
[chore] Refactor HTML templates and CSS (#2480)
* [chore] Refactor HTML templates and CSS
* eslint
* ignore "Local"
* rss tests
* fiddle with OG just a tiny bit
* dick around with polls a bit more so SR stops saying "clickable"
* remove break
* oh lord
* don't lazy load avatar
* fix ogmeta tests
* clean up some cruft
* catch remaining calls to c.HTML
* fix error rendering + stack overflow in tag
* allow templating attributes
* fix indent
* set aria-hidden on status complementary content, since it's already present in the label anyway
* tidy up templating calls a little
* try to make styling a bit more consistent + readable
* fix up some remaining CSS issues
* fix up reports
Diffstat (limited to 'internal/typeutils')
| -rw-r--r-- | internal/typeutils/internaltofrontend.go | 6 | ||||
| -rw-r--r-- | internal/typeutils/internaltorss.go | 2 | ||||
| -rw-r--r-- | internal/typeutils/internaltorss_test.go | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index 09d538a3d..9d1f7edeb 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -662,6 +662,10 @@ func (c *Converter) StatusToWebStatus( return nil, err } + // Whack a newline before and after each "pre" to make it easier to outdent it. + webStatus.Content = strings.ReplaceAll(webStatus.Content, "<pre>", "\n<pre>") + webStatus.Content = strings.ReplaceAll(webStatus.Content, "</pre>", "</pre>\n") + // Add additional information for template. // Assume empty langs, hope for not empty language. webStatus.LanguageTag = new(language.Language) @@ -727,6 +731,8 @@ func (c *Converter) StatusToWebStatus( a.Sensitive = webStatus.Sensitive } + webStatus.Local = *s.Local + return webStatus, nil } diff --git a/internal/typeutils/internaltorss.go b/internal/typeutils/internaltorss.go index e70b11aae..e1174caf6 100644 --- a/internal/typeutils/internaltorss.go +++ b/internal/typeutils/internaltorss.go @@ -151,7 +151,7 @@ func (c *Converter) StatusToRSSItem(ctx context.Context, s *gtsmodel.Status) (*f apiEmojis = append(apiEmojis, apiEmoji) } } - content := text.Emojify(apiEmojis, s.Content) + content := text.EmojifyRSS(apiEmojis, s.Content) return &feeds.Item{ Title: title, diff --git a/internal/typeutils/internaltorss_test.go b/internal/typeutils/internaltorss_test.go index ea6f3cc93..305015d28 100644 --- a/internal/typeutils/internaltorss_test.go +++ b/internal/typeutils/internaltorss_test.go @@ -81,7 +81,7 @@ func (suite *InternalToRSSTestSuite) TestStatusToRSSItem2() { suite.Equal("62529", item.Enclosure.Length) suite.Equal("image/jpeg", item.Enclosure.Type) suite.Equal("http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpg", item.Enclosure.Url) - suite.Equal("hello world! #welcome ! first post on the instance <img src=\"http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png\" title=\":rainbow:\" alt=\":rainbow:\" class=\"emoji\"/> !", item.Content) + suite.Equal("hello world! #welcome ! first post on the instance <img src=\"http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png\" title=\":rainbow:\" alt=\":rainbow:\" width=\"25\" height=\"25\"/> !", item.Content) } func (suite *InternalToRSSTestSuite) TestStatusToRSSItem3() { |