mirror of
https://gitea.phreedom.club/localhost_frssoft/bloat.git
synced 2024-11-22 12:49:21 +02:00
Add nsfw checkbox for posts
This commit is contained in:
r
parent
2506615f42
commit
05daa6a148
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -234,6 +234,8 @@
|
|||
.user-profile-img {
|
||||
max-height: 100px;
|
||||
max-width: 100px;
|
||||
object-fit: contain;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.user-profile-decription {
|
||||
|
|
@ -284,6 +286,11 @@
|
|||
position: relative;
|
||||
}
|
||||
|
||||
.status-profile-img-container .img-link {
|
||||
width: 48px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.status-nsfw-overlay {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
|
@ -305,3 +312,7 @@
|
|||
.status-video-container:hover .status-nsfw-overlay {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.post-form-field>* {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,17 +9,25 @@
|
|||
<textarea id="post-content" name="content" class="post-content" cols="50" rows="5">{{if .ReplyContext}}{{.ReplyContext.ReplyContent}}{{end}}</textarea>
|
||||
</div>
|
||||
<div>
|
||||
<label for ="post-visilibity"> Visibility </label>
|
||||
<span class="post-form-field">
|
||||
<label for="post-visilibity"> Visibility </label>
|
||||
<select id="post-visilibity" name="visibility">
|
||||
<option value="public" {{if eq .DefaultVisibility "public"}}selected{{end}}>Public</option>
|
||||
<option value="unlisted" {{if eq .DefaultVisibility "unlisted"}}selected{{end}}>Unlisted</option>
|
||||
<option value="private" {{if eq .DefaultVisibility "private"}}selected{{end}}>Private</option>
|
||||
<option value="direct" {{if eq .DefaultVisibility "direct"}}selected{{end}}>Direct</option>
|
||||
</select>
|
||||
</span>
|
||||
<span class="post-form-field">
|
||||
<input type="checkbox" id="nsfw-checkbox" name="is_nsfw" value="on">
|
||||
<label for="nsfw-checkbox"> Is NSFW </label>
|
||||
</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="post-form-field">
|
||||
<label for ="post-file-picker"> Attachments </label>
|
||||
<input id="post-file-picker" type="file" name="attachments" multiple>
|
||||
</span>
|
||||
</div>
|
||||
<button type="submit"> Post </button>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{{if .Reblog}}
|
||||
<div class="retweet-info">
|
||||
<a class="img-link" href="/user/{{.Account.ID}}">
|
||||
<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="profile-avatar" />
|
||||
<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" />
|
||||
</a>
|
||||
<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>
|
||||
<span class="icon dripicons-retweet retweeted"></span>
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
{{if not .HideAccountInfo}}
|
||||
<div class="status-profile-img-container">
|
||||
<a class="img-link" href="/user/{{.Account.ID}}">
|
||||
<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="profile-avatar" />
|
||||
<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" />
|
||||
</a>
|
||||
</div>
|
||||
{{end}}
|
||||
|
|
|
|||
Loading…
Reference in New Issue