CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Parameter cleanup

Browse source
This commit is contained in:
Matthew Burnett 2019-01-27 01:13:45 -05:00
parent 6055f8762c
commit a1f12bd0c1
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ShareX.UploadersLib/ImageUploaders/GooglePhotos.cs
View file

@ -108,7 +108,7 @@ public GooglePhotosAlbum CreateAlbum(string albumName)
}; };
string serializedNewItemAlbum = JsonConvert.SerializeObject(newItemAlbum); 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<GooglePhotosAlbum>(serializedNewItemAlbumResponse); GooglePhotosAlbum newItemAlbumResponse = JsonConvert.DeserializeObject<GooglePhotosAlbum>(serializedNewItemAlbumResponse);
return newItemAlbumResponse; return newItemAlbumResponse;
@ -120,7 +120,7 @@ public List<GooglePhotosAlbumInfo> GetAlbumList()
List<GooglePhotosAlbumInfo> albumList = new List<GooglePhotosAlbumInfo>(); List<GooglePhotosAlbumInfo> albumList = new List<GooglePhotosAlbumInfo>();
Dictionary<string, string> args = new Dictionary<string, string> Dictionary<string, string> albumListArgs = new Dictionary<string, string>
{ {
{ "excludeNonAppCreatedData", "true" }, { "excludeNonAppCreatedData", "true" },
{ "fields", "albums(id,title,shareInfo),nextPageToken" } { "fields", "albums(id,title,shareInfo),nextPageToken" }
@ -130,8 +130,8 @@ public List<GooglePhotosAlbumInfo> GetAlbumList()
do do
{ {
args["pageToken"] = pageToken; albumListArgs["pageToken"] = pageToken;
string response = SendRequest(HttpMethod.GET, "https://photoslibrary.googleapis.com/v1/albums", args, headers: GoogleAuth.GetAuthHeaders()); string response = SendRequest(HttpMethod.GET, "https://photoslibrary.googleapis.com/v1/albums", albumListArgs, GoogleAuth.GetAuthHeaders());
pageToken = ""; pageToken = "";
if (!string.IsNullOrEmpty(response)) if (!string.IsNullOrEmpty(response))
@ -180,7 +180,7 @@ public override UploadResult Upload(Stream stream, string fileName)
GooglePhotosAlbumOptions albumOptions = new GooglePhotosAlbumOptions(); GooglePhotosAlbumOptions albumOptions = new GooglePhotosAlbumOptions();
string serializedAlbumOptions = JsonConvert.SerializeObject(albumOptions); 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<GooglePhotosAlbumOptionsResponse>(serializedAlbumOptionsResponse); GooglePhotosAlbumOptionsResponse albumOptionsResponse = JsonConvert.DeserializeObject<GooglePhotosAlbumOptionsResponse>(serializedAlbumOptionsResponse);
result.URL = albumOptionsResponse.shareInfo.shareableUrl; result.URL = albumOptionsResponse.shareInfo.shareableUrl;
@ -193,7 +193,7 @@ public override UploadResult Upload(Stream stream, string fileName)
{ "Authorization", GoogleAuth.GetAuthHeaders()["Authorization"] } { "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 GooglePhotosNewMediaItemRequest newMediaItemRequest = new GooglePhotosNewMediaItemRequest
{ {
@ -217,7 +217,7 @@ public override UploadResult Upload(Stream stream, string fileName)
string serializedNewMediaItemRequest = JsonConvert.SerializeObject(newMediaItemRequest); 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<GooglePhotosNewMediaItemResults>(result.Response); GooglePhotosNewMediaItemResults newMediaItemResult = JsonConvert.DeserializeObject<GooglePhotosNewMediaItemResults>(result.Response);

8
ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs
View file

@ -91,7 +91,7 @@ public override UploadResult ShortenURL(string url)
{ {
UploadResult result = new UploadResult { URL = url }; UploadResult result = new UploadResult { URL = url };
FirebaseRequest request = new FirebaseRequest FirebaseRequest requestOptions = new FirebaseRequest
{ {
dynamicLinkInfo = new DynamicLinkInfo dynamicLinkInfo = new DynamicLinkInfo
{ {
@ -102,7 +102,7 @@ public override UploadResult ShortenURL(string url)
if (IsShort) if (IsShort)
{ {
request.suffix = new FirebaseSuffix requestOptions.suffix = new FirebaseSuffix
{ {
option = "SHORT" option = "SHORT"
}; };
@ -114,8 +114,8 @@ public override UploadResult ShortenURL(string url)
{ "fields", "shortLink" } { "fields", "shortLink" }
}; };
string requestjson = JsonConvert.SerializeObject(request); string serializedRequestOptions = JsonConvert.SerializeObject(requestOptions);
result.Response = SendRequest(HttpMethod.POST, "https://firebasedynamiclinks.googleapis.com/v1/shortLinks", requestjson, UploadHelpers.ContentTypeJSON, args); result.Response = SendRequest(HttpMethod.POST, "https://firebasedynamiclinks.googleapis.com/v1/shortLinks", serializedRequestOptions, UploadHelpers.ContentTypeJSON, args);
FirebaseResponse firebaseResponse = JsonConvert.DeserializeObject<FirebaseResponse>(result.Response); FirebaseResponse firebaseResponse = JsonConvert.DeserializeObject<FirebaseResponse>(result.Response);