aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mastodon/status.go22
-rw-r--r--service/auth.go24
-rw-r--r--service/logging.go16
-rw-r--r--service/service.go14
-rw-r--r--service/transport.go34
-rw-r--r--static/style.css29
-rw-r--r--templates/status.tmpl27
7 files changed, 159 insertions, 7 deletions
diff --git a/mastodon/status.go b/mastodon/status.go
index 22f042c..63de3cf 100644
--- a/mastodon/status.go
+++ b/mastodon/status.go
@@ -343,3 +343,25 @@ func (c *Client) GetTimelineDirect(ctx context.Context, pg *Pagination) ([]*Stat
}
return statuses, nil
}
+
+// MuteConversation mutes status specified by id.
+func (c *Client) MuteConversation(ctx context.Context, id string) (*Status, error) {
+ var status Status
+
+ err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/statuses/%s/mute", id), nil, &status, nil)
+ if err != nil {
+ return nil, err
+ }
+ return &status, nil
+}
+
+// UnmuteConversation unmutes status specified by id.
+func (c *Client) UnmuteConversation(ctx context.Context, id string) (*Status, error) {
+ var status Status
+
+ err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/statuses/%s/unmute", id), nil, &status, nil)
+ if err != nil {
+ return nil, err
+ }
+ return &status, nil
+}
diff --git a/service/auth.go b/service/auth.go
index 5ffe9ea..afb324a 100644
--- a/service/auth.go
+++ b/service/auth.go
@@ -284,3 +284,27 @@ func (s *as) SaveSettings(ctx context.Context, c *model.Client, settings *model.
}
return s.Service.SaveSettings(ctx, c, settings)
}
+
+func (s *as) MuteConversation(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.MuteConversation(ctx, c, id)
+}
+
+func (s *as) UnMuteConversation(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.UnMuteConversation(ctx, c, id)
+}
diff --git a/service/logging.go b/service/logging.go
index 3d2baba..f26abaf 100644
--- a/service/logging.go
+++ b/service/logging.go
@@ -212,3 +212,19 @@ func (s *ls) SaveSettings(ctx context.Context, c *model.Client, settings *model.
}(time.Now())
return s.Service.SaveSettings(ctx, c, settings)
}
+
+func (s *ls) MuteConversation(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",
+ "MuteConversation", id, time.Since(begin), err)
+ }(time.Now())
+ return s.Service.MuteConversation(ctx, c, id)
+}
+
+func (s *ls) UnMuteConversation(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",
+ "UnMuteConversation", id, time.Since(begin), err)
+ }(time.Now())
+ return s.Service.UnMuteConversation(ctx, c, id)
+}
diff --git a/service/service.go b/service/service.go
index ab6261e..043191b 100644
--- a/service/service.go
+++ b/service/service.go
@@ -44,6 +44,8 @@ type Service interface {
Follow(ctx context.Context, c *model.Client, id string) (err error)
UnFollow(ctx context.Context, c *model.Client, id string) (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)
+ UnMuteConversation(ctx context.Context, c *model.Client, id string) (err error)
}
type service struct {
@@ -848,3 +850,15 @@ func (svc *service) SaveSettings(ctx context.Context, c *model.Client,
session.Settings = *settings
return svc.sessionRepo.Add(session)
}
+
+func (svc *service) MuteConversation(ctx context.Context, c *model.Client,
+ id string) (err error) {
+ _, err = c.MuteConversation(ctx, id)
+ return
+}
+
+func (svc *service) UnMuteConversation(ctx context.Context, c *model.Client,
+ id string) (err error) {
+ _, err = c.UnmuteConversation(ctx, id)
+ return
+}
diff --git a/service/transport.go b/service/transport.go
index 02168e8..cc864e7 100644
--- a/service/transport.go
+++ b/service/transport.go
@@ -481,6 +481,38 @@ func NewHandler(s Service, staticDir string) http.Handler {
w.WriteHeader(http.StatusFound)
}
+ muteConversation := func(w http.ResponseWriter, req *http.Request) {
+ c := newClient(w)
+ ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
+ id, _ := mux.Vars(req)["id"]
+
+ err := s.MuteConversation(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)
+ }
+
+ unMuteConversation := func(w http.ResponseWriter, req *http.Request) {
+ c := newClient(w)
+ ctx := newCtxWithSesionCSRF(req, req.FormValue("csrf_token"))
+ id, _ := mux.Vars(req)["id"]
+
+ err := s.UnMuteConversation(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)
+ }
+
signout := func(w http.ResponseWriter, req *http.Request) {
// TODO remove session from database
http.SetCookie(w, &http.Cookie{
@@ -588,6 +620,8 @@ func NewHandler(s Service, staticDir string) http.Handler {
r.HandleFunc("/follow/{id}", follow).Methods(http.MethodPost)
r.HandleFunc("/unfollow/{id}", unfollow).Methods(http.MethodPost)
r.HandleFunc("/settings", settings).Methods(http.MethodPost)
+ r.HandleFunc("/muteconv/{id}", muteConversation).Methods(http.MethodPost)
+ r.HandleFunc("/unmuteconv/{id}", unMuteConversation).Methods(http.MethodPost)
r.HandleFunc("/signout", signout).Methods(http.MethodGet)
r.HandleFunc("/fluoride/like/{id}", fLike).Methods(http.MethodPost)
r.HandleFunc("/fluoride/unlike/{id}", fUnlike).Methods(http.MethodPost)
diff --git a/static/style.css b/static/style.css
index 67dbd77..dc3f285 100644
--- a/static/style.css
+++ b/static/style.css
@@ -280,7 +280,6 @@ a:hover,
.remote-link {
margin-left: 4px;
- display: inline-block;
font-size: 8pt;
}
@@ -430,6 +429,29 @@ a:hover,
margin: 16px 0 0 0;
}
+.more-container {
+ position: relative;
+ display: inline-block;
+}
+
+.more-content {
+ display: none;
+ position: absolute;
+ background-color: #ffffff;
+ padding: 2px 4px;
+ border: 1px solid #aaaaaa;
+}
+
+.more-container:hover .more-content {
+ display: initial;
+}
+
+.more-link {
+ font-size: 8pt;
+ display: block;
+ margin: 2px;
+}
+
.dark {
background-color: #222222;
background-image: none;
@@ -463,3 +485,8 @@ a:hover,
.dark .status-visibility {
color: #eaeaea;
}
+
+.dark .more-content {
+ background-color: #222222;
+ border-color: #444444;
+}
diff --git a/templates/status.tmpl b/templates/status.tmpl
index 3945cc8..1ea475e 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -24,12 +24,27 @@
<a href="/user/{{.Account.ID}}" >
<span class="status-uname"> {{.Account.Acct}} </span>
</a>
- <span class="status-visibility">
- {{.Visibility}}
- </span>
- <a class="remote-link" href="{{.URL}}" target="_blank" title="source">
- source
- </a>
+ <div class="more-container" title="more">
+ <div class="remote-link" title="mute">
+ {{.Visibility}}
+ </div>
+ <div class="more-content">
+ <a class="more-link" href="{{.URL}}" target="_blank" title="mute">
+ source
+ </a>
+ {{if .Muted}}
+ <form action="/unmuteconv/{{.ID}}" method="post">
+ <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+ <input type="submit" value="unmute" class="btn-link more-link" title="unmute">
+ </form>
+ {{else}}
+ <form action="/muteconv/{{.ID}}" method="post">
+ <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+ <input type="submit" value="mute" class="btn-link more-link" title="mute">
+ </form>
+ {{end}}
+ </div>
+ </div>
</div>
<div class="status-reply-container">
{{if .InReplyToID}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 04:49:13 +0000