From 97f54533781139407f7d33aa0bdb80d0bf3264f6 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:24:55 +0100 Subject: [chore] Tidy up some of the search logic (#1082) * start refactoring some of the search + deref logic * add tests for search api * rename GetRemoteAccount + GetRemoteStatus * make search function a bit simpler + clearer * fix little fucky wucky uwu owo i'm just a little guy * update faulty switch statements * update test to use storage struct * redo switches for clarity * reduce repeated logic in search tests * fastfail getstatus by uri * debug log + trace log better * add implementation note * return early if no result for namestring search * return + check on dereferencing error types * errors hah what errors * remove unneeded error type alias, add custom error text during stringification itself * fix a woops recursion :see_no_evil: Signed-off-by: kim Co-authored-by: kim --- internal/federation/dereferencing/thread.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/federation/dereferencing/thread.go') diff --git a/internal/federation/dereferencing/thread.go b/internal/federation/dereferencing/thread.go index 34955cee8..15829c45a 100644 --- a/internal/federation/dereferencing/thread.go +++ b/internal/federation/dereferencing/thread.go @@ -114,7 +114,7 @@ func (d *deref) dereferenceStatusAncestors(ctx context.Context, username string, l.Tracef("following remote status ancestors: %s", status.InReplyToURI) // Fetch the remote status found at this IRI - remoteStatus, _, err := d.GetRemoteStatus(ctx, username, replyIRI, false, false) + remoteStatus, _, err := d.GetStatus(ctx, username, replyIRI, false, false) if err != nil { return fmt.Errorf("error fetching remote status %q: %w", status.InReplyToURI, err) } @@ -276,7 +276,7 @@ stackLoop: } // Dereference the remote status and store in the database - _, statusable, err := d.GetRemoteStatus(ctx, username, itemIRI, true, false) + _, statusable, err := d.GetStatus(ctx, username, itemIRI, true, false) if err != nil { l.Errorf("error dereferencing remote status %q: %s", itemIRI.String(), err) continue itemLoop -- cgit v1.2.3