From d5e3996a18ee37fc4bdf5718632d3d19ac7a8c1b Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:39:31 +0100 Subject: [feature] Parse instance descriptors as markdown, show T&C on /about (#2481) * [feature] Parse instance descriptors as markdown, show T&C on /about * lint * remove unnecessary nullzero tags --- internal/processing/processor.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'internal/processing/processor.go') diff --git a/internal/processing/processor.go b/internal/processing/processor.go index ac930aeb2..6ac7a6bf0 100644 --- a/internal/processing/processor.go +++ b/internal/processing/processor.go @@ -21,6 +21,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/cleaner" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" mm "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/oauth" "github.com/superseriousbusiness/gotosocial/internal/processing/account" @@ -39,6 +40,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/processing/user" "github.com/superseriousbusiness/gotosocial/internal/processing/workers" "github.com/superseriousbusiness/gotosocial/internal/state" + "github.com/superseriousbusiness/gotosocial/internal/text" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/visibility" ) @@ -55,6 +57,13 @@ type Processor struct { oauthServer oauth.Server state *state.State + /* + Required for instance description / terms updating. + */ + + formatter *text.Formatter + parseMentionFunc gtsmodel.ParseMentionFunc + /* SUB-PROCESSORS */ @@ -147,9 +156,11 @@ func NewProcessor( ) processor := &Processor{ - converter: converter, - oauthServer: oauthServer, - state: state, + converter: converter, + oauthServer: oauthServer, + state: state, + formatter: text.NewFormatter(state.DB), + parseMentionFunc: parseMentionFunc, } // Instantiate sub processors. -- cgit v1.2.3