[2.3] Detect short codes in invite location URLs

nachmore · Apr 27, 2021 · 6dbadec · 6dbadec
1 parent e376ab0
commit 6dbadec
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 31 deletions.
diff --git a/ChimeHelper/ChimeHelper/Chime.cs b/ChimeHelper/ChimeHelper/Chime.cs
@@ -110,7 +110,14 @@ public static List<string> GetPinsFromText(string text)
       // if we couldn't find any URLs try more coarse matching
       if (rv.Count == 0)
       {
-        rv = GetFreeformPinsFromText(text);
+        rv = GetRegexMatches(@"chime.aws/(.*)\b", text);
+
+        if (rv.Count == 0)
+        {
+          // No URL based PINs found, go freeform...
+
+          rv = GetFreeformPinsFromText(text);
+        }
       }
 
       return rv;

diff --git a/ChimeHelper/ChimeHelperUX/ChimeHelperUX.csproj b/ChimeHelper/ChimeHelperUX/ChimeHelperUX.csproj
@@ -79,8 +79,8 @@
     <TimeSuffix>$(TimeSuffix.Trim())</TimeSuffix>
     <DateSuffix>$(DateSuffix.Trim())</DateSuffix>
 
-    <AssemblyVersion>2.2.$(DateSuffix).$(TimeSuffix)</AssemblyVersion>
-    <FileVersion>2.2.$(DateSuffix).$(TimeSuffix)</FileVersion>
+    <AssemblyVersion>2.3.$(DateSuffix).$(TimeSuffix)</AssemblyVersion>
+    <FileVersion>2.3.$(DateSuffix).$(TimeSuffix)</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>
     <PreBuildEvent />
@@ -104,7 +104,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent />
-    <Version>2.2</Version>
+    <Version>2.3</Version>
     <Authors>Oren Nachman</Authors>
     <Company>nachmore</Company>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

diff --git a/ChimeHelper/ChimeOutlookHelper/ChimeOutlookHelper.cs b/ChimeHelper/ChimeOutlookHelper/ChimeOutlookHelper.cs
@@ -56,33 +56,6 @@ public static List<ChimeMeeting> GetMeetings()
 
     private static HashSet<string> GetPins(AppointmentItem appointment)
     {
-      /*
-       * ---------------------------
-Chime Helper: AppDomain UnhandledException
----------------------------
-Apologies, an unexpected error has occurred! Hit Ctrl+C and send us the output so that we can fix the issue!
-
-System.NullReferenceException: Object reference not set to an instance of an object.
-
-   at ChimeOutlookHelper.ChimeOutlookHelper.GetPins(AppointmentItem appointment)
-
-   at ChimeOutlookHelper.ChimeOutlookHelper.GetMeetings()
-
-   at ChimeHelperUX.ChimeHelperState.CheckForChimeMeetings(Object stateInfo)
-
-   at System.Threading.ExecutionContext.RunInternal(ExecutionContext executionContext, ContextCallback callback, Object state)
-
---- End of stack trace from previous location where exception was thrown ---
-
-   at System.Threading.TimerQueueTimer.CallCallback(Boolean isThreadPool)
-
-   at System.Threading.TimerQueueTimer.Fire(Boolean isThreadPool)
-
-   at System.Threading.TimerQueue.FireNextTimers()
----------------------------
-OK   
----------------------------
-*/
       var rv = new List<string>();
 
       Debug.WriteLine(appointment.Start + " -> " + appointment.End + ": " + appointment.Subject + "\n\tLocation: " + appointment.Location +