diff --git a/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs b/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs index 743032d17..ef0cff55f 100644 --- a/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs +++ b/ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs @@ -108,7 +108,7 @@ public GooglePhotosAlbum CreateAlbum(string albumName) }; string serializedNewItemAlbum = JsonConvert.SerializeObject(newItemAlbum); - string serializedNewItemAlbumResponse = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/albums", serializedNewItemAlbum, args: newItemAlbumArgs, headers: GoogleAuth.GetAuthHeaders(), contentType: UploadHelpers.ContentTypeJSON); + string serializedNewItemAlbumResponse = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/albums", serializedNewItemAlbum, UploadHelpers.ContentTypeJSON, newItemAlbumArgs, GoogleAuth.GetAuthHeaders()); GooglePhotosAlbum newItemAlbumResponse = JsonConvert.DeserializeObject(serializedNewItemAlbumResponse); return newItemAlbumResponse; @@ -120,7 +120,7 @@ public List GetAlbumList() List albumList = new List(); - Dictionary args = new Dictionary + Dictionary albumListArgs = new Dictionary { { "excludeNonAppCreatedData", "true" }, { "fields", "albums(id,title,shareInfo),nextPageToken" } @@ -130,8 +130,8 @@ public List GetAlbumList() do { - args["pageToken"] = pageToken; - string response = SendRequest(HttpMethod.GET, "https://photoslibrary.googleapis.com/v1/albums", args, headers: GoogleAuth.GetAuthHeaders()); + albumListArgs["pageToken"] = pageToken; + string response = SendRequest(HttpMethod.GET, "https://photoslibrary.googleapis.com/v1/albums", albumListArgs, GoogleAuth.GetAuthHeaders()); pageToken = ""; if (!string.IsNullOrEmpty(response)) @@ -180,7 +180,7 @@ public override UploadResult Upload(Stream stream, string fileName) GooglePhotosAlbumOptions albumOptions = new GooglePhotosAlbumOptions(); string serializedAlbumOptions = JsonConvert.SerializeObject(albumOptions); - string serializedAlbumOptionsResponse = SendRequest(HttpMethod.POST, $"https://photoslibrary.googleapis.com/v1/albums/{AlbumID}:share", args: albumOptionsResponseArgs, content: serializedAlbumOptions, headers: GoogleAuth.GetAuthHeaders(), contentType: UploadHelpers.ContentTypeJSON); + string serializedAlbumOptionsResponse = SendRequest(HttpMethod.POST, $"https://photoslibrary.googleapis.com/v1/albums/{AlbumID}:share", serializedAlbumOptions, UploadHelpers.ContentTypeJSON, albumOptionsResponseArgs, GoogleAuth.GetAuthHeaders()); GooglePhotosAlbumOptionsResponse albumOptionsResponse = JsonConvert.DeserializeObject(serializedAlbumOptionsResponse); result.URL = albumOptionsResponse.shareInfo.shareableUrl; @@ -193,7 +193,7 @@ public override UploadResult Upload(Stream stream, string fileName) { "Authorization", GoogleAuth.GetAuthHeaders()["Authorization"] } }; - string uploadToken = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/uploads", stream, contentType: UploadHelpers.ContentTypeOctetStream, headers: uploadTokenHeaders); + string uploadToken = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/uploads", stream, UploadHelpers.ContentTypeOctetStream, null, uploadTokenHeaders); GooglePhotosNewMediaItemRequest newMediaItemRequest = new GooglePhotosNewMediaItemRequest { @@ -217,7 +217,7 @@ public override UploadResult Upload(Stream stream, string fileName) string serializedNewMediaItemRequest = JsonConvert.SerializeObject(newMediaItemRequest); - result.Response = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/mediaItems:batchCreate", serializedNewMediaItemRequest, args: newMediaItemRequestArgs, headers: GoogleAuth.GetAuthHeaders(), contentType: UploadHelpers.ContentTypeJSON); + result.Response = SendRequest(HttpMethod.POST, "https://photoslibrary.googleapis.com/v1/mediaItems:batchCreate", serializedNewMediaItemRequest, UploadHelpers.ContentTypeJSON, newMediaItemRequestArgs, GoogleAuth.GetAuthHeaders()); GooglePhotosNewMediaItemResults newMediaItemResult = JsonConvert.DeserializeObject(result.Response); diff --git a/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs b/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs index 99033020c..201f38cfe 100644 --- a/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs @@ -91,7 +91,7 @@ public override UploadResult ShortenURL(string url) { UploadResult result = new UploadResult { URL = url }; - FirebaseRequest request = new FirebaseRequest + FirebaseRequest requestOptions = new FirebaseRequest { dynamicLinkInfo = new DynamicLinkInfo { @@ -102,7 +102,7 @@ public override UploadResult ShortenURL(string url) if (IsShort) { - request.suffix = new FirebaseSuffix + requestOptions.suffix = new FirebaseSuffix { option = "SHORT" }; @@ -114,8 +114,8 @@ public override UploadResult ShortenURL(string url) { "fields", "shortLink" } }; - string requestjson = JsonConvert.SerializeObject(request); - result.Response = SendRequest(HttpMethod.POST, "https://firebasedynamiclinks.googleapis.com/v1/shortLinks", requestjson, UploadHelpers.ContentTypeJSON, args); + string serializedRequestOptions = JsonConvert.SerializeObject(requestOptions); + result.Response = SendRequest(HttpMethod.POST, "https://firebasedynamiclinks.googleapis.com/v1/shortLinks", serializedRequestOptions, UploadHelpers.ContentTypeJSON, args); FirebaseResponse firebaseResponse = JsonConvert.DeserializeObject(result.Response);