more naming refactors

1 files changed, 14 insertions, 14 deletions

diff --git a/backend/fetchers/app.bsky.feed.go b/backend/fetchers/app.bsky.feed.go
index abc3b46..10c08e7 100644
--- a/backend/fetchers/app.bsky.feed.go
+++ b/backend/fetchers/app.bsky.feed.go
@@ -10,10 +10,10 @@ import (
 
 func FetchAppBskyFeedPosts(logger *slog.Logger, did, pdsURL, slingshotURL string, cache *Cache) ([]notes.Note, error) {
 	// get author of the note
-	profile, found := cache.GetProfile(did)
+	author, found := cache.GetProfile(did)
 	var err error
 	if !found {
-		profile, err = FetchProfile(logger, did, pdsURL, slingshotURL, cache)
+		author, err = FetchAppBskyActorProfile(logger, did, pdsURL, slingshotURL, cache)
 	}
 	if err != nil {
 		return nil, err
@@ -21,20 +21,20 @@ func FetchAppBskyFeedPosts(logger *slog.Logger, did, pdsURL, slingshotURL string
 
 	// try slingshot first if given
 	if slingshotURL != "" {
-		values, err := general.FetchRawRecordCollection(logger, did, "app.bsky.feed.post", slingshotURL)
+		records, err := general.FetchRawRecordCollection(logger, did, "app.bsky.feed.post", slingshotURL)
 		if err != nil {
 			logger.Error("Fetching from slingshot failed")
 		} else {
-			return parseAppBskyFeedPostCollection(logger, values, profile, cache)
+			return parseAppBskyFeedPostCollection(logger, records, author, cache)
 		}
 	}
 
-	values, err := general.FetchRawRecordCollection(logger, did, "app.bsky.feed.post", pdsURL)
+	records, err := general.FetchRawRecordCollection(logger, did, "app.bsky.feed.post", pdsURL)
 	if err != nil {
 		return nil, err
 	}
 
-	return parseAppBskyFeedPostCollection(logger, values, profile, cache)
+	return parseAppBskyFeedPostCollection(logger, records, author, cache)
 }
 
 func FetchAppBskyFeedPostByURI(logger *slog.Logger, uri, slingshotURL string, cache *Cache) (*notes.Note, error) {
@@ -52,9 +52,9 @@ func FetchAppBskyFeedPostByURI(logger *slog.Logger, uri, slingshotURL string, ca
 	}
 
 	// get author of the note
-	profile, found := cache.GetProfile(repo)
+	author, found := cache.GetProfile(repo)
 	if !found {
-		profile, err = FetchProfile(logger, repo, pdsURL, slingshotURL, cache)
+		author, err = FetchAppBskyActorProfile(logger, repo, pdsURL, slingshotURL, cache)
 	}
 	if err != nil {
 		return nil, err
@@ -66,7 +66,7 @@ func FetchAppBskyFeedPostByURI(logger *slog.Logger, uri, slingshotURL string, ca
 		if err != nil {
 			logger.Error("fetching from slingshot failed", "error", err)
 		} else {
-			return parseAppBskyFeedPostRecord(rawRecord, profile, cache)
+			return parseAppBskyFeedPostRecord(rawRecord, author, cache)
 		}
 	}
 
@@ -76,10 +76,10 @@ func FetchAppBskyFeedPostByURI(logger *slog.Logger, uri, slingshotURL string, ca
 		return nil, err
 	}
 
-	return parseAppBskyFeedPostRecord(rawRecord, profile, cache)
+	return parseAppBskyFeedPostRecord(rawRecord, author, cache)
 }
 
-func parseAppBskyFeedPostRecord(rawRecord *general.RawRecord, profile *general.Profile, cache *Cache) (*notes.Note, error) {
+func parseAppBskyFeedPostRecord(rawRecord *general.RawRecord, author *notes.Author, cache *Cache) (*notes.Note, error) {
 	if rawRecord == nil {
 		return nil, fmt.Errorf("unable to parse nil record")
 	}
@@ -92,7 +92,7 @@ func parseAppBskyFeedPostRecord(rawRecord *general.RawRecord, profile *general.P
 		return nil, err
 	}
 
-	note, err := notes.NoteFromAppBskyFeedPostRecord(record, profile)
+	note, err := notes.NoteFromAppBskyFeedPostRecord(record, author)
 	if err != nil {
 		return nil, err
 	}
@@ -103,10 +103,10 @@ func parseAppBskyFeedPostRecord(rawRecord *general.RawRecord, profile *general.P
 	return note, nil
 }
 
-func parseAppBskyFeedPostCollection(logger *slog.Logger, records []general.RawRecord, profile *general.Profile, cache *Cache) ([]notes.Note, error) {
+func parseAppBskyFeedPostCollection(logger *slog.Logger, records []general.RawRecord, author *notes.Author, cache *Cache) ([]notes.Note, error) {
 	posts := make([]notes.Note, 0, len(records))
 	for _, record := range records {
-		note, err := parseAppBskyFeedPostRecord(&record, profile, cache)
+		note, err := parseAppBskyFeedPostRecord(&record, author, cache)
 		if err != nil {
 			logger.Error("failed to parse post record", "error", err)
 			continue