Add user search page
This commit is contained in:
parent
84cd3bc436
commit
17e55d2a9b
|
@ -284,14 +284,17 @@ func (c *Client) DeleteStatus(ctx context.Context, id string) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Search search content with query.
|
// Search search content with query.
|
||||||
func (c *Client) Search(ctx context.Context, q string, qType string, limit int, resolve bool, offset int) (*Results, error) {
|
func (c *Client) Search(ctx context.Context, q string, qType string, limit int, resolve bool, offset int, accountID string) (*Results, error) {
|
||||||
|
var results Results
|
||||||
params := url.Values{}
|
params := url.Values{}
|
||||||
params.Set("q", q)
|
params.Set("q", q)
|
||||||
params.Set("type", qType)
|
params.Set("type", qType)
|
||||||
params.Set("limit", fmt.Sprint(limit))
|
params.Set("limit", fmt.Sprint(limit))
|
||||||
params.Set("resolve", fmt.Sprint(resolve))
|
params.Set("resolve", fmt.Sprint(resolve))
|
||||||
params.Set("offset", fmt.Sprint(offset))
|
params.Set("offset", fmt.Sprint(offset))
|
||||||
var results Results
|
if len(accountID) > 0 {
|
||||||
|
params.Set("account_id", accountID)
|
||||||
|
}
|
||||||
err := c.doAPI(ctx, http.MethodGet, "/api/v2/search", params, &results, nil)
|
err := c.doAPI(ctx, http.MethodGet, "/api/v2/search", params, &results, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -74,6 +74,14 @@ type UserData struct {
|
||||||
DarkMode bool
|
DarkMode bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type UserSearchData struct {
|
||||||
|
*CommonData
|
||||||
|
User *mastodon.Account
|
||||||
|
Q string
|
||||||
|
Statuses []*mastodon.Status
|
||||||
|
NextLink string
|
||||||
|
}
|
||||||
|
|
||||||
type AboutData struct {
|
type AboutData struct {
|
||||||
*CommonData
|
*CommonData
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ type Renderer interface {
|
||||||
RenderThreadPage(ctx *Context, writer io.Writer, data *ThreadData) (err error)
|
RenderThreadPage(ctx *Context, writer io.Writer, data *ThreadData) (err error)
|
||||||
RenderNotificationPage(ctx *Context, writer io.Writer, data *NotificationData) (err error)
|
RenderNotificationPage(ctx *Context, writer io.Writer, data *NotificationData) (err error)
|
||||||
RenderUserPage(ctx *Context, writer io.Writer, data *UserData) (err error)
|
RenderUserPage(ctx *Context, writer io.Writer, data *UserData) (err error)
|
||||||
|
RenderUserSearchPage(ctx *Context, writer io.Writer, data *UserSearchData) (err error)
|
||||||
RenderAboutPage(ctx *Context, writer io.Writer, data *AboutData) (err error)
|
RenderAboutPage(ctx *Context, writer io.Writer, data *AboutData) (err error)
|
||||||
RenderEmojiPage(ctx *Context, writer io.Writer, data *EmojiData) (err error)
|
RenderEmojiPage(ctx *Context, writer io.Writer, data *EmojiData) (err error)
|
||||||
RenderLikedByPage(ctx *Context, writer io.Writer, data *LikedByData) (err error)
|
RenderLikedByPage(ctx *Context, writer io.Writer, data *LikedByData) (err error)
|
||||||
|
@ -87,6 +88,11 @@ func (r *renderer) RenderUserPage(ctx *Context, writer io.Writer,
|
||||||
return r.template.ExecuteTemplate(writer, "user.tmpl", WithContext(data, ctx))
|
return r.template.ExecuteTemplate(writer, "user.tmpl", WithContext(data, ctx))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *renderer) RenderUserSearchPage(ctx *Context, writer io.Writer,
|
||||||
|
data *UserSearchData) (err error) {
|
||||||
|
return r.template.ExecuteTemplate(writer, "usersearch.tmpl", WithContext(data, ctx))
|
||||||
|
}
|
||||||
|
|
||||||
func (r *renderer) RenderAboutPage(ctx *Context, writer io.Writer,
|
func (r *renderer) RenderAboutPage(ctx *Context, writer io.Writer,
|
||||||
data *AboutData) (err error) {
|
data *AboutData) (err error) {
|
||||||
return r.template.ExecuteTemplate(writer, "about.tmpl", WithContext(data, ctx))
|
return r.template.ExecuteTemplate(writer, "about.tmpl", WithContext(data, ctx))
|
||||||
|
|
|
@ -162,6 +162,15 @@ func (s *as) ServeSearchPage(ctx context.Context, c *model.Client, q string,
|
||||||
return s.Service.ServeSearchPage(ctx, c, q, qType, offset)
|
return s.Service.ServeSearchPage(ctx, c, q, qType, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *as) ServeUserSearchPage(ctx context.Context, c *model.Client,
|
||||||
|
id string, q string, offset int) (err error) {
|
||||||
|
err = s.authenticateClient(ctx, c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return s.Service.ServeUserSearchPage(ctx, c, id, q, offset)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *as) ServeSettingsPage(ctx context.Context, c *model.Client) (err error) {
|
func (s *as) ServeSettingsPage(ctx context.Context, c *model.Client) (err error) {
|
||||||
err = s.authenticateClient(ctx, c)
|
err = s.authenticateClient(ctx, c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -129,6 +129,15 @@ func (s *ls) ServeSearchPage(ctx context.Context, c *model.Client, q string,
|
||||||
return s.Service.ServeSearchPage(ctx, c, q, qType, offset)
|
return s.Service.ServeSearchPage(ctx, c, q, qType, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *ls) ServeUserSearchPage(ctx context.Context, c *model.Client,
|
||||||
|
id string, q string, offset int) (err error) {
|
||||||
|
defer func(begin time.Time) {
|
||||||
|
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||||
|
"ServeUserSearchPage", time.Since(begin), err)
|
||||||
|
}(time.Now())
|
||||||
|
return s.Service.ServeUserSearchPage(ctx, c, id, q, offset)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *ls) ServeSettingsPage(ctx context.Context, c *model.Client) (err error) {
|
func (s *ls) ServeSettingsPage(ctx context.Context, c *model.Client) (err error) {
|
||||||
defer func(begin time.Time) {
|
defer func(begin time.Time) {
|
||||||
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
s.logger.Printf("method=%v, took=%v, err=%v\n",
|
||||||
|
|
|
@ -32,6 +32,7 @@ type Service interface {
|
||||||
ServeAboutPage(ctx context.Context, c *model.Client) (err error)
|
ServeAboutPage(ctx context.Context, c *model.Client) (err error)
|
||||||
ServeEmojiPage(ctx context.Context, c *model.Client) (err error)
|
ServeEmojiPage(ctx context.Context, c *model.Client) (err error)
|
||||||
ServeSearchPage(ctx context.Context, c *model.Client, q string, qType string, offset int) (err error)
|
ServeSearchPage(ctx context.Context, c *model.Client, q string, qType string, offset int) (err error)
|
||||||
|
ServeUserSearchPage(ctx context.Context, c *model.Client, id string, q string, offset int) (err error)
|
||||||
ServeSettingsPage(ctx context.Context, c *model.Client) (err error)
|
ServeSettingsPage(ctx context.Context, c *model.Client) (err error)
|
||||||
NewSession(ctx context.Context, instance string) (redirectUrl string, sessionID string, err error)
|
NewSession(ctx context.Context, instance string) (redirectUrl string, sessionID string, err error)
|
||||||
Signin(ctx context.Context, c *model.Client, sessionID string, code string) (token string, err error)
|
Signin(ctx context.Context, c *model.Client, sessionID string, code string) (token string, err error)
|
||||||
|
@ -560,6 +561,48 @@ func (svc *service) ServeUserPage(ctx context.Context, c *model.Client,
|
||||||
return svc.renderer.RenderUserPage(rCtx, c.Writer, data)
|
return svc.renderer.RenderUserPage(rCtx, c.Writer, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (svc *service) ServeUserSearchPage(ctx context.Context, c *model.Client,
|
||||||
|
id string, q string, offset int) (err error) {
|
||||||
|
|
||||||
|
var nextLink string
|
||||||
|
var title = "search"
|
||||||
|
|
||||||
|
user, err := c.GetAccount(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
results, err := c.Search(ctx, q, "statuses", 20, true, offset, id)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(results.Statuses) == 20 {
|
||||||
|
offset += 20
|
||||||
|
nextLink = fmt.Sprintf("/usersearch/%s?q=%s&offset=%d", id, q, offset)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(q) > 0 {
|
||||||
|
title += " \"" + q + "\""
|
||||||
|
}
|
||||||
|
|
||||||
|
commonData, err := svc.getCommonData(ctx, c, title)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data := &renderer.UserSearchData{
|
||||||
|
CommonData: commonData,
|
||||||
|
User: user,
|
||||||
|
Q: q,
|
||||||
|
Statuses: results.Statuses,
|
||||||
|
NextLink: nextLink,
|
||||||
|
}
|
||||||
|
|
||||||
|
rCtx := getRendererContext(c)
|
||||||
|
return svc.renderer.RenderUserSearchPage(rCtx, c.Writer, data)
|
||||||
|
}
|
||||||
|
|
||||||
func (svc *service) ServeAboutPage(ctx context.Context, c *model.Client) (err error) {
|
func (svc *service) ServeAboutPage(ctx context.Context, c *model.Client) (err error) {
|
||||||
commonData, err := svc.getCommonData(ctx, c, "about")
|
commonData, err := svc.getCommonData(ctx, c, "about")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -600,7 +643,7 @@ func (svc *service) ServeSearchPage(ctx context.Context, c *model.Client,
|
||||||
var nextLink string
|
var nextLink string
|
||||||
var title = "search"
|
var title = "search"
|
||||||
|
|
||||||
results, err := c.Search(ctx, q, qType, 20, true, offset)
|
results, err := c.Search(ctx, q, qType, 20, true, offset, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -188,6 +188,30 @@ func NewHandler(s Service, staticDir string) http.Handler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
userSearchPage := func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
c := newClient(w)
|
||||||
|
ctx := newCtxWithSesion(req)
|
||||||
|
id, _ := mux.Vars(req)["id"]
|
||||||
|
q := req.URL.Query().Get("q")
|
||||||
|
offsetStr := req.URL.Query().Get("offset")
|
||||||
|
|
||||||
|
var offset int
|
||||||
|
var err error
|
||||||
|
if len(offsetStr) > 1 {
|
||||||
|
offset, err = strconv.Atoi(offsetStr)
|
||||||
|
if err != nil {
|
||||||
|
s.ServeErrorPage(ctx, c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
err = s.ServeUserSearchPage(ctx, c, id, q, offset)
|
||||||
|
if err != nil {
|
||||||
|
s.ServeErrorPage(ctx, c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
aboutPage := func(w http.ResponseWriter, req *http.Request) {
|
aboutPage := func(w http.ResponseWriter, req *http.Request) {
|
||||||
c := newClient(w)
|
c := newClient(w)
|
||||||
ctx := newCtxWithSesion(req)
|
ctx := newCtxWithSesion(req)
|
||||||
|
@ -545,6 +569,7 @@ func NewHandler(s Service, staticDir string) http.Handler {
|
||||||
r.HandleFunc("/followers/{id}", followersPage).Methods(http.MethodGet)
|
r.HandleFunc("/followers/{id}", followersPage).Methods(http.MethodGet)
|
||||||
r.HandleFunc("/notifications", notificationsPage).Methods(http.MethodGet)
|
r.HandleFunc("/notifications", notificationsPage).Methods(http.MethodGet)
|
||||||
r.HandleFunc("/user/{id}", userPage).Methods(http.MethodGet)
|
r.HandleFunc("/user/{id}", userPage).Methods(http.MethodGet)
|
||||||
|
r.HandleFunc("/usersearch/{id}", userSearchPage).Methods(http.MethodGet)
|
||||||
r.HandleFunc("/about", aboutPage).Methods(http.MethodGet)
|
r.HandleFunc("/about", aboutPage).Methods(http.MethodGet)
|
||||||
r.HandleFunc("/emojis", emojisPage).Methods(http.MethodGet)
|
r.HandleFunc("/emojis", emojisPage).Methods(http.MethodGet)
|
||||||
r.HandleFunc("/search", searchPage).Methods(http.MethodGet)
|
r.HandleFunc("/search", searchPage).Methods(http.MethodGet)
|
||||||
|
|
|
@ -105,7 +105,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-title {
|
.page-title {
|
||||||
font-size: 23pt;
|
font-size: 18pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
.post-form {
|
.post-form {
|
||||||
|
@ -426,6 +426,10 @@ a:hover,
|
||||||
margin: 0 8px 0 8px;
|
margin: 0 8px 0 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.search-form {
|
||||||
|
margin: 16px 0 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
.dark {
|
.dark {
|
||||||
background-color: #222222;
|
background-color: #222222;
|
||||||
background-image: none;
|
background-image: none;
|
||||||
|
|
|
@ -3,22 +3,20 @@
|
||||||
{{template "navigation.tmpl" (WithContext .NavbarData $.Ctx)}}
|
{{template "navigation.tmpl" (WithContext .NavbarData $.Ctx)}}
|
||||||
<div class="page-title"> Search </div>
|
<div class="page-title"> Search </div>
|
||||||
|
|
||||||
<div>
|
<form class="search-form" action="/search" method="GET">
|
||||||
<form action="/search" method="GET">
|
<span class="post-form-field>
|
||||||
<span class="post-form-field>
|
<label for="query"> Query </label>
|
||||||
<label for="query"> Query </label>
|
<input id="query" name="q" value="{{.Q}}">
|
||||||
<input id="query" name="q" value="{{.Q}}">
|
</span>
|
||||||
</span>
|
<span class="post-form-field>
|
||||||
<span class="post-form-field>
|
<label for="type"> Type </label>
|
||||||
<label for="type"> Type </label>
|
<select id="type" name="type">
|
||||||
<select id="type" name="type">
|
<option value="statuses" {{if eq .Type "statuses"}}selected{{end}}>Statuses</option>
|
||||||
<option value="statuses" {{if eq .Type "statuses"}}selected{{end}}>Statuses</option>
|
<option value="accounts" {{if eq .Type "accounts"}}selected{{end}}>Accounts</option>
|
||||||
<option value="accounts" {{if eq .Type "accounts"}}selected{{end}}>Accounts</option>
|
</select>
|
||||||
</select>
|
</span>
|
||||||
</span>
|
<button type="submit"> Search </button>
|
||||||
<button type="submit"> Search </button>
|
</form>
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{if eq .Type "statuses"}}
|
{{if eq .Type "statuses"}}
|
||||||
{{range .Statuses}}
|
{{range .Statuses}}
|
||||||
|
|
|
@ -44,6 +44,9 @@
|
||||||
<a href="/following/{{.User.ID}}"> {{.User.FollowingCount}} following </a> -
|
<a href="/following/{{.User.ID}}"> {{.User.FollowingCount}} following </a> -
|
||||||
<a href="/followers/{{.User.ID}}"> {{.User.FollowersCount}} followers </a>
|
<a href="/followers/{{.User.ID}}"> {{.User.FollowersCount}} followers </a>
|
||||||
</div>
|
</div>
|
||||||
|
<div>
|
||||||
|
<a href="/usersearch/{{.User.ID}}"> search statuses </a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="user-profile-decription">
|
<div class="user-profile-decription">
|
||||||
{{.User.Note}}
|
{{.User.Note}}
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
{{with .Data}}
|
||||||
|
{{template "header.tmpl" (WithContext .HeaderData $.Ctx)}}
|
||||||
|
{{template "navigation.tmpl" (WithContext .NavbarData $.Ctx)}}
|
||||||
|
<div class="page-title"> Search {{EmojiFilter .User.DisplayName .User.Emojis}}'s statuses </div>
|
||||||
|
|
||||||
|
<form class="search-form" action="/usersearch/{{.User.ID}}" method="GET">
|
||||||
|
<span class="post-form-field>
|
||||||
|
<label for="query"> Query </label>
|
||||||
|
<input id="query" name="q" value="{{.Q}}">
|
||||||
|
</span>
|
||||||
|
<button type="submit"> Search </button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{{range .Statuses}}
|
||||||
|
{{template "status.tmpl" (WithContext . $.Ctx)}}
|
||||||
|
{{end}}
|
||||||
|
|
||||||
|
<div class="pagination">
|
||||||
|
{{if .NextLink}}
|
||||||
|
<a href="{{.NextLink}}">next</a>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{template "footer.tmpl"}}
|
||||||
|
{{end}}
|
Loading…
Reference in New Issue