diff --git a/cmd/twitter/help_message.txt b/cmd/twitter/help_message.txt index e8695d0..21bb09d 100644 --- a/cmd/twitter/help_message.txt +++ b/cmd/twitter/help_message.txt @@ -75,10 +75,6 @@ This application downloads tweets from twitter and saves them in a SQLite databa unfollow is the user handle - list_followed - No is needed; will be ignored if given. - Lists all the users (by their @handle) that are followed. - search is the search query. Should be wrapped in quotes if it has spaces. (Requires authentication) diff --git a/cmd/twitter/main.go b/cmd/twitter/main.go index 1579042..f8777e8 100644 --- a/cmd/twitter/main.go +++ b/cmd/twitter/main.go @@ -81,7 +81,7 @@ func main() { log.SetLevel(logging_level) if len(args) < 2 { - if len(args) == 1 && (args[0] == "list_followed" || args[0] == "webserver" || args[0] == "fetch_timeline" || + if len(args) == 1 && (args[0] == "webserver" || args[0] == "fetch_timeline" || args[0] == "fetch_timeline_following_only" || args[0] == "fetch_inbox" || args[0] == "get_bookmarks" || args[0] == "get_notifications") { // Doesn't need a target, so create a fake second arg @@ -203,8 +203,6 @@ func main() { follow_user(target, true) case "unfollow": follow_user(target, false) - case "list_followed": - list_followed() case "like_tweet": like_tweet(target) case "unlike_tweet": @@ -558,12 +556,6 @@ func like_tweet(tweet_identifier string) { happy_exit("Liked the tweet.", nil) } -func list_followed() { - for _, handle := range profile.GetAllFollowedUsers() { - fmt.Println(handle) - } -} - func start_webserver(addr string, should_auto_open bool) { app := webserver.NewApp(profile) if api.UserHandle != "" { diff --git a/pkg/persistence/user_queries.go b/pkg/persistence/user_queries.go index 8c9238a..d2a50a3 100644 --- a/pkg/persistence/user_queries.go +++ b/pkg/persistence/user_queries.go @@ -73,28 +73,6 @@ func (p Profile) SaveUser(u *scraper.User) error { return nil } -// Check if the database has a User with the given user handle. -// -// args: -// - handle: the user handle to search for -// -// returns: -// - true if there is such a User in the database, false otherwise -func (p Profile) UserExists(handle scraper.UserHandle) bool { - db := p.DB - - var dummy string - err := db.QueryRow("select 1 from users where lower(handle) = lower(?)", handle).Scan(&dummy) - if err != nil { - if !errors.Is(err, sql.ErrNoRows) { - // A real error - panic(err) - } - return false - } - return true -} - // Retrieve a User from the database, by handle. // // args: @@ -212,28 +190,8 @@ func (p Profile) NextFakeUserID() scraper.UserID { return ret } -func (p Profile) GetAllFollowedUsers() []scraper.UserHandle { - rows, err := p.DB.Query("select handle from users where is_followed = 1") - if err != nil { - panic(err) - } - defer rows.Close() - - ret := []scraper.UserHandle{} - - var tmp scraper.UserHandle - - for rows.Next() { - err = rows.Scan(&tmp) - if err != nil { - panic(err) - } - ret = append(ret, tmp) - } - - return ret -} - +// TODO: This is only used in checking whether the media downloader should get the big or small version of +// a profile image. That should be rewritten func (p Profile) IsFollowing(user scraper.User) bool { row := p.DB.QueryRow("select is_followed from users where id like ?", user.ID) var ret bool diff --git a/pkg/persistence/user_queries_test.go b/pkg/persistence/user_queries_test.go index bec97fb..c3232e5 100644 --- a/pkg/persistence/user_queries_test.go +++ b/pkg/persistence/user_queries_test.go @@ -112,24 +112,6 @@ func TestHandleIsCaseInsensitive(t *testing.T) { } } -// Should correctly report whether the user exists in the database -func TestUserExists(t *testing.T) { - require := require.New(t) - profile_path := "test_profiles/TestUserQueries" - profile := create_or_load_profile(profile_path) - - user := create_dummy_user() - - exists := profile.UserExists(user.Handle) - require.False(exists) - - err := profile.SaveUser(&user) - require.NoError(err) - - exists = profile.UserExists(user.Handle) - require.True(exists) -} - // Test scenarios relating to user content downloading func TestCheckUserContentDownloadNeeded(t *testing.T) { assert := assert.New(t)