Compare commits
2 Commits
6a233f6cb2
...
8dcd6cfdd7
Author | SHA1 | Date |
---|---|---|
localhost_frssoft | 8dcd6cfdd7 | |
localhost_frssoft | 14898fea07 |
|
@ -19,4 +19,5 @@ type ReplyContext struct {
|
||||||
ReplySpoiler string
|
ReplySpoiler string
|
||||||
ReplyContent string
|
ReplyContent string
|
||||||
ForceVisibility bool
|
ForceVisibility bool
|
||||||
|
ReplyLanguage string
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,11 +109,6 @@ type UserData struct {
|
||||||
NextLink string
|
NextLink string
|
||||||
}
|
}
|
||||||
|
|
||||||
type UserEditData struct {
|
|
||||||
*CommonData
|
|
||||||
User *mastodon.Account
|
|
||||||
}
|
|
||||||
|
|
||||||
type UserSearchData struct {
|
type UserSearchData struct {
|
||||||
*CommonData
|
*CommonData
|
||||||
User *mastodon.Account
|
User *mastodon.Account
|
||||||
|
|
|
@ -34,7 +34,6 @@ const (
|
||||||
RetweetedByPage = "retweetedby.tmpl"
|
RetweetedByPage = "retweetedby.tmpl"
|
||||||
SearchPage = "search.tmpl"
|
SearchPage = "search.tmpl"
|
||||||
SettingsPage = "settings.tmpl"
|
SettingsPage = "settings.tmpl"
|
||||||
UserEditPage = "useredit.tmpl"
|
|
||||||
FiltersPage = "filters.tmpl"
|
FiltersPage = "filters.tmpl"
|
||||||
ProfilePage = "profile.tmpl"
|
ProfilePage = "profile.tmpl"
|
||||||
MutePage = "mute.tmpl"
|
MutePage = "mute.tmpl"
|
||||||
|
|
|
@ -362,6 +362,8 @@ func (s *service) ThreadPage(c *client, id string, reply bool) (err error) {
|
||||||
visibility = c.s.Settings.DefaultVisibility
|
visibility = c.s.Settings.DefaultVisibility
|
||||||
}
|
}
|
||||||
|
|
||||||
|
replyLanguage := status.Language
|
||||||
|
|
||||||
pctx = model.PostContext{
|
pctx = model.PostContext{
|
||||||
DefaultVisibility: visibility,
|
DefaultVisibility: visibility,
|
||||||
DefaultFormat: c.s.Settings.DefaultFormat,
|
DefaultFormat: c.s.Settings.DefaultFormat,
|
||||||
|
@ -372,6 +374,7 @@ func (s *service) ThreadPage(c *client, id string, reply bool) (err error) {
|
||||||
ReplySpoiler: spoilerText,
|
ReplySpoiler: spoilerText,
|
||||||
ReplyContent: content,
|
ReplyContent: content,
|
||||||
ForceVisibility: isDirect,
|
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)
|
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) {
|
func (s *service) SettingsPage(c *client) (err error) {
|
||||||
cdata := s.cdata(c, "settings", 0, 0, "")
|
cdata := s.cdata(c, "settings", 0, 0, "")
|
||||||
data := &renderer.SettingsData{
|
data := &renderer.SettingsData{
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
<button type="submit" accesskey="P" title="Post (P)"> Post </button>
|
<button type="submit" accesskey="P" title="Post (P)"> Post </button>
|
||||||
<button type="reset" title="Reset"> Reset </button>
|
<button type="reset" title="Reset"> Reset </button>
|
||||||
<input id="edit-status-id" name="edit-status-id" placeholder="Input Status ID for edit" title="Edit ID">
|
<input id="edit-status-id" name="edit-status-id" placeholder="Input Status ID for edit" title="Edit ID">
|
||||||
<input id="lang-code" name="lang-code" placeholder="lang" title="Post language (ISO 639) [en, ru, etc..] Default: none" size="4">
|
<input id="lang-code" name="lang-code" placeholder="lang" title="Post language (ISO 639) [en, ru, etc..] Default: none" size="4" value="{{if .ReplyContext}}{{.ReplyContext.ReplyLanguage}}{{end}}">
|
||||||
<input type="number" id="expires-in" name="expires-in" title="Post autodeleted after hour(s)" min="0" value="0" size="4">
|
<input type="number" id="expires-in" name="expires-in" title="Post autodeleted after hour(s)" min="0" value="0" size="4">
|
||||||
<input type="datetime-local" id="scheduled" name="scheduled" step=300 title="Schedule your status (timezone UTC+0)">
|
<input type="datetime-local" id="scheduled" name="scheduled" step=300 title="Schedule your status (timezone UTC+0)">
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -114,7 +114,6 @@
|
||||||
- <a href="/user/{{.User.ID}}/mutes"> mutes </a>
|
- <a href="/user/{{.User.ID}}/mutes"> mutes </a>
|
||||||
- <a href="/user/{{.User.ID}}/blocks"> blocks </a>
|
- <a href="/user/{{.User.ID}}/blocks"> blocks </a>
|
||||||
{{if .User.Locked}}- <a href="/user/{{.User.ID}}/requests"> requests </a>{{end}}
|
{{if .User.Locked}}- <a href="/user/{{.User.ID}}/requests"> requests </a>{{end}}
|
||||||
- <a href="/useredit"> edit </a>
|
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div>
|
<div>
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
{{with .Data}}
|
|
||||||
{{template "header.tmpl" (WithContext .CommonData $.Ctx)}}
|
|
||||||
<div class="page-title"> User settings </div>
|
|
||||||
|
|
||||||
<form id="user-settings-form" action="/useredit" method="POST">
|
|
||||||
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
|
|
||||||
<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
|
|
||||||
<input type="hidden" name="id" value="{{.User.ID}}">
|
|
||||||
<div class="settings-form-field">
|
|
||||||
<input id="display-name" name="display-name" value="{{HTML .User.DisplayName}}">
|
|
||||||
<label for="display-name"> Your display name </label>
|
|
||||||
</div>
|
|
||||||
<div class="settings-form-field">
|
|
||||||
<label for="note"> Your bio: </label>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<textarea id="note" name="note" cols="80" rows="8"></textarea>
|
|
||||||
<div>
|
|
||||||
<details><summary>Current bio for copypaste</summary>{{.User.Note | Raw}}</details>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="settings-form-field" title="Whether manual approval of follow requests is required.">
|
|
||||||
<input id="locked" name="locked" type="checkbox" value="true" {{if .User.Locked}}checked{{end}}>
|
|
||||||
<label for="locked"> Locked user? </label>
|
|
||||||
</div>
|
|
||||||
<div class="settings-form-field" title="Whether manual approval of follow requests is required.">
|
|
||||||
<input id="bot" name="bot" type="checkbox" value="true" {{if .User.Bot}}checked{{end}}>
|
|
||||||
<label for="bot"> User is bot? </label>
|
|
||||||
</div>
|
|
||||||
{{if .User.MastodonAccount}}
|
|
||||||
{{else}}
|
|
||||||
<div class="page-title"> Pleroma settings </div>
|
|
||||||
|
|
||||||
<div class="settings-form-field">
|
|
||||||
<input id="accepts-chat-messages" name="hide-attachments" type="checkbox" value="true" {{if .User.Pleroma.AcceptsChatMessages}}checked{{end}}>
|
|
||||||
<label for="accepts-chat-messages"> Allow receive chat messages (bloat not support chats feature) </label>
|
|
||||||
</div>
|
|
||||||
<div class="settings-form-field">
|
|
||||||
<input id="hide-favourites" name="hide-favourites" type="checkbox" value="true" {{if .User.Pleroma.HideFavourites}}checked{{end}}>
|
|
||||||
<label for="hide-favourites"> User's favorites timeline will be hidden </label>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
<button type="submit"> Save </button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
{{template "footer.tmpl"}}
|
|
||||||
{{end}}
|
|
Loading…
Reference in New Issue