diff --git a/model/post.go b/model/post.go index e0c13c9..3a264ce 100644 --- a/model/post.go +++ b/model/post.go @@ -19,4 +19,5 @@ type ReplyContext struct { ReplySpoiler string ReplyContent string ForceVisibility bool + ReplyLanguage string } diff --git a/renderer/model.go b/renderer/model.go index 1d3d414..4c31001 100644 --- a/renderer/model.go +++ b/renderer/model.go @@ -109,11 +109,6 @@ type UserData struct { NextLink string } -type UserEditData struct { - *CommonData - User *mastodon.Account -} - type UserSearchData struct { *CommonData User *mastodon.Account diff --git a/renderer/renderer.go b/renderer/renderer.go index 599be56..470490e 100644 --- a/renderer/renderer.go +++ b/renderer/renderer.go @@ -34,7 +34,6 @@ const ( RetweetedByPage = "retweetedby.tmpl" SearchPage = "search.tmpl" SettingsPage = "settings.tmpl" - UserEditPage = "useredit.tmpl" FiltersPage = "filters.tmpl" ProfilePage = "profile.tmpl" MutePage = "mute.tmpl" diff --git a/service/service.go b/service/service.go index 8215c6a..cfbab9c 100644 --- a/service/service.go +++ b/service/service.go @@ -362,6 +362,8 @@ func (s *service) ThreadPage(c *client, id string, reply bool) (err error) { visibility = c.s.Settings.DefaultVisibility } + replyLanguage := status.Language + pctx = model.PostContext{ DefaultVisibility: visibility, DefaultFormat: c.s.Settings.DefaultFormat, @@ -372,6 +374,7 @@ func (s *service) ThreadPage(c *client, id string, reply bool) (err error) { ReplySpoiler: spoilerText, ReplyContent: content, ForceVisibility: isDirect, + ReplyLanguage: replyLanguage, }, } } @@ -836,19 +839,6 @@ func (s *service) SearchPage(c *client, return s.renderer.Render(c.rctx, c.w, renderer.SearchPage, data) } -func (s *service) UserEditPage(c *client) (err error) { - cdata := s.cdata(c, "useredit", 0, 0, "") - u, err := c.GetAccountCurrentUser(c.ctx) - if err != nil { - return - } - data := &renderer.UserEditData{ - CommonData: cdata, - User: u, - } - return s.renderer.Render(c.rctx, c.w, renderer.UserEditPage, data) -} - func (s *service) SettingsPage(c *client) (err error) { cdata := s.cdata(c, "settings", 0, 0, "") data := &renderer.SettingsData{ diff --git a/templates/postform.tmpl b/templates/postform.tmpl index 964032b..6b49f6c 100644 --- a/templates/postform.tmpl +++ b/templates/postform.tmpl @@ -48,7 +48,7 @@ - + diff --git a/templates/user.tmpl b/templates/user.tmpl index db3afff..c8123b0 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -114,7 +114,6 @@ - mutes - blocks {{if .User.Locked}}- requests {{end}} - - edit {{end}}
diff --git a/templates/useredit.tmpl b/templates/useredit.tmpl deleted file mode 100644 index cac25d8..0000000 --- a/templates/useredit.tmpl +++ /dev/null @@ -1,48 +0,0 @@ -{{with .Data}} -{{template "header.tmpl" (WithContext .CommonData $.Ctx)}} -
User settings
- -
- - - -
- - -
-
- -
-
- -
-
Current bio for copypaste{{.User.Note | Raw}}
-
-
-
- - -
-
- - -
- {{if .User.MastodonAccount}} - {{else}} -
Pleroma settings
- -
- - -
-
- - -
- {{end}} - - -
- -{{template "footer.tmpl"}} -{{end}}