aboutsummaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
Diffstat (limited to 'service')
-rw-r--r--service/auth.go4
-rw-r--r--service/logging.go8
-rw-r--r--service/service.go5
-rw-r--r--service/transport.go4
4 files changed, 12 insertions, 9 deletions
diff --git a/service/auth.go b/service/auth.go
index 13e9c50..1b2700c 100644
--- a/service/auth.go
+++ b/service/auth.go
@@ -157,12 +157,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, files []*multipart.FileHeader) (id string, err error) {
+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) {
c, err = s.getClient(ctx)
if err != nil {
return
}
- return s.Service.PostTweet(ctx, client, c, content, replyToID, visibility, files)
+ return s.Service.PostTweet(ctx, client, c, content, replyToID, 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 ceba716..444584e 100644
--- a/service/logging.go
+++ b/service/logging.go
@@ -133,12 +133,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, files []*multipart.FileHeader) (id string, err error) {
+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) {
defer func(begin time.Time) {
- s.logger.Printf("method=%v, content=%v, reply_to_id=%v, visibility=%v, took=%v, err=%v\n",
- "PostTweet", content, replyToID, visibility, time.Since(begin), err)
+ 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)
}(time.Now())
- return s.Service.PostTweet(ctx, client, c, content, replyToID, visibility, files)
+ return s.Service.PostTweet(ctx, client, c, content, replyToID, 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 07a026a..ad47408 100644
--- a/service/service.go
+++ b/service/service.go
@@ -38,7 +38,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, files []*multipart.FileHeader) (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)
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)
}
@@ -482,7 +482,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, files []*multipart.FileHeader) (id string, err error) {
+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) {
var mediaIds []string
for _, f := range files {
a, err := c.UploadMediaFromMultipartFileHeader(ctx, f)
@@ -503,6 +503,7 @@ func (svc *service) PostTweet(ctx context.Context, client io.Writer, c *model.Cl
InReplyToID: replyToID,
MediaIDs: mediaIds,
Visibility: visibility,
+ Sensitive: isNSFW,
}
s, err := c.PostStatus(ctx, tweet)
diff --git a/service/transport.go b/service/transport.go
index 4e852f2..e3ec113 100644
--- a/service/transport.go
+++ b/service/transport.go
@@ -156,9 +156,11 @@ func NewHandler(s Service, staticDir string) http.Handler {
content := getMultipartFormValue(req.MultipartForm, "content")
replyToID := getMultipartFormValue(req.MultipartForm, "reply_to_id")
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, files)
+ id, err := s.PostTweet(ctx, w, nil, content, replyToID, visibility, isNSFW, files)
if err != nil {
s.ServeErrorPage(ctx, w, err)
return