From 6b10b049c4ac468965fde72c716ec5fe75d673bd Mon Sep 17 00:00:00 2001 From: Taylor Monacelli Date: Wed, 7 Aug 2024 10:19:59 -0700 Subject: [PATCH] Optimize --- core/links/google.go | 64 +++++++++++++++++++-------------------- core/links/google_test.go | 5 +++ 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/core/links/google.go b/core/links/google.go index 6bfaefa..5e5a452 100644 --- a/core/links/google.go +++ b/core/links/google.go @@ -18,6 +18,37 @@ var excludeParams = []string{ "tbm", } +var ParamsToRemove = []string{ + "bih", + "biw", + "client", + "dpr", + "ei", + "fbs", + "gs_lcp", + "gs_lcrp", + "gs_lp", + "gs_ssp", + "hl", + "ictx", + "ie", + "oq", + "prmd", + "sa", + "sca_esv", + "sca_upv", + "sclient", + "source", + "sourceid", + "spell", + "sqi", + "sxsrf", + "uact", + // "udm", // keep image search links in tact + "uds", + "ved", +} + func RemoveParamsFromGoogleURLs(r io.Reader, w io.Writer) error { buf, err := io.ReadAll(r) if err != nil { @@ -76,41 +107,10 @@ func cleanGoogleURL(urlStr string) (string, []string, error) { q := u.Query() - paramsToRemove := []string{ - "bih", - "biw", - "client", - "dpr", - "ei", - "fbs", - "gs_lcp", - "gs_lcrp", - "gs_lp", - "gs_ssp", - "hl", - "ictx", - "ie", - "oq", - "prmd", - "sa", - "sca_esv", - "sca_upv", - "sclient", - "source", - "sourceid", - "spell", - "sqi", - "sxsrf", - "uact", - // "udm", // keep image search links in tact - "uds", - "ved", - } - var remainingParams []string for param := range q { - if contains(excludeParams, param) || !contains(paramsToRemove, param) { + if contains(excludeParams, param) || !contains(ParamsToRemove, param) { remainingParams = append(remainingParams, param) continue } diff --git a/core/links/google_test.go b/core/links/google_test.go index b18d5dc..b032a36 100644 --- a/core/links/google_test.go +++ b/core/links/google_test.go @@ -19,6 +19,11 @@ func TestRemoveParamsFromGoogleLinks(t *testing.T) { input: "https://www.google.com/search?q=test&bih=722&biw=1536&hl=en&sxsrf=ABC123", expected: "https://www.google.com/search?q=test", }, + { + name: "Google image search", + input: "https://www.google.com/search?udm=2&q=skiing", + expected: "https://www.google.com/search?q=skiing&udm=2", + }, { name: "Google link without parameters", input: "https://www.google.com",