mirror of
https://git.phreedom.club/localhost_frssoft/bloat.git
synced 2024-11-04 20:23:13 +00:00
Add account muting and blocking
This commit is contained in:
parent
9d2e24a7de
commit
1e44d5d3d5
|
@ -274,6 +274,54 @@ func (s *as) UnFollow(ctx context.Context, c *model.Client, id string) (err erro
|
||||||
return s.Service.UnFollow(ctx, c, id)
|
return s.Service.UnFollow(ctx, c, id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *as) Mute(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
err = s.authenticateClient(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = checkCSRF(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return s.Service.Mute(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *as) UnMute(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
err = s.authenticateClient(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = checkCSRF(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return s.Service.UnMute(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *as) Block(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
err = s.authenticateClient(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = checkCSRF(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return s.Service.Block(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *as) UnBlock(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
err = s.authenticateClient(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = checkCSRF(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return s.Service.UnBlock(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *as) SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error) {
|
func (s *as) SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error) {
|
||||||
err = s.authenticateClient(ctx, c)
|
err = s.authenticateClient(ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -205,6 +205,38 @@ func (s *ls) UnFollow(ctx context.Context, c *model.Client, id string) (err erro
|
||||||
return s.Service.UnFollow(ctx, c, id)
|
return s.Service.UnFollow(ctx, c, id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *ls) Mute(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
defer func(begin time.Time) {
|
||||||
|
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||||
|
"Mute", id, time.Since(begin), err)
|
||||||
|
}(time.Now())
|
||||||
|
return s.Service.Mute(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *ls) UnMute(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
defer func(begin time.Time) {
|
||||||
|
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||||
|
"UnMute", id, time.Since(begin), err)
|
||||||
|
}(time.Now())
|
||||||
|
return s.Service.UnMute(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *ls) Block(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
defer func(begin time.Time) {
|
||||||
|
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||||
|
"Block", id, time.Since(begin), err)
|
||||||
|
}(time.Now())
|
||||||
|
return s.Service.Block(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *ls) UnBlock(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
defer func(begin time.Time) {
|
||||||
|
s.logger.Printf("method=%v, id=%v, took=%v, err=%v\n",
|
||||||
|
"UnBlock", id, time.Since(begin), err)
|
||||||
|
}(time.Now())
|
||||||
|
return s.Service.UnBlock(ctx, c, id)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *ls) SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error) {
|
func (s *ls) SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error) {
|
||||||
defer func(begin time.Time) {
|
defer func(begin time.Time) {
|
||||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||||
|
|
|
@ -44,6 +44,10 @@ type Service interface {
|
||||||
UnRetweet(ctx context.Context, c *model.Client, id string) (count int64, err error)
|
UnRetweet(ctx context.Context, c *model.Client, id string) (count int64, err error)
|
||||||
Follow(ctx context.Context, c *model.Client, id string) (err error)
|
Follow(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
UnFollow(ctx context.Context, c *model.Client, id string) (err error)
|
UnFollow(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
|
Mute(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
|
UnMute(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
|
Block(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
|
UnBlock(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error)
|
SaveSettings(ctx context.Context, c *model.Client, settings *model.Settings) (err error)
|
||||||
MuteConversation(ctx context.Context, c *model.Client, id string) (err error)
|
MuteConversation(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
UnMuteConversation(ctx context.Context, c *model.Client, id string) (err error)
|
UnMuteConversation(ctx context.Context, c *model.Client, id string) (err error)
|
||||||
|
@ -848,6 +852,26 @@ func (svc *service) UnFollow(ctx context.Context, c *model.Client, id string) (e
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (svc *service) Mute(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
_, err = c.AccountMute(ctx, id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (svc *service) UnMute(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
_, err = c.AccountUnmute(ctx, id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (svc *service) Block(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
_, err = c.AccountBlock(ctx, id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func (svc *service) UnBlock(ctx context.Context, c *model.Client, id string) (err error) {
|
||||||
|
_, err = c.AccountUnblock(ctx, id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func (svc *service) SaveSettings(ctx context.Context, c *model.Client,
|
func (svc *service) SaveSettings(ctx context.Context, c *model.Client,
|
||||||
settings *model.Settings) (err error) {
|
settings *model.Settings) (err error) {
|
||||||
|
|
||||||
|
|
|
@ -451,6 +451,70 @@ func NewHandler(s Service, staticDir string) http.Handler {
|
||||||
w.WriteHeader(http.StatusFound)
|
w.WriteHeader(http.StatusFound)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mute := func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
c := newClient(w)
|
||||||
|
ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
|
||||||
|
id, _ := mux.Vars(req)["id"]
|
||||||
|
|
||||||
|
err := s.Mute(ctx, c, id)
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
s.ServeErrorPage(ctx, c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Add("Location", req.Header.Get("Referer"))
|
||||||
|
w.WriteHeader(http.StatusFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
unMute := func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
c := newClient(w)
|
||||||
|
ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
|
||||||
|
id, _ := mux.Vars(req)["id"]
|
||||||
|
|
||||||
|
err := s.UnMute(ctx, c, id)
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
s.ServeErrorPage(ctx, c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Add("Location", req.Header.Get("Referer"))
|
||||||
|
w.WriteHeader(http.StatusFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
block := func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
c := newClient(w)
|
||||||
|
ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
|
||||||
|
id, _ := mux.Vars(req)["id"]
|
||||||
|
|
||||||
|
err := s.Block(ctx, c, id)
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
s.ServeErrorPage(ctx, c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Add("Location", req.Header.Get("Referer"))
|
||||||
|
w.WriteHeader(http.StatusFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
unBlock := func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
c := newClient(w)
|
||||||
|
ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
|
||||||
|
id, _ := mux.Vars(req)["id"]
|
||||||
|
|
||||||
|
err := s.UnBlock(ctx, c, id)
|
||||||
|
if err != nil {
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
s.ServeErrorPage(ctx, c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.Header().Add("Location", req.Header.Get("Referer"))
|
||||||
|
w.WriteHeader(http.StatusFound)
|
||||||
|
}
|
||||||
|
|
||||||
settings := func(w http.ResponseWriter, req *http.Request) {
|
settings := func(w http.ResponseWriter, req *http.Request) {
|
||||||
c := newClient(w)
|
c := newClient(w)
|
||||||
ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
|
ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
|
||||||
|
@ -635,6 +699,10 @@ func NewHandler(s Service, staticDir string) http.Handler {
|
||||||
r.HandleFunc("/unretweet/{id}", unretweet).Methods(http.MethodPost)
|
r.HandleFunc("/unretweet/{id}", unretweet).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/follow/{id}", follow).Methods(http.MethodPost)
|
r.HandleFunc("/follow/{id}", follow).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/unfollow/{id}", unfollow).Methods(http.MethodPost)
|
r.HandleFunc("/unfollow/{id}", unfollow).Methods(http.MethodPost)
|
||||||
|
r.HandleFunc("/mute/{id}", mute).Methods(http.MethodPost)
|
||||||
|
r.HandleFunc("/unmute/{id}", unMute).Methods(http.MethodPost)
|
||||||
|
r.HandleFunc("/block/{id}", block).Methods(http.MethodPost)
|
||||||
|
r.HandleFunc("/unblock/{id}", unBlock).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/settings", settings).Methods(http.MethodPost)
|
r.HandleFunc("/settings", settings).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/muteconv/{id}", muteConversation).Methods(http.MethodPost)
|
r.HandleFunc("/muteconv/{id}", muteConversation).Methods(http.MethodPost)
|
||||||
r.HandleFunc("/unmuteconv/{id}", unMuteConversation).Methods(http.MethodPost)
|
r.HandleFunc("/unmuteconv/{id}", unMuteConversation).Methods(http.MethodPost)
|
||||||
|
|
|
@ -25,17 +25,42 @@
|
||||||
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||||
<input type="submit" value="unfollow" class="btn-link">
|
<input type="submit" value="unfollow" class="btn-link">
|
||||||
</form>
|
</form>
|
||||||
|
{{else}}
|
||||||
|
<form class="d-inline" action="/follow/{{.User.ID}}" method="post">
|
||||||
|
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||||
|
<input type="submit" value="{{if .User.Pleroma.Relationship.Requested}}resend request{{else}}follow{{end}}" class="btn-link">
|
||||||
|
</form>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .User.Pleroma.Relationship.Requested}}
|
{{if .User.Pleroma.Relationship.Requested}}
|
||||||
|
-
|
||||||
<form class="d-inline" action="/unfollow/{{.User.ID}}" method="post">
|
<form class="d-inline" action="/unfollow/{{.User.ID}}" method="post">
|
||||||
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||||
<input type="submit" value="cancel request" class="btn-link">
|
<input type="submit" value="cancel request" class="btn-link">
|
||||||
</form>
|
</form>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if not .User.Pleroma.Relationship.Following}}
|
</div>
|
||||||
<form class="d-inline" action="/follow/{{.User.ID}}" method="post">
|
<div>
|
||||||
|
{{if .User.Pleroma.Relationship.Blocking}}
|
||||||
|
<form class="d-inline" action="/unblock/{{.User.ID}}" method="post">
|
||||||
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||||
<input type="submit" value="{{if .User.Pleroma.Relationship.Requested}}resend request{{else}}follow{{end}}" class="btn-link">
|
<input type="submit" value="unblock" class="btn-link">
|
||||||
|
</form>
|
||||||
|
{{else}}
|
||||||
|
<form class="d-inline" action="/block/{{.User.ID}}" method="post">
|
||||||
|
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||||
|
<input type="submit" value="block" class="btn-link">
|
||||||
|
</form>
|
||||||
|
{{end}}
|
||||||
|
-
|
||||||
|
{{if .User.Pleroma.Relationship.Muting}}
|
||||||
|
<form class="d-inline" action="/unmute/{{.User.ID}}" method="post">
|
||||||
|
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||||
|
<input type="submit" value="unmute" class="btn-link">
|
||||||
|
</form>
|
||||||
|
{{else}}
|
||||||
|
<form class="d-inline" action="/mute/{{.User.ID}}" method="post">
|
||||||
|
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
||||||
|
<input type="submit" value="mute" class="btn-link">
|
||||||
</form>
|
</form>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue