me/offline-twitter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the unauthenticated GetUser requests as they no longer work

Browse Source
This commit is contained in:
Alessio 2024-11-06 18:36:06 -08:00
parent 4d81b8d879
commit 2b7a636720
6 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/twitter/main.go
View File

@ -285,7 +285,7 @@ func create_profile(target_dir string) {
} }
func _fetch_user_by_id(id scraper.UserID) error { func _fetch_user_by_id(id scraper.UserID) error {
user, err := scraper.GetUserByID(id) user, err := api.GetUserByID(id)
if errors.Is(err, scraper.ErrDoesntExist) { if errors.Is(err, scraper.ErrDoesntExist) {
// Mark them as deleted. // Mark them as deleted.
// Handle and display name won't be updated if the user exists. // Handle and display name won't be updated if the user exists.
@ -318,7 +318,7 @@ func _fetch_user_by_id(id scraper.UserID) error {
} }
func fetch_user(handle scraper.UserHandle) { func fetch_user(handle scraper.UserHandle) {
user, err := scraper.GetUser(handle) user, err := api.GetUser(handle)
if errors.Is(err, scraper.ErrDoesntExist) { if errors.Is(err, scraper.ErrDoesntExist) {
// There's several reasons we could get a ErrDoesntExist: // There's several reasons we could get a ErrDoesntExist:
// 1. account never existed (user made a CLI typo) // 1. account never existed (user made a CLI typo)

2
internal/webserver/handler_login.go
View File

@ -69,7 +69,7 @@ func (app *Application) after_login(w http.ResponseWriter, r *http.Request, api
app.Profile.SaveSession(api) app.Profile.SaveSession(api)
// Ensure the user is downloaded // Ensure the user is downloaded
user, err := scraper.GetUser(api.UserHandle) user, err := api.GetUser(api.UserHandle)
if err != nil { // ErrDoesntExist or otherwise if err != nil { // ErrDoesntExist or otherwise
app.error_404(w, r) app.error_404(w, r)
return return

2
internal/webserver/handler_user_feed.go
View File

@ -18,7 +18,7 @@ func (app *Application) UserFeed(w http.ResponseWriter, r *http.Request) {
user, err := app.Profile.GetUserByHandle(scraper.UserHandle(parts[0])) user, err := app.Profile.GetUserByHandle(scraper.UserHandle(parts[0]))
if errors.Is(err, persistence.ErrNotInDatabase) { if errors.Is(err, persistence.ErrNotInDatabase) {
if !app.IsScrapingDisabled { if !app.IsScrapingDisabled {
user, err = scraper.GetUser(scraper.UserHandle(parts[0])) user, err = app.API.GetUser(scraper.UserHandle(parts[0]))
} }
if err != nil { // ErrDoesntExist or otherwise if err != nil { // ErrDoesntExist or otherwise
app.error_404(w, r) app.error_404(w, r)

2
pkg/persistence/tweet_trove_queries.go
View File

@ -22,7 +22,7 @@ func (p Profile) SaveTweetTrove(trove TweetTrove, should_download bool, api *API
"Conflicting user handle found (ID %d); old user has been marked deleted. Rescraping them\n", "Conflicting user handle found (ID %d); old user has been marked deleted. Rescraping them\n",
conflict_err.ConflictingUserID, conflict_err.ConflictingUserID,
) )
user, err := GetUserByID(conflict_err.ConflictingUserID) user, err := api.GetUserByID(conflict_err.ConflictingUserID)
if errors.Is(err, ErrDoesntExist) { if errors.Is(err, ErrDoesntExist) {
// Mark them as deleted. // Mark them as deleted.
// Handle and display name won't be updated if the user exists. // Handle and display name won't be updated if the user exists.

6
pkg/scraper/tweet_trove.go
View File

@ -90,7 +90,7 @@ func (t1 *TweetTrove) MergeWith(t2 TweetTrove) {
/** /**
* Tries to fetch every User that's been identified in a tombstone in this trove * Tries to fetch every User that's been identified in a tombstone in this trove
*/ */
func (trove *TweetTrove) FetchTombstoneUsers() { func (trove *TweetTrove) FetchTombstoneUsers(api *API) {
for _, handle := range trove.TombstoneUsers { for _, handle := range trove.TombstoneUsers {
// Skip fetching if this user is already in the trove // Skip fetching if this user is already in the trove
user, already_fetched := trove.FindUserByHandle(handle) user, already_fetched := trove.FindUserByHandle(handle)
@ -110,7 +110,7 @@ func (trove *TweetTrove) FetchTombstoneUsers() {
} }
log.Debug("Getting tombstone user: " + handle) log.Debug("Getting tombstone user: " + handle)
user, err := GetUser(handle) user, err := api.GetUser(handle)
if errors.Is(err, ErrDoesntExist) { if errors.Is(err, ErrDoesntExist) {
user = GetUnknownUserWithHandle(handle) user = GetUnknownUserWithHandle(handle)
user.IsDeleted = true user.IsDeleted = true
@ -187,7 +187,7 @@ func (trove *TweetTrove) FillSpaceDetails(api *API) error {
} }
func (trove *TweetTrove) PostProcess(api *API) error { func (trove *TweetTrove) PostProcess(api *API) error {
trove.FetchTombstoneUsers() trove.FetchTombstoneUsers(api)
trove.FillMissingUserIDs() trove.FillMissingUserIDs()
err := trove.FillSpaceDetails(api) err := trove.FillSpaceDetails(api)
if err != nil { if err != nil {

18
pkg/scraper/user.go
View File

@ -173,24 +173,6 @@ func ParseSingleUser(apiUser APIUser) (ret User, err error) {
return return
} }
// Calls API#GetUser and returns the parsed result
func GetUser(handle UserHandle) (User, error) {
session, err := NewGuestSession() // This endpoint works better if you're not logged in
if err != nil {
return User{}, err
}
return session.GetUser(handle)
}
// Calls API#GetUserByID and returns the parsed result
func GetUserByID(u_id UserID) (User, error) {
session, err := NewGuestSession() // This endpoint works better if you're not logged in
if err != nil {
return User{}, err
}
return session.GetUserByID(u_id)
}
/** /**
* Make a filename for the profile image, that hopefully won't clobber other ones * Make a filename for the profile image, that hopefully won't clobber other ones
*/ */