Add post format selection

4 files changed, 17 insertions, 11 deletions

diff --git a/service/auth.go b/service/auth.go
index c408672..0c2e7f6 100644
--- a/service/auth.go
+++ b/service/auth.go
@@ -181,12 +181,12 @@ func (s *authService) UnRetweet(ctx context.Context, client io.Writer, c *model.
 	return s.Service.UnRetweet(ctx, client, c, id)
 }
 
-func (s *authService) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
+func (s *authService) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, format string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
 	c, err = s.getClient(ctx)
 	if err != nil {
 		return
 	}
-	return s.Service.PostTweet(ctx, client, c, content, replyToID, visibility, isNSFW, files)
+	return s.Service.PostTweet(ctx, client, c, content, replyToID, format, visibility, isNSFW, files)
 }
 
 func (s *authService) Follow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
diff --git a/service/logging.go b/service/logging.go
index fbc6371..f5e6d66 100644
--- a/service/logging.go
+++ b/service/logging.go
@@ -157,12 +157,12 @@ func (s *loggingService) UnRetweet(ctx context.Context, client io.Writer, c *mod
 	return s.Service.UnRetweet(ctx, client, c, id)
 }
 
-func (s *loggingService) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
+func (s *loggingService) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, format string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
 	defer func(begin time.Time) {
-		s.logger.Printf("method=%v, content=%v, reply_to_id=%v, visibility=%v, is_nsfw=%v, took=%v, err=%v\n",
-			"PostTweet", content, replyToID, visibility, isNSFW, time.Since(begin), err)
+		s.logger.Printf("method=%v, content=%v, reply_to_id=%v, format=%v, visibility=%v, is_nsfw=%v, took=%v, err=%v\n",
+			"PostTweet", content, replyToID, format, visibility, isNSFW, time.Since(begin), err)
 	}(time.Now())
-	return s.Service.PostTweet(ctx, client, c, content, replyToID, visibility, isNSFW, files)
+	return s.Service.PostTweet(ctx, client, c, content, replyToID, format, visibility, isNSFW, files)
 }
 
 func (s *loggingService) Follow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error) {
diff --git a/service/service.go b/service/service.go
index 7dc784f..2787079 100644
--- a/service/service.go
+++ b/service/service.go
@@ -43,7 +43,7 @@ type Service interface {
 	UnLike(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
 	Retweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
 	UnRetweet(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
-	PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error)
+	PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, format string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error)
 	Follow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
 	UnFollow(ctx context.Context, client io.Writer, c *model.Client, id string) (err error)
 }
@@ -53,19 +53,21 @@ type service struct {
 	clientScope   string
 	clientWebsite string
 	customCSS     string
+	postFormats   []model.PostFormat
 	renderer      renderer.Renderer
 	sessionRepo   model.SessionRepository
 	appRepo       model.AppRepository
 }
 
 func NewService(clientName string, clientScope string, clientWebsite string,
-	customCSS string, renderer renderer.Renderer, sessionRepo model.SessionRepository,
-	appRepo model.AppRepository) Service {
+	customCSS string, postFormats []model.PostFormat, renderer renderer.Renderer,
+	sessionRepo model.SessionRepository, appRepo model.AppRepository) Service {
 	return &service{
 		clientName:    clientName,
 		clientScope:   clientScope,
 		clientWebsite: clientWebsite,
 		customCSS:     customCSS,
+		postFormats:   postFormats,
 		renderer:      renderer,
 		sessionRepo:   sessionRepo,
 		appRepo:       appRepo,
@@ -297,6 +299,7 @@ func (svc *service) ServeTimelinePage(ctx context.Context, client io.Writer,
 
 	postContext := model.PostContext{
 		DefaultVisibility: c.Session.Settings.DefaultVisibility,
+		Formats:           svc.postFormats,
 	}
 
 	commonData, err := svc.getCommonData(ctx, client, c)
@@ -353,6 +356,7 @@ func (svc *service) ServeThreadPage(ctx context.Context, client io.Writer, c *mo
 
 		postContext = model.PostContext{
 			DefaultVisibility: s.Visibility,
+			Formats:           svc.postFormats,
 			ReplyContext: &model.ReplyContext{
 				InReplyToID:   id,
 				InReplyToName: status.Account.Acct,
@@ -647,7 +651,7 @@ func (svc *service) UnRetweet(ctx context.Context, client io.Writer, c *model.Cl
 	return
 }
 
-func (svc *service) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
+func (svc *service) PostTweet(ctx context.Context, client io.Writer, c *model.Client, content string, replyToID string, format string, visibility string, isNSFW bool, files []*multipart.FileHeader) (id string, err error) {
 	var mediaIds []string
 	for _, f := range files {
 		a, err := c.UploadMediaFromMultipartFileHeader(ctx, f)
@@ -667,6 +671,7 @@ func (svc *service) PostTweet(ctx context.Context, client io.Writer, c *model.Cl
 		Status:      content,
 		InReplyToID: replyToID,
 		MediaIDs:    mediaIds,
+		ContentType: format,
 		Visibility:  visibility,
 		Sensitive:   isNSFW,
 	}
diff --git a/service/transport.go b/service/transport.go
index d4011db..6541772 100644
--- a/service/transport.go
+++ b/service/transport.go
@@ -183,12 +183,13 @@ func NewHandler(s Service, staticDir string) http.Handler {
 
 		content := getMultipartFormValue(req.MultipartForm, "content")
 		replyToID := getMultipartFormValue(req.MultipartForm, "reply_to_id")
+		format := getMultipartFormValue(req.MultipartForm, "format")
 		visibility := getMultipartFormValue(req.MultipartForm, "visibility")
 		isNSFW := "on" == getMultipartFormValue(req.MultipartForm, "is_nsfw")
 
 		files := req.MultipartForm.File["attachments"]
 
-		id, err := s.PostTweet(ctx, w, nil, content, replyToID, visibility, isNSFW, files)
+		id, err := s.PostTweet(ctx, w, nil, content, replyToID, format, visibility, isNSFW, files)
 		if err != nil {
 			s.ServeErrorPage(ctx, w, err)
 			return