hide the username when the hide requests is set

src/Ombi.Core/Services/RecentlyRequestedService.cs

@@ -1,6 +1,11 @@
 using Microsoft.EntityFrameworkCore;
+using Ombi.Core.Authentication;
+using Ombi.Core.Engine.Interfaces;
+using Ombi.Core.Helpers;
 using Ombi.Core.Models.Requests;
+using Ombi.Core.Rule.Interfaces;
 using Ombi.Core.Settings;
+using Ombi.Helpers;
 using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository.Requests;
@@ -10,15 +15,17 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using static Ombi.Core.Engine.BaseMediaEngine;
 
 namespace Ombi.Core.Services
 {
-    public class RecentlyRequestedService : IRecentlyRequestedService
+    public class RecentlyRequestedService : BaseEngine, IRecentlyRequestedService
     {
         private readonly IMovieRequestRepository _movieRequestRepository;
         private readonly ITvRequestRepository _tvRequestRepository;
         private readonly IMusicRequestRepository _musicRequestRepository;
         private readonly ISettingsService<CustomizationSettings> _customizationSettings;
+        private readonly ISettingsService<OmbiSettings> _ombiSettings;
 
         private const int AmountToTake = 7;
 
@@ -26,12 +33,17 @@ namespace Ombi.Core.Services
             IMovieRequestRepository movieRequestRepository,
             ITvRequestRepository tvRequestRepository,
             IMusicRequestRepository musicRequestRepository,
-            ISettingsService<CustomizationSettings> customizationSettings)
+            ISettingsService<CustomizationSettings> customizationSettings,
+            ISettingsService<OmbiSettings> ombiSettings,
+            ICurrentUser user,
+            OmbiUserManager um,
+            IRuleEvaluator rules) : base(user, um, rules)
         {
             _movieRequestRepository = movieRequestRepository;
             _tvRequestRepository = tvRequestRepository;
             _musicRequestRepository = musicRequestRepository;
             _customizationSettings = customizationSettings;
+            _ombiSettings = ombiSettings;
         }
 
         public async Task<IEnumerable<RecentlyRequestedModel>> GetRecentlyRequested(CancellationToken cancellationToken)
@@ -49,6 +61,7 @@ namespace Ombi.Core.Services
                 recentTvRequests = recentTvRequests.Where(x => !x.Available);
                 recentMusicRequests = recentMusicRequests.Where(x => !x.Available);
             }
+            var hideUsers = await HideFromOtherUsers();
 
             var model = new List<RecentlyRequestedModel>();
 
@@ -64,8 +77,8 @@ namespace Ombi.Core.Services
                     Title = item.Title,
                     Type = RequestType.Movie,
                     Approved = item.Approved,
-                    UserId = item.RequestedUserId,
-                    Username = item.RequestedUser.UserAlias,
+                    UserId = hideUsers.Hide ? string.Empty : item.RequestedUserId,
+                    Username = hideUsers.Hide ? string.Empty : item.RequestedUser.UserAlias,
                     MediaId = item.TheMovieDbId.ToString(),
                 });
             }
@@ -82,8 +95,8 @@ namespace Ombi.Core.Services
                     RequestDate = item.RequestedDate,
                     Title = item.Title,
                     Type = RequestType.Album,
-                    UserId = item.RequestedUserId,
-                    Username = item.RequestedUser.UserAlias,
+                    UserId = hideUsers.Hide ? string.Empty : item.RequestedUserId,
+                    Username = hideUsers.Hide ? string.Empty : item.RequestedUser.UserAlias,
                     MediaId = item.ForeignAlbumId,
                 });
             }
@@ -102,13 +115,32 @@ namespace Ombi.Core.Services
                     TvPartiallyAvailable = partialAvailability,
                     Title = item.ParentRequest.Title,
                     Type = RequestType.TvShow,
-                    UserId = item.RequestedUserId,
-                    Username = item.RequestedUser.UserAlias,
+                    UserId = hideUsers.Hide ? string.Empty : item.RequestedUserId,
+                    Username = hideUsers.Hide ? string.Empty : item.RequestedUser.UserAlias,
                     MediaId = item.ParentRequest.ExternalProviderId.ToString()
                 });
             }
 
             return model.OrderByDescending(x => x.RequestDate);
         }
+
+        private async Task<HideResult> HideFromOtherUsers()
+        {
+            var user = await GetUser();
+            if (await IsInRole(OmbiRoles.Admin) || await IsInRole(OmbiRoles.PowerUser) || user.IsSystemUser)
+            {
+                return new HideResult
+                {
+                    UserId = user.Id
+                };
+            }
+            var settings = await _ombiSettings.GetSettingsAsync();
+            var result = new HideResult
+            {
+                Hide = settings.HideRequestsUsers,
+                UserId = user.Id
+            };
+            return result;
+        }
     }
 }

src/Ombi/ClientApp/src/app/components/detailed-card/detailed-card.component.html

@@ -58,7 +58,7 @@
                     <div class="text-right year"><sup>{{request.releaseDate | date:'yyyy'}}</sup></div>
                     <h3>{{request.title}}</h3>
                 </div>
-                <div class="col-12">
+                <div class="col-12" *ngIf="request.username">
                     <p>Requested By: {{request.username}}</p>
                 </div>
                 <div class="col-12">

src/Ombi/ClientApp/src/app/services/requestV2.service.ts

@@ -102,6 +102,6 @@ export class RequestServiceV2 extends ServiceHelpers {
     }
 
     public getRecentlyRequested(): Observable<IRecentlyRequested[]> {
-        return this.http.get<IRecentlyRequested[]>(`${this.url}recentlyRequestedstuff`, { headers: this.headers });
+        return this.http.get<IRecentlyRequested[]>(`${this.url}recentlyRequested`, { headers: this.headers });
     }
 }

src/Ombi/Controllers/V2/RequestsController.cs

@@ -227,8 +227,7 @@ namespace Ombi.Controllers.V2
             return await _movieRequestEngine.RequestCollection(collectionId, HttpContext.RequestAborted);
         }
 
-        [HttpGet("recentlyRequestedstuff")]
-        [Admin]
+        [HttpGet("recentlyRequested")]
         public Task<IEnumerable<RecentlyRequestedModel>> RecentlyRequested()
         {
             return _recentlyRequestedService.GetRecentlyRequested(CancellationToken);