Add conversation muting
authorr <r@freesoftwareextremist.com>
Sun, 2 Feb 2020 07:24:06 +0000 (07:24 +0000)
committerr <r@freesoftwareextremist.com>
Sun, 2 Feb 2020 07:24:06 +0000 (07:24 +0000)
mastodon/status.go
service/auth.go
service/logging.go
service/service.go
service/transport.go
static/style.css
templates/status.tmpl

index 22f042c182d6353b2f04b6d6d321e7c65ad9b6c8..63de3cf814fa6bc072beb95eb8df0154bff1476a 100644 (file)
@@ -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
+}
index 5ffe9ea42b199d69954f53bef8a5bb7760db7f6d..afb324a2720d09a9c33e3b38bf34be76adfe081f 100644 (file)
@@ -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)
+}
index 3d2baba4b87fce0ba36d03b192a35a99c7355c3b..f26abaf8330190cf2dae2ac36368fc651f195320 100644 (file)
@@ -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)
+}
index ab6261e795d80ef7ddd02104ebb5eee9a30d5570..043191b62a6533682e70ffd2713423db05368040 100644 (file)
@@ -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
+}
index 02168e8e31c4ce882c9427d53ab3556a14cfb766..cc864e79adc3d5408a86df0f4f72cd0e625ccc49 100644 (file)
@@ -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)
index 67dbd77c343a12667b15d2fbc40b7b53774aac3b..dc3f285c73f5ae1c92fd3f2353292e7e53983e93 100644 (file)
@@ -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;
+}
index 3945cc8ccadaae441293cdc30ffeab1fe3942789..1ea475e59b9b3d1da74a8b2487654d689f903195 100644 (file)
                                <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}}