Renive Shortened Url

Author: MIDDLEEAST\mmoussa

CSharp/intelligence-Zummer/Handlers/ArticlesIntentHandler.cs

@@ -18,13 +18,11 @@ internal sealed class ArticlesIntentHandler : IIntentHandler
     {
         private const int ArticlesMaxResults = 5;
 
-        private readonly IUrlShorteningService urlShorteningService;
         private readonly ISearchService bingSearchApiHandler;
         private readonly IBotToUser botToUser;
 
-        public ArticlesIntentHandler(IBotToUser botToUser, IUrlShorteningService urlShorteningService, ISearchService bingSearchApiHandler)
+        public ArticlesIntentHandler(IBotToUser botToUser, ISearchService bingSearchApiHandler)
         {
-            SetField.NotNull(out this.urlShorteningService, nameof(urlShorteningService), urlShorteningService);
             SetField.NotNull(out this.bingSearchApiHandler, nameof(bingSearchApiHandler), bingSearchApiHandler);
             SetField.NotNull(out this.botToUser, nameof(botToUser), botToUser);
         }
@@ -55,7 +53,7 @@ public async Task Respond(IMessageActivity activity, LuisResult result)
 
             for (int i = 0; i < ArticlesMaxResults; i++)
             {
-                var zummerResult = await this.PrepareZummerResult(bingSearch.webPages.value[i]);
+                var zummerResult = this.PrepareZummerResult(bingSearch.webPages.value[i]);
                 reply.Attachments.Add(ArticleCardGenerator.GetArticleCard(zummerResult, activity.ChannelId));
             }
 
@@ -69,7 +67,7 @@ public async Task Respond(IMessageActivity activity, LuisResult result)
             await this.botToUser.PostAsync(reply);
         }
 
-        private async Task<ZummerSearchResult> PrepareZummerResult(Value pages)
+        private ZummerSearchResult PrepareZummerResult(Value pages)
         {
             string url;
             var myUri = new Uri(pages.url);
@@ -87,8 +85,7 @@ private async Task<ZummerSearchResult> PrepareZummerResult(Value pages)
             {
                 Name = pages.name,
                 Snippet = pages.snippet,
-                Url = pages.url,
-                ShortenedUrl = await this.urlShorteningService.GetShortenedUrl(url),
+                Url = url
             };
 
             return zummerResult;

CSharp/intelligence-Zummer/Handlers/SummaryRegexHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Bot.Builder.Dialogs;
@@ -27,7 +28,19 @@ public async Task Respond(IMessageActivity activity, Match result)
             {
                 string articleUrl = TryParseSummaryUrl(result.Groups[2].Value);
 
-                await this.botToUser.PostAsync(string.Format(Strings.SummaryWaitMessage));
+                var fullArticleMessage = this.botToUser.MakeMessage();
+
+                fullArticleMessage.Attachments.Add(CardGenerator.GetHeroCard(Strings.SummaryWaitMessage, cardActions: new List<CardAction>
+                {
+                    new CardAction
+                    {
+                        Title = Strings.FullArticleString,
+                        Type = ActionTypes.OpenUrl,
+                        Value = articleUrl
+                    }
+                }));
+
+                await this.botToUser.PostAsync(fullArticleMessage);
 
                 var bingSummary = await this.summaryService.GetSummary(articleUrl);
 
@@ -58,8 +71,7 @@ public async Task Respond(IMessageActivity activity, Match result)
         private static string TryParseSummaryUrl(string text)
         {
             Uri uriResult;
-            bool result = Uri.TryCreate(text, UriKind.Absolute, out uriResult)
-                && uriResult.Scheme == Uri.UriSchemeHttp;
+            bool result = Uri.TryCreate(text, UriKind.Absolute, out uriResult);
 
             if (result && uriResult.IsAbsoluteUri)
             {

CSharp/intelligence-Zummer/Modules/MainModule.cs

@@ -22,7 +22,6 @@ protected override void Load(ContainerBuilder builder)
 
             // Singlton services
             builder.RegisterType<LuisService>().Keyed<ILuisService>(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().SingleInstance();
-            builder.RegisterType<TinyUrlRequestHandler>().Keyed<IUrlShorteningService>(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().SingleInstance();
             builder.RegisterType<BingSearchService>().Keyed<ISearchService>(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().SingleInstance();
             builder.RegisterType<BingSummarizeService>().Keyed<ISummarizeService>(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().SingleInstance();
             builder.RegisterType<ApiHandler>().Keyed<IApiHandler>(FiberModule.Key_DoNotSerialize).AsImplementedInterfaces().SingleInstance();

CSharp/intelligence-Zummer/Services/IUrlShorteningService.cs

@@ -123,8 +123,8 @@
   <data name="FallbackIntentMessage" xml:space="preserve">
     <value>Hmm... I did not understand that. Rephrase your message and try again.</value>
   </data>
-  <data name="FullStoryString" xml:space="preserve">
-    <value>Full Story</value>
+  <data name="FullArticleString" xml:space="preserve">
+    <value>Full Article</value>
   </data>
   <data name="GreetOnDemand" xml:space="preserve">
     <value>Hi! What would you like to read about? You can just type the topic and I'll do my best to fetch best Wikipedia results for you to read, powered by Bing Search.</value>

CSharp/intelligence-Zummer/Services/TinyUrlRequestHandler.cs

@@ -24,7 +24,7 @@ public static Attachment GetArticleCard(ZummerSearchResult result, string channe
 
             var actions = new List<CardAction>
             {
-                new CardAction(ActionTypes.ImBack, Strings.ReadSummary, value: "summary " + (string.IsNullOrEmpty(result.ShortenedUrl) ? result.Url : result.ShortenedUrl))
+                new CardAction(ActionTypes.ImBack, Strings.ReadSummary, value: "summary " + result.Url)
             };
 
             switch (channelId)

CSharp/intelligence-Zummer/Strings.Designer.cs

@@ -141,7 +141,6 @@
     <Compile Include="Handlers\SummaryRegexHandler.cs" />
     <Compile Include="Services\ISearchService.cs" />
     <Compile Include="Services\ISummarizeService.cs" />
-    <Compile Include="Services\IUrlShorteningService.cs" />
     <Compile Include="Utilities\CardGenerators\ArticleCardGenerator.cs" />
     <Compile Include="Handlers\IHandlerFactory.cs" />
     <Compile Include="Modules\MainModule.cs" />
@@ -154,7 +153,6 @@
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\TinyUrlRequestHandler.cs" />
     <Compile Include="Strings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>