More tweaks and fixes

Author: StanleyGoldman

src/GitHub.App/Models/SuggestionItem.cs

@@ -10,19 +10,6 @@ namespace GitHub.Models
     /// </summary>
     public class SuggestionItem
     {
-        public SuggestionItem() // So this can be deserialized from cache
-        {
-        }
-
-        public SuggestionItem(string name, Uri iconCacheKey)
-        {
-            Guard.ArgumentNotEmptyString(name, "name");
-            Guard.ArgumentNotNull(iconCacheKey, "iconCacheKey");
-            
-            Name = name;
-            IconKey = iconCacheKey;
-        }
-
         public SuggestionItem(string name, string description)
         {
             Guard.ArgumentNotEmptyString(name, "name");
@@ -32,14 +19,13 @@ public SuggestionItem(string name, string description)
             Description = description;
         }
 
-        public SuggestionItem(string name, string description, Uri iconCacheKey)
+        public SuggestionItem(string name, string description, string imageUrl)
         {
             Guard.ArgumentNotEmptyString(name, "name");
-            Guard.ArgumentNotNull(iconCacheKey, "iconCacheKey");
 
             Name = name;
             Description = description;
-            IconKey = iconCacheKey;
+            ImageUrl = imageUrl;
         }
 
         /// <summary>
@@ -53,9 +39,9 @@ public SuggestionItem(string name, string description, Uri iconCacheKey)
         public string Description { get; set; }
 
         /// <summary>
-        /// A key to lookup when displaying the icon for this entry
+        /// An image url for this entry
         /// </summary>
-        public Uri IconKey { get; set; }
+        public string ImageUrl { get; set; }
 
         /// <summary>
         /// The date this suggestion was last modified according to the API.

src/GitHub.App/Services/IssuesAutoCompleteSource.cs

@@ -45,7 +45,10 @@ public IObservable<AutoCompleteSuggestion> GetSuggestions()
                     .Select(repository =>
                         repository.Issues(null, null, null, null, null, null, null)
                             .AllPages()
-                            .Select(issue => new SuggestionItem("#" + issue.Number, issue.Title))
+                            .Select(issue => new SuggestionItem("#" + issue.Number, issue.Title)
+                            {
+                                LastModifiedDate = issue.LastEditedAt
+                            })
                             .ToList())
                     .Compile();
             }

src/GitHub.App/Services/MentionsAutoCompleteSource.cs

@@ -22,6 +22,8 @@ namespace GitHub.Services
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class MentionsAutoCompleteSource : IAutoCompleteSource
     {
+        const string DefaultAvatar = "pack://application:,,,/GitHub.App;component/Images/default_user_avatar.png";
+
         readonly ITeamExplorerContext teamExplorerContext;
         readonly IGraphQLClientFactory graphqlFactory;
         readonly IAvatarProvider avatarProvider;
@@ -58,7 +60,7 @@ public IObservable<AutoCompleteSuggestion> GetSuggestions()
                         .Select(sourceItem => 
                             new SuggestionItem(sourceItem.Login, 
                                 sourceItem.Name ?? "(unknown)", 
-                                GetUrlSafe(sourceItem.AvatarUrl(null))))
+                                sourceItem.AvatarUrl(null)))
                         .ToList())
                 .Compile();
             }
@@ -75,20 +77,21 @@ public IObservable<AutoCompleteSuggestion> GetSuggestions()
                 var suggestions = await connection.Run(query, variables);
                 return suggestions.Select(suggestion => new AutoCompleteSuggestion(suggestion.Name,
                     suggestion.Description,
-                    ResolveImage(suggestion.IconKey.ToString()),
+                    ResolveImage(suggestion),
                     Prefix));
             }).SelectMany(enumerable => enumerable);
         }
 
-        private IObservable<BitmapSource> ResolveImage(string uri) => avatarProvider.GetAvatar(uri);
-
-        public string Prefix => "@";
-
-        static Uri GetUrlSafe(string url)
+        IObservable<BitmapSource> ResolveImage(SuggestionItem uri)
         {
-            Uri uri;
-            Uri.TryCreate(url, UriKind.Absolute, out uri);
-            return uri;
+            if (uri.ImageUrl != null)
+            {
+                return avatarProvider.GetAvatar(uri.ImageUrl);
+            }
+
+            return Observable.Return(AvatarProvider.CreateBitmapImage(DefaultAvatar));
         }
+
+        public string Prefix => "@";
     }
 }