diff --git a/model/post.go b/model/post.go index 3a264ce..e0c13c9 100644 --- a/model/post.go +++ b/model/post.go @@ -19,5 +19,4 @@ type ReplyContext struct { ReplySpoiler string ReplyContent string ForceVisibility bool - ReplyLanguage string } diff --git a/renderer/model.go b/renderer/model.go index 4c31001..1d3d414 100644 --- a/renderer/model.go +++ b/renderer/model.go @@ -109,6 +109,11 @@ 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 470490e..599be56 100644 --- a/renderer/renderer.go +++ b/renderer/renderer.go @@ -34,6 +34,7 @@ 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 cfbab9c..8215c6a 100644 --- a/service/service.go +++ b/service/service.go @@ -362,8 +362,6 @@ 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, @@ -374,7 +372,6 @@ func (s *service) ThreadPage(c *client, id string, reply bool) (err error) { ReplySpoiler: spoilerText, ReplyContent: content, ForceVisibility: isDirect, - ReplyLanguage: replyLanguage, }, } } @@ -839,6 +836,19 @@ 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 6b49f6c..964032b 100644 --- a/templates/postform.tmpl +++ b/templates/postform.tmpl @@ -48,7 +48,7 @@ - + diff --git a/templates/user.tmpl b/templates/user.tmpl index c8123b0..db3afff 100644 --- a/templates/user.tmpl +++ b/templates/user.tmpl @@ -114,6 +114,7 @@ - mutes - blocks {{if .User.Locked}}- requests {{end}} + - edit {{end}}
diff --git a/templates/useredit.tmpl b/templates/useredit.tmpl new file mode 100644 index 0000000..cac25d8 --- /dev/null +++ b/templates/useredit.tmpl @@ -0,0 +1,48 @@ +{{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}}