mastodon/accounts.go

@@ -131,7 +131,10 @@ func RegisterAccount(ctx context.Context, instance string, reason string, userna
 func (c *Client) GetAccount(ctx context.Context, id string) (*Account, error) {
 	var account Account
 	params := url.Values{}
-	params.Set("with_relationships", strconv.FormatBool(true))
+	if account.Pleroma != nil {
+		account.MastodonAccount = false
+		params.Set("with_relationships", "1")
+	}
 	err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/accounts/%s", url.PathEscape(string(id))), params, &account, nil)
 	if err != nil {
 		return nil, err
@@ -358,10 +361,11 @@ func (c *Client) AccountUnblock(ctx context.Context, id string) (*Relationship,
 }
 
 // AccountMute mute the account.
-func (c *Client) AccountMute(ctx context.Context, id string, notifications bool, duration int) (*Relationship, error) {
+func (c *Client) AccountMute(ctx context.Context, id string, notifications *bool) (*Relationship, error) {
 	params := url.Values{}
-	params.Set("notifications", strconv.FormatBool(notifications))
+	if notifications != nil {
-	params.Set("duration", strconv.Itoa(duration))
+		params.Set("notifications", strconv.FormatBool(*notifications))
+	}
 	var relationship Relationship
 	err := c.doAPI(ctx, http.MethodPost, fmt.Sprintf("/api/v1/accounts/%s/mute", url.PathEscape(string(id))), params, &relationship, nil)
 	if err != nil {

mastodon/status.go

@@ -72,6 +72,7 @@ type Status struct {
 	MediaAttachments   []Attachment `json:"media_attachments"`
 	Mentions           []Mention    `json:"mentions"`
 	Tags               []Tag        `json:"tags"`
+	Card               *Card        `json:"card"`
 	Application        Application  `json:"application"`
 	Language           string       `json:"language"`
 	Pinned             interface{}  `json:"pinned"`
@@ -92,6 +93,22 @@ type Context struct {
 	Descendants []*Status `json:"descendants"`
 }
 
+// Card hold information for mastodon card.
+type Card struct {
+	URL          string `json:"url"`
+	Title        string `json:"title"`
+	Description  string `json:"description"`
+	Image        string `json:"image"`
+	Type         string `json:"type"`
+	AuthorName   string `json:"author_name"`
+	AuthorURL    string `json:"author_url"`
+	ProviderName string `json:"provider_name"`
+	ProviderURL  string `json:"provider_url"`
+	HTML         string `json:"html"`
+	Width        int64  `json:"width"`
+	Height       int64  `json:"height"`
+}
+
 // GetFavourites return the favorite list of the current user.
 func (c *Client) GetFavourites(ctx context.Context, pg *Pagination) ([]*Status, error) {
 	var statuses []*Status
@@ -122,6 +139,16 @@ func (c *Client) GetStatusContext(ctx context.Context, id string) (*Context, err
 	return &context, nil
 }
 
+// GetStatusCard return status specified by id.
+func (c *Client) GetStatusCard(ctx context.Context, id string) (*Card, error) {
+	var card Card
+	err := c.doAPI(ctx, http.MethodGet, fmt.Sprintf("/api/v1/statuses/%s/card", id), nil, &card, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &card, nil
+}
+
 // GetRebloggedBy returns the account list of the user who reblogged the toot of id.
 func (c *Client) GetRebloggedBy(ctx context.Context, id string, pg *Pagination) ([]*Account, error) {
 	var accounts []*Account

renderer/model.go

@@ -176,8 +176,3 @@ type FiltersData struct {
 	*CommonData
 	Filters []*mastodon.Filter
 }
-
-type MuteData struct {
-	*CommonData
-	User *mastodon.Account
-}

renderer/renderer.go

@@ -36,7 +36,6 @@ const (
 	SettingsPage     = "settings.tmpl"
 	UserEditPage     = "useredit.tmpl"
 	FiltersPage      = "filters.tmpl"
-	MutePage         = "mute.tmpl"
 )
 
 type TemplateData struct {

service/service.go

@@ -734,19 +734,6 @@ func (s *service) UserSearchPage(c *client,
 	return s.renderer.Render(c.rctx, c.w, renderer.UserSearchPage, data)
 }
 
-func (s *service) MutePage(c *client, id string) (err error) {
-	user, err := c.GetAccount(c.ctx, id)
-	if err != nil {
-		return
-	}
-	cdata := s.cdata(c, "Mute"+user.DisplayName+" @"+user.Acct, 0, 0, "")
-	data := &renderer.UserData{
-		User:       user,
-		CommonData: cdata,
-	}
-	return s.renderer.Render(c.rctx, c.w, renderer.MutePage, data)
-}
-
 func (s *service) AboutPage(c *client) (err error) {
 	cdata := s.cdata(c, "about", 0, 0, "")
 	data := &renderer.AboutData{
@@ -1117,8 +1104,8 @@ func (s *service) Reject(c *client, id string) (err error) {
 	return c.FollowRequestReject(c.ctx, id)
 }
 
-func (s *service) Mute(c *client, id string, notifications bool, duration int) (err error) {
+func (s *service) Mute(c *client, id string, notifications *bool) (err error) {
-	_, err = c.AccountMute(c.ctx, id, notifications, duration)
+	_, err = c.AccountMute(c.ctx, id, notifications)
 	return
 }
 

service/transport.go

@@ -178,11 +178,6 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
 		return s.UserSearchPage(c, id, sq, offset)
 	}, SESSION, HTML)
 
-	mutePage := handle(func(c *client) error {
-		id, _ := mux.Vars(c.r)["id"]
-		return s.MutePage(c, id)
-	}, SESSION, HTML)
-
 	aboutPage := handle(func(c *client) error {
 		return s.AboutPage(c)
 	}, SESSION, HTML)
@@ -472,13 +467,17 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
 
 	mute := handle(func(c *client) error {
 		id, _ := mux.Vars(c.r)["id"]
-		notifications, _ := strconv.ParseBool(c.r.FormValue("notifications"))
+		q := c.r.URL.Query()
-		duration, _ := strconv.Atoi(c.r.FormValue("duration"))
+		var notifications *bool
-		err := s.Mute(c, id, notifications, duration)
+		if r, ok := q["notifications"]; ok && len(r) > 0 {
+			notifications = new(bool)
+			*notifications = r[0] == "true"
+		}
+		err := s.Mute(c, id, notifications)
 		if err != nil {
 			return err
 		}
-		c.redirect("/user/" + id)
+		c.redirect(c.r.FormValue("referrer"))
 		return nil
 	}, CSRF, HTML)
 
@@ -806,7 +805,6 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
 	r.HandleFunc("/user/{id}", userPage).Methods(http.MethodGet)
 	r.HandleFunc("/user/{id}/{type}", userPage).Methods(http.MethodGet)
 	r.HandleFunc("/usersearch/{id}", userSearchPage).Methods(http.MethodGet)
-	r.HandleFunc("/mute/{id}", mutePage).Methods(http.MethodGet)
 	r.HandleFunc("/about", aboutPage).Methods(http.MethodGet)
 	r.HandleFunc("/aboutinstance", aboutInstance).Methods(http.MethodGet)
 	r.HandleFunc("/emojis", emojisPage).Methods(http.MethodGet)

templates/mute.tmpl

@@ -1,29 +0,0 @@
-{{with .Data}}
-{{template "header.tmpl" (WithContext .CommonData $.Ctx)}}
-<div class="page-title"> Mute {{.User.Acct}} </div>
-
-<form action="/mute/{{.User.ID}}" method="POST">
-	<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
-	<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
-	<div class="settings-form-field">
-		<input id="notifications" name="notifications" type="checkbox" value="true" checked>
-		<label for="notifications"> Mute notifications </label>
-	</div>
-	<div class="settings-form-field">
-		<label for="duration"> Auto unmute </label>
-		<select id="duration" name="duration">
-			<option value="0" selected>Disabled</option>
-			<option value="300">After 5m</option>
-			<option value="1800">After 30m</option>
-			<option value="3600">After 1h</option>
-			<option value="21600">After 6h</option>
-			<option value="86400">After 1d</option>
-			<option value="259200">After 3d</option>
-			<option value="604800">After 7d</option>
-		</select>
-	</div>
-	<button type="submit"> Mute </button>
-</form>
-
-{{template "footer.tmpl"}}
-{{end}}

templates/user.tmpl

@@ -81,7 +81,17 @@
 				<input type="submit" value="unmute" class="btn-link">
 			</form>
 			{{else}}
-			<a href="/mute/{{.User.ID}}"> mute </a>
+			<form class="d-inline" action="/mute/{{.User.ID}}" method="post">
+				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+				<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
+				<input type="submit" value="mute" class="btn-link">
+			</form>
+			-
+			<form class="d-inline" action="/mute/{{.User.ID}}?notifications=false" method="post">
+				<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+				<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
+				<input type="submit" value="mute (keep notifications)" class="btn-link">
+			</form>
 			{{end}}
 			{{if .User.Pleroma.Relationship.Following}} 
 			-
@@ -134,7 +144,7 @@
 	{{if .User.Fields}}
 	<div class="user-fields">
 		{{range .User.Fields}}
-		<div>{{EmojiFilter .Name $.Data.User.Emojis | Raw}} - {{EmojiFilter .Value $.Data.User.Emojis | Raw}}</div>
+		<div>{{.Name}} - {{EmojiFilter .Value $.Data.User.Emojis | Raw}}</div>
 		{{end}}
 	</div>
 	{{end}}