[MERGE] DEV to Main (#48)

* Update README.md * Update README.md * Add caching for Mastodon posts - #22 --------- Co-authored-by: Terence Burridge <[email protected]>
H5YR · Oct 23, 2023 · 9844481 · 9844481
1 parent 323c740
commit 9844481
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/Core/Services/IMastodonService.cs b/Core/Services/IMastodonService.cs
@@ -4,6 +4,6 @@ namespace h5yr.Core.Services
 {
     public interface IMastodonService
     {
-        Task<IReadOnlyList<MastodonStatus>> GetStatuses(int limit, string? maxId = null);
+        Task<List<MastodonStatus>> GetStatuses(int limit);
     }
 }
diff --git a/Core/Services/MastodonService.cs b/Core/Services/MastodonService.cs
@@ -2,30 +2,55 @@
 using Skybrud.Social.Mastodon.Models.Statuses;
 using Skybrud.Social.Mastodon.Options.Timeline;
 using Skybrud.Social.Mastodon.Responses.Statuses;
+using Umbraco.Cms.Core.Cache;
 
 namespace h5yr.Core.Services {
 
     public class MastodonService : IMastodonService
     {
 
         private readonly ILogger<MastodonService> _logger;
+        private readonly AppCaches _appCaches;
 
-        public MastodonService(ILogger<MastodonService> logger)
+        private const string FeedDomain = "umbracocommunity.social";
+        private const string FeedHashtag = "h5yr";
+        private const string FeedCacheKey = "mastodonposts";
+        private const int FeedCacheMinutes = 15;
+
+        public MastodonService(ILogger<MastodonService> logger, AppCaches appCaches)
         {
             _logger = logger;
+            _appCaches = appCaches;
+        }
+
+        public async Task<List<MastodonStatus>> GetStatuses(int limit)
+        {
+            var posts = _appCaches.RuntimeCache.GetCacheItem($"{FeedCacheKey}_{limit}",
+                () => LoadStatuses(limit),
+                TimeSpan.FromMinutes(FeedCacheMinutes));
+
+            if (posts != null)
+            {
+                return await posts;
+            }
+            else
+            {
+                return await Task.FromResult(new List<MastodonStatus>());
+            }
         }
 
-        public async Task<IReadOnlyList<MastodonStatus>> GetStatuses(int limit, string? maxId = null)
+
+        private async Task<List<MastodonStatus>> LoadStatuses(int limit)
         {
 
             // Initialize a new HTTP service (basically the API wrapper)
             MastodonHttpService mastodon = MastodonHttpService
-                .CreateFromDomain("umbracocommunity.social");
+                .CreateFromDomain(FeedDomain);
 
             // Initialize the options for the request to the API
             MastodonGetHashtagTimelineOptions options = new()
             {
-                Hashtag = "h5yr",
+                Hashtag = FeedHashtag,
                 Limit = limit
             };
 
@@ -38,7 +63,7 @@ public async Task<IReadOnlyList<MastodonStatus>> GetStatuses(int limit, string?
                     .GetHashtagTimelineAsync(options);
 
                 // Return the statuses
-                return response.Body;
+                return response.Body.ToList();
 
             }
             catch (Exception ex)
@@ -49,7 +74,7 @@ public async Task<IReadOnlyList<MastodonStatus>> GetStatuses(int limit, string?
             }
 
 
-            return Array.Empty<MastodonStatus>();
+            return new List<MastodonStatus>();
 
         }
 

diff --git a/README.md b/README.md
@@ -34,5 +34,7 @@ Todo: This info is now out of date and really needs updating for mastodon.
     "AccessTokenSecret": "" 
   } 
   ``` 
-
+  ## Free holopin badge
+
+  If you'd like a free badge for your holopin collection - [Grab it](https://holopin.io/collect/clfcrtna163140fjsf31nv3ww)