Add user search

This commit is contained in:
Alessio 2023-08-11 02:08:04 -03:00
parent 00e92165f2
commit c3d52348fc
2 changed files with 67 additions and 36 deletions

View File

@ -32,30 +32,30 @@ func (p Profile) SaveUser(u *scraper.User) error {
}
_, err := p.DB.NamedExec(`
insert into users (id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private,
is_verified, is_banned, profile_image_url, profile_image_local_path, banner_image_url, banner_image_local_path,
pinned_tweet_id, is_content_downloaded, is_id_fake)
values (:id, :display_name, :handle, :bio, :following_count, :followers_count, :location, :website, :join_date, :is_private,
:is_verified, :is_banned, :profile_image_url, :profile_image_local_path, :banner_image_url, :banner_image_local_path,
:pinned_tweet_id, :is_content_downloaded, :is_id_fake)
on conflict do update
set handle=:handle,
bio=:bio,
display_name=:display_name,
following_count=:following_count,
followers_count=:followers_count,
location=:location,
website=:website,
is_private=:is_private,
is_verified=:is_verified,
is_banned=:is_banned,
profile_image_url=:profile_image_url,
profile_image_local_path=:profile_image_local_path,
banner_image_url=:banner_image_url,
banner_image_local_path=:banner_image_local_path,
pinned_tweet_id=:pinned_tweet_id,
is_content_downloaded=(is_content_downloaded or :is_content_downloaded)
`,
insert into users (id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private,
is_verified, is_banned, profile_image_url, profile_image_local_path, banner_image_url, banner_image_local_path,
pinned_tweet_id, is_content_downloaded, is_id_fake)
values (:id, :display_name, :handle, :bio, :following_count, :followers_count, :location, :website, :join_date, :is_private,
:is_verified, :is_banned, :profile_image_url, :profile_image_local_path, :banner_image_url, :banner_image_local_path,
:pinned_tweet_id, :is_content_downloaded, :is_id_fake)
on conflict do update
set handle=:handle,
bio=:bio,
display_name=:display_name,
following_count=:following_count,
followers_count=:followers_count,
location=:location,
website=:website,
is_private=:is_private,
is_verified=:is_verified,
is_banned=:is_banned,
profile_image_url=:profile_image_url,
profile_image_local_path=:profile_image_local_path,
banner_image_url=:banner_image_url,
banner_image_local_path=:banner_image_local_path,
pinned_tweet_id=:pinned_tweet_id,
is_content_downloaded=(is_content_downloaded or :is_content_downloaded)
`,
u,
)
if err != nil {
@ -99,12 +99,12 @@ func (p Profile) GetUserByHandle(handle scraper.UserHandle) (scraper.User, error
var ret scraper.User
err := db.Get(&ret, `
select id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private, is_verified,
is_banned, 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 lower(handle) = lower(?)
`, handle)
select id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private, is_verified,
is_banned, 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 lower(handle) = lower(?)
`, handle)
if errors.Is(err, sql.ErrNoRows) {
return ret, ErrNotInDatabase{"User", handle}
@ -125,12 +125,12 @@ func (p Profile) GetUserByID(id scraper.UserID) (scraper.User, error) {
var ret scraper.User
err := db.Get(&ret, `
select id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private, is_verified,
is_banned, 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 id = ?
`, id)
select id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private, is_verified,
is_banned, 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 id = ?
`, id)
if errors.Is(err, sql.ErrNoRows) {
return ret, ErrNotInDatabase{"User", id}
}
@ -254,3 +254,22 @@ func (p Profile) get_profile_image_output_path(u scraper.User) string {
}
return path.Join(p.ProfileDir, "profile_images", u.ProfileImageLocalPath)
}
// Do a text search for users
func (p Profile) SearchUsers(s string) []scraper.User {
var ret []scraper.User
val := fmt.Sprintf("%%%s%%", s)
err := p.DB.Select(&ret, `
select id, display_name, handle, bio, following_count, followers_count, location, website, join_date, is_private, is_verified,
is_banned, 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 handle like ?
or display_name like ?
order by followers_count desc
`, val, val)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
panic(err)
}
return ret
}

View File

@ -296,3 +296,15 @@ func TestCreateUnknownUserWithHandleThatAlreadyExists(t *testing.T) {
assert.Equal(user.Bio, user_reloaded.Bio)
assert.Equal(user.DisplayName, user_reloaded.DisplayName)
}
func TestSearchUsers(t *testing.T) {
assert := assert.New(t)
profile_path := "../../sample_data/profile"
profile := create_or_load_profile(profile_path)
users := profile.SearchUsers("no")
assert.Len(users, 2)
assert.Equal(users[0].Handle, scraper.UserHandle("Cernovich"))
assert.Equal(users[1].Handle, scraper.UserHandle("CovfefeAnon"))
}