From 56f7fb3d4e2ce7780ca581c1737d1f279e0855b7 Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Fri, 22 Mar 2024 00:50:23 -0500
Subject: [PATCH] modify google api

---
 .../Google/Models/GoogleVideoResult.cs                    | 8 ++++++++
 .../Google/Settings/GoogleApiSettings.cs                  | 2 --
 .../BotSharp.OpenAPI/Controllers/GoogleController.cs      | 8 ++++----
 src/WebStarter/appsettings.json                           | 2 --
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Infrastructure/BotSharp.Abstraction/Google/Models/GoogleVideoResult.cs b/src/Infrastructure/BotSharp.Abstraction/Google/Models/GoogleVideoResult.cs
index dc2da596..750e0541 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Google/Models/GoogleVideoResult.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Google/Models/GoogleVideoResult.cs
@@ -12,10 +12,18 @@ public class VideoItem
     [JsonPropertyName("etag")]
     public string Etag { get; set; }
     public VideoItemId Id { get; set; }
+    public VideoSnippet Snippet { get; set; }
 }
 
 public class VideoItemId
 {
     public string Kind { get; set; }
     public string VideoId { get; set; }
+}
+
+public class VideoSnippet
+{
+    public string Title { get; set; }
+    public string Description { get; set; }
+    public string ChannelTitle { get; set; }
 }
\ No newline at end of file
diff --git a/src/Infrastructure/BotSharp.Abstraction/Google/Settings/GoogleApiSettings.cs b/src/Infrastructure/BotSharp.Abstraction/Google/Settings/GoogleApiSettings.cs
index 0739550c..be7ef6a2 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Google/Settings/GoogleApiSettings.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Google/Settings/GoogleApiSettings.cs
@@ -11,7 +11,6 @@ public class GoogleApiSettings
 public class MapSettings
 {
     public string Endpoint { get; set; }
-    public string Language { get; set; }
     public string Components { get; set; }
 }
 
@@ -20,5 +19,4 @@ public class YoutubeSettings
     public string Endpoint { get; set; }
     public string Part { get; set; }
     public string RegionCode { get; set; }
-    public string Language { get; set; }
 }
\ No newline at end of file
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/GoogleController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/GoogleController.cs
index 7f3b851a..13faeb2d 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/Controllers/GoogleController.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/Controllers/GoogleController.cs
@@ -23,7 +23,7 @@ public class GoogleController : ControllerBase
     }
 
     [HttpGet("/address/options")]
-    public async Task<GoogleAddressResult> GetAddressOptions([FromQuery] string address)
+    public async Task<GoogleAddressResult> GetAddressOptions([FromQuery] string address, [FromQuery] string language = "en")
     {
         var result = new GoogleAddressResult();
 
@@ -33,7 +33,7 @@ public class GoogleController : ControllerBase
             using var client = _httpClientFactory.CreateClient();
             var url = $"{settings.Map.Endpoint}?key={settings.ApiKey}&" +
                 $"components={settings.Map.Components}&" +
-                $"language={settings.Map.Language}&" +
+                $"language={language}&" +
                 $"address={address}";
 
             var response = await client.GetAsync(url);
@@ -49,7 +49,7 @@ public class GoogleController : ControllerBase
     }
 
     [HttpGet("/video/options")]
-    public async Task<GoogleVideoResult> GetVideoOptions([FromQuery] string query, [FromQuery] int? maxResults)
+    public async Task<GoogleVideoResult> GetVideoOptions([FromQuery] string query, [FromQuery] int? maxResults, [FromQuery] string language = "en")
     {
         var result = new GoogleVideoResult();
 
@@ -59,7 +59,7 @@ public class GoogleController : ControllerBase
             using var client = _httpClientFactory.CreateClient();
             var url = $"{settings.Youtube.Endpoint}?key={settings.ApiKey}&" +
                 $"part={settings.Youtube.Part}&" +
-                $"relevanceLanguage={settings.Youtube.Language}&" +
+                $"relevanceLanguage={language}&" +
                 $"regionCode={settings.Youtube.RegionCode}&" +
                 $"q={query}";
 
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json
index 251be7cd..3187eb99 100644
--- a/src/WebStarter/appsettings.json
+++ b/src/WebStarter/appsettings.json
@@ -220,12 +220,10 @@
     "Map": {
       "Endpoint": "https://maps.googleapis.com/maps/api/geocode/json",
       "Components": "country=US|country=CA",
-      "Language": "en"
     },
     "Youtube": {
       "Endpoint": "https://www.googleapis.com/youtube/v3/search",
       "RegionCode": "US",
-      "Language": "en",
       "Part": "id"
     }
   },