mastodon/status.go

@@ -258,7 +258,7 @@ func (c *Client) TrueRemoteTimeline(ctx context.Context, instance string, instan
 	var publicstatuses []*Status
 	var instanceParams []string
 	instanceParams = strings.Split(instance, ":")[1:]
-	instance = strings.TrimSpace(strings.Split(instance, ":")[0])
+	instance = strings.Split(instance, ":")[0]
 	params := url.Values{}
 	params.Set("local", "true")
 
@@ -269,8 +269,8 @@ func (c *Client) TrueRemoteTimeline(ctx context.Context, instance string, instan
 	perform := url.URL{
 	    Scheme:     "https",  
 	    Host:       instance,
+	    RawQuery:   params.Encode(),
 	}
-	var paramval []string
 	withFiles := "false"
 	withReplies := "false"
 	globalTimeline := false
@@ -285,12 +285,7 @@ func (c *Client) TrueRemoteTimeline(ctx context.Context, instance string, instan
 			globalTimeline = true
 			params.Set(instanceParam, "true")
 		default:
-			paramval = strings.Split(instanceParam, "=") 
-			if len(paramval) == 2 {
-				params.Set(paramval[0], paramval[1])
-			} else {
-				params.Set(instanceParam, "true")
-			}
+			params.Set(instanceParam, "true")
 		}
 	}
 
@@ -318,10 +313,6 @@ func (c *Client) TrueRemoteTimeline(ctx context.Context, instance string, instan
 			} 
 		}
 	default:
-		if globalTimeline {
-			params.Set("local", "false")
-		}
-	    	perform.RawQuery = params.Encode()
 	    	perform.Path = "api/v1/timelines/public"
 		method = http.MethodGet
 		ContentType = "application/x-www-form-urlencoded"