diff --git a/internal/webserver/handler_lists.go b/internal/webserver/handler_lists.go index 90be274..93d4f3a 100644 --- a/internal/webserver/handler_lists.go +++ b/internal/webserver/handler_lists.go @@ -1,22 +1,28 @@ package webserver import ( + "context" + "errors" + "fmt" "net/http" + "strconv" + "strings" - "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" + "gitlab.com/offline-twitter/twitter_offline_engine/pkg/persistence" + . "gitlab.com/offline-twitter/twitter_offline_engine/pkg/scraper" ) type ListData struct { - Title string - HeaderUserID scraper.UserID - HeaderTweetID scraper.TweetID - UserIDs []scraper.UserID + List + Feed persistence.Feed + UserIDs []UserID + ActiveTab string } -func NewListData(users []scraper.User) (ListData, scraper.TweetTrove) { - trove := scraper.NewTweetTrove() +func NewListData(users []User) (ListData, TweetTrove) { + trove := NewTweetTrove() data := ListData{ - UserIDs: []scraper.UserID{}, + UserIDs: []UserID{}, } for _, u := range users { trove.Users[u.ID] = u @@ -25,19 +31,139 @@ func NewListData(users []scraper.User) (ListData, scraper.TweetTrove) { return data, trove } +func (app *Application) ListDetailFeed(w http.ResponseWriter, r *http.Request) { + list := get_list_from_context(r.Context()) + + c := persistence.NewListCursor(list.ID) + err := parse_cursor_value(&c, r) + if err != nil { + app.error_400_with_message(w, "invalid cursor (must be a number)") + return + } + feed, err := app.Profile.NextPage(c, app.ActiveUser.ID) + if err != nil && !errors.Is(err, persistence.ErrEndOfFeed) { + panic(err) + } + if r.Header.Get("HX-Request") == "true" && c.CursorPosition == persistence.CURSOR_MIDDLE { + // It's a Show More request + app.buffered_render_htmx(w, "timeline", PageGlobalData{TweetTrove: feed.TweetTrove}, feed) + } else { + app.buffered_render_page( + w, + "tpl/list.tpl", + PageGlobalData{TweetTrove: feed.TweetTrove}, + ListData{Feed: feed, List: list, ActiveTab: "feed"}, + ) + } +} + +func (app *Application) ListDetailUsers(w http.ResponseWriter, r *http.Request) { + list := get_list_from_context(r.Context()) + users := app.Profile.GetListUsers(list.ID) + + data, trove := NewListData(users) + data.List = list + data.ActiveTab = "users" + app.buffered_render_page(w, "tpl/list.tpl", PageGlobalData{TweetTrove: trove}, data) +} + +func (app *Application) ListDetail(w http.ResponseWriter, r *http.Request) { + app.traceLog.Printf("'ListDetail' handler (path: %q)", r.URL.Path) + parts := strings.Split(strings.Trim(r.URL.Path, "/"), "/") + + if len(parts) == 1 && parts[0] == "" { + // No further path; just show the feed + app.ListDetailFeed(w, r) + } + + switch parts[0] { + case "users": + app.ListDetailUsers(w, r) + case "add_user": + app.ListAddUser(w, r) + case "remove_user": + app.ListRemoveUser(w, r) + default: + app.error_404(w) + } +} + +func (app *Application) ListAddUser(w http.ResponseWriter, r *http.Request) { + handle := r.URL.Query().Get("user_handle") + if handle[0] == '@' { + handle = handle[1:] + } + user, err := app.Profile.GetUserByHandle(UserHandle(handle)) + if err != nil { + app.error_400_with_message(w, "Fetch user: "+err.Error()) + return + } + list := get_list_from_context(r.Context()) + app.Profile.SaveListUser(list.ID, user.ID) + http.Redirect(w, r, fmt.Sprintf("/lists/%d", list.ID), 302) +} + +func (app *Application) ListRemoveUser(w http.ResponseWriter, r *http.Request) { + handle := r.URL.Query().Get("user_handle") + if handle[0] == '@' { + handle = handle[1:] + } + user, err := app.Profile.GetUserByHandle(UserHandle(handle)) + if err != nil { + app.error_400_with_message(w, "Fetch user: "+err.Error()) + return + } + list := get_list_from_context(r.Context()) + app.Profile.DeleteListUser(list.ID, user.ID) + http.Redirect(w, r, fmt.Sprintf("/lists/%d", list.ID), 302) +} + func (app *Application) Lists(w http.ResponseWriter, r *http.Request) { app.traceLog.Printf("'Lists' handler (path: %q)", r.URL.Path) - var users []scraper.User - err := app.Profile.DB.Select(&users, ` - select id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private, is_verified, - is_banned, is_deleted, profile_image_url, profile_image_local_path, banner_image_url, banner_image_local_path, - pinned_tweet_id, is_content_downloaded, is_followed - from users - where is_followed = 1`) - panic_if(err) + parts := strings.Split(strings.Trim(r.URL.Path, "/"), "/") - data, trove := NewListData(users) - data.Title = "Offline Follows" - app.buffered_render_page(w, "tpl/list.tpl", PageGlobalData{TweetTrove: trove}, data) + // List detail + if parts[0] != "" { // If there's an ID param + _list_id, err := strconv.Atoi(parts[0]) + if err != nil { + app.error_400_with_message(w, "List ID must be a number") + return + } + // XXX: Check that the list exists + // Need to modify signature to return an error, because it might be ErrNoRows + list := app.Profile.GetListById(ListID(_list_id)) + req_with_ctx := r.WithContext(add_list_to_context(r.Context(), list)) + http.StripPrefix(fmt.Sprintf("/%d", list.ID), http.HandlerFunc(app.ListDetail)).ServeHTTP(w, req_with_ctx) + return + } + + // List index + lists := app.Profile.GetAllLists() + trove := NewTweetTrove() + for _, l := range lists { + for _, u := range l.Users { + trove.Users[u.ID] = u + } + } + app.buffered_render_page( + w, + "tpl/list_of_lists.tpl", + PageGlobalData{TweetTrove: trove}, + lists, + ) +} + +const LIST_KEY = key("list") // type `key` is defined in "handler_tweet_detail" + +func add_list_to_context(ctx context.Context, list List) context.Context { + return context.WithValue(ctx, LIST_KEY, list) +} + +func get_list_from_context(ctx context.Context) List { + list, is_ok := ctx.Value(LIST_KEY).(List) + if !is_ok { + panic("List not found in context") + } + return list } diff --git a/internal/webserver/server.go b/internal/webserver/server.go index e371f14..4b2e5e8 100644 --- a/internal/webserver/server.go +++ b/internal/webserver/server.go @@ -124,7 +124,7 @@ func (app *Application) ServeHTTP(w http.ResponseWriter, r *http.Request) { case "search": http.StripPrefix("/search", http.HandlerFunc(app.Search)).ServeHTTP(w, r) case "lists": - app.Lists(w, r) + http.StripPrefix("/lists", http.HandlerFunc(app.Lists)).ServeHTTP(w, r) case "messages": http.StripPrefix("/messages", http.HandlerFunc(app.Messages)).ServeHTTP(w, r) default: diff --git a/internal/webserver/server_test.go b/internal/webserver/server_test.go index b31f6c0..4a267ba 100644 --- a/internal/webserver/server_test.go +++ b/internal/webserver/server_test.go @@ -590,12 +590,39 @@ func TestStaticFileNonexistent(t *testing.T) { // Lists // ----- -func TestLists(t *testing.T) { - assert := assert.New(t) +func TestListsIndex(t *testing.T) { + require := require.New(t) resp := do_request(httptest.NewRequest("GET", "/lists", nil)) + require.Equal(resp.StatusCode, 200) root, err := html.Parse(resp.Body) - assert.NoError(err) + require.NoError(err) + + // Check that there's 2 Lists + assert.Len(t, cascadia.QueryAll(root, selector(".users-list-preview")), 2) +} + +func TestListDetail(t *testing.T) { + require := require.New(t) + assert := assert.New(t) + + // Users + resp := do_request(httptest.NewRequest("GET", "/lists/1/users", nil)) + require.Equal(resp.StatusCode, 200) + root, err := html.Parse(resp.Body) + require.NoError(err) assert.Len(cascadia.QueryAll(root, selector(".users-list-container .author-info")), 5) + + // Feed + resp1 := do_request(httptest.NewRequest("GET", "/lists/2", nil)) + require.Equal(resp1.StatusCode, 200) + root1, err := html.Parse(resp1.Body) + require.NoError(err) + assert.Len(cascadia.QueryAll(root1, selector(".timeline > .tweet")), 3) +} + +func TestListDetailInvalidId(t *testing.T) { + resp := do_request(httptest.NewRequest("GET", "/lists/asd", nil)) + require.Equal(t, resp.StatusCode, 400) } // Messages diff --git a/internal/webserver/static/styles.css b/internal/webserver/static/styles.css index 37fa197..0a1276e 100644 --- a/internal/webserver/static/styles.css +++ b/internal/webserver/static/styles.css @@ -51,6 +51,11 @@ input, select { border-radius: 0.5em; } +h1 { + margin: 0.5em 0; + text-align: center; +} + .server-error-msg { position: fixed; margin: 6em 0; @@ -267,7 +272,7 @@ h3 { width: 3em; height: 3em; display: inline; - border: 1px solid var(--color-outline-gray); + border: 0.1em solid var(--color-outline-gray); } .user-header { @@ -657,9 +662,46 @@ ul.space-participants-list li { filter: invert(20%) sepia(97%) saturate(4383%) hue-rotate(321deg) brightness(101%) contrast(95%); } +.users-list-previews { + border-color: var(--color-twitter-off-white-dark); + border-top-style: double; + border-width: 4px; +} + +.users-list-preview { + cursor: pointer; + display: flex; + font-size: 1.5em; + border-color: var(--color-twitter-off-white-dark); + border-bottom-style: solid; + border-width: 1px; + padding: 0.5em 1em; + align-items: center; +} +.users-list-preview span.num-users { + margin-left: 1em; + color: var(--color-twitter-text-gray); +} +.users-list-preview .first-N-profile-images { + display: flex; + align-items: flex-end; + margin-left: 1.5em; +} +.users-list-preview .first-N-profile-images a { + margin-right: -1.2em; + line-height: 0; /* TODO: This is duplicated from `.author-info a` and possibly others */ +} + +.users-list-preview .first-N-profile-images .ellipsis { + margin-left: 1.5em; +} + .users-list-container { display: flex; flex-direction: column; + border-color: var(--color-twitter-off-white-dark); + border-top-style: double; + border-width: 4px; } .users-list-container .author-info .profile-image { width: 4em; diff --git a/internal/webserver/tpl/list.tpl b/internal/webserver/tpl/list.tpl index 5e15a17..4350650 100644 --- a/internal/webserver/tpl/list.tpl +++ b/internal/webserver/tpl/list.tpl @@ -1,15 +1,31 @@ -{{define "title"}}{{.Title}}{{end}} +{{define "title"}}{{.List.Name}}{{end}} {{define "main"}} - {{if .HeaderUserID}} - {{template "user-header" (user .HeaderUserID)}} - {{else if .HeaderTweetID}} - {{template "tweet" (tweet .HeaderTweetID)}} +
+

{{.List.Name}}

+ +
+ + Feed + + + Users + +
+
+ + {{if (eq .ActiveTab "feed")}} +
+ {{template "timeline" .Feed}} +
+ {{else}} +
+
+ + +
+
+ + {{template "list" .UserIDs}} {{end}} - -

- {{.Title}} -

- - {{template "list" .UserIDs}} {{end}} diff --git a/internal/webserver/tpl/search.tpl b/internal/webserver/tpl/search.tpl index 86abc06..632a971 100644 --- a/internal/webserver/tpl/search.tpl +++ b/internal/webserver/tpl/search.tpl @@ -2,7 +2,7 @@ {{define "main"}}
-

Search results: {{.SearchText}}

+

Search results: {{.SearchText}}