Expand 'Blocked Users' feature to include a capabilities option (#453)

Author: csharpfritz

doc/YouTube-Doc.txt

@@ -0,0 +1,5 @@
+TagzApp is an open source application with all source code available for contributors and providers to review.  We have created multiple 'providers' for various social media services including Mastodon, X, Twitch, Bluesky, and YouTube.  
+
+TagzApp polls these services repeatedly in order to present message content on a unified dashboard for moderators and pop-up messages for live stream hosts and viewers to interact with
+
+You can review all of our C# source code for the YouTube provider at:  https://github.com/FritzAndFriends/TagzApp/tree/main/src/TagzApp.Providers.YouTubeChat

scripts/AddMigration.cmd

@@ -1 +1 @@
-dotnet ef migrations add --context TagzApp.Storage.Postgres.TagzAppContext -p ..\src\TagzApp.Storage.Postgres\ -s ..\src\TagzApp.Web %1
+dotnet ef migrations add --context TagzApp.Storage.Postgres.TagzAppContext -p ..\src\TagzApp.Storage.Postgres\ -s ..\src\TagzApp.Blazor %1

src/TagzApp.Blazor/Components/Admin/Pages/BlockedUsers.razor

@@ -5,6 +5,7 @@
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.EntityFrameworkCore
 @using System.ComponentModel.DataAnnotations
+@using TagzApp.ViewModels.Data
 @inject IMessagingService _Service
 @inject UserManager<TagzAppUser> _UserManager
 @inject IModerationRepository _Repository
@@ -17,10 +18,19 @@
 		<option value="">Select a provider</option>
 		@foreach (var provider in Providers)
 		{
-			<option value="@provider.Id">@provider.DisplayName</option>
+			<option value="@provider.Id">@provider.Name</option>
 		}
 	</select>
 	<input id="username" name="username" maxlength="20" placeholder="User Name" @bind="@UserToBlock" />
+	
+	@* add a select to choose the BlockedUserCapabilities *@
+	<select name="blockedUserCapabilities" @bind="@BlockedUserCapabilities">
+		@foreach (var capability in Enum.GetValues(typeof(BlockedUserCapabilities)))
+		{
+			<option value="@capability">@capability</option>
+		}
+	</select>
+
 	<AntiforgeryToken />
 	<button type="submit" class="btn btn-primary">Block User</button>
 </form>
@@ -35,6 +45,7 @@
 				<th>Provider</th>
 				<th>Username</th>
 				<th>Blocked By</th>
+				<th>Capabilities</th>
 				<th>Blocked On</th>
 				<th>Blocked Until</th>
 			</tr>
@@ -54,6 +65,7 @@
 					<td>@user.Provider</td>
 					<td>@@@(user.UserName.TrimStart('@'))</td>
 					<td>@user.BlockingUser</td>
+					<td>@user.Capabilities.ToString()</td>
 					<td data-utc="@user.BlockedDate">@user.BlockedDate.ToLocalTime().ToString("d")</td>
 					<td>@(user.ExpirationDate > DateTime.Now.AddYears(1) ? "No end date" : user.ExpirationDate.Value.Date.ToLocalTime().ToString("d"))</td>
 				</tr>
@@ -68,7 +80,7 @@ else
 
 @code {
 
-	private IEnumerable<ISocialMediaProvider> Providers { get; set; }
+	private AvailableProvider[] Providers { get; set; } = [];
 	private IEnumerable<BlockedUser> Users { get; set; }
 
 	[CascadingParameter]
@@ -80,15 +92,21 @@ else
 	[SupplyParameterFromForm(FormName = "BlockNewUser", Name = "username")]
 	private string UserToBlock { get; set; } = string.Empty;
 
+	[SupplyParameterFromForm(FormName = "BlockNewUser", Name = "blockedUserCapabilities")]
+	private BlockedUserCapabilities? BlockedUserCapabilities { get; set; }
+
 	private object EditModel = new();
 
 	protected override async Task OnInitializedAsync()
 	{
 
-		Providers = _Service.Providers
-			.OrderBy(x => x.DisplayName).ToArray();
 		Users = await _Repository.GetBlockedUsers();
 
+		BlockedUserCapabilities ??= Common.Models.BlockedUserCapabilities.Moderated;
+
+		Providers = _Service.Providers.Where(p => p.Enabled)
+			.Select(p => new AvailableProvider(p.Id, p.DisplayName))
+			.ToArray();
 
 	}
 
@@ -100,13 +118,14 @@ else
 		var user = await _UserManager.FindByNameAsync(HttpContext.User.Identity.Name);
 		if (user != null) 
 		{
-			await _Repository.BlockUser($"@{UserToBlock.TrimStart('@')}", SelectedProvider, user.DisplayName, new DateTimeOffset(new DateTime(2050, 1, 1), TimeSpan.Zero));
+			await _Repository.BlockUser($"@{UserToBlock.TrimStart('@')}", SelectedProvider, user.DisplayName, new DateTimeOffset(new DateTime(2050, 1, 1), TimeSpan.Zero), this.BlockedUserCapabilities ?? Common.Models.BlockedUserCapabilities.Moderated	);
 		}
 
 		// reload  the users list
 		Users = await _Repository.GetBlockedUsers();
 		SelectedProvider = string.Empty;
 		UserToBlock = string.Empty;
+		BlockedUserCapabilities = Common.Models.BlockedUserCapabilities.Moderated;
 
 	}
 

src/TagzApp.Blazor/Components/Pages/MessageDetails.razor

@@ -95,10 +95,15 @@
 						@* Add a block user button *@
 						<li>
 							Block @Model.AuthorDisplayName on @Model.Provider.ToLowerInvariant().Humanize(LetterCasing.Title)
-							
-							@* TODO: Wire up the GO button
 
-							*@
+							with @* Add an select for the enum BlockedUserCapabilities *@
+							<select name="blockedUserCapabilities" @bind="@BlockedUserCapabilities">
+								@foreach (var capability in Enum.GetValues(typeof(BlockedUserCapabilities)))
+								{
+									<option value="@capability">@capability</option>
+								}
+							</select>
+							
 							<input type="submit" name="blockUser" value="Go" />
 						</li>
 					</ul>
@@ -124,6 +129,8 @@
 
 	private string ValidationMessage { get; set; }
 
+	private BlockedUserCapabilities BlockedUserCapabilities { get; set; } = BlockedUserCapabilities.Moderated;
+
 	protected override async Task OnInitializedAsync()
 	{
 
@@ -139,7 +146,12 @@
 
 		var user = await UserManager.FindByNameAsync(HttpContext.User.Identity.Name);
 
-		await ModerationRepository.BlockUser(Model.AuthorUserName, Model.Provider, user.DisplayName, new DateTimeOffset(new DateTime(2050, 1, 1), TimeSpan.Zero));
+		await ModerationRepository.BlockUser(
+			Model.AuthorUserName, 
+			Model.Provider, 
+			user.DisplayName, 
+			new DateTimeOffset(new DateTime(2050, 1, 1), TimeSpan.Zero), 
+			BlockedUserCapabilities);
 		ValidationMessage = $"User {Model.AuthorUserName} has been blocked on {Model.Provider.ToLowerInvariant().Humanize(LetterCasing.Title)}";
 
 	}

src/TagzApp.Blazor/Hubs/ModerationHub.cs

@@ -118,7 +118,13 @@ public async Task<IEnumerable<ModerationContentModel>> GetFilteredContentByTag(s
 			[ModerationState.Pending, ModerationState.Approved, ModerationState.Rejected] :
 			new[] { Enum.Parse<ModerationState>(state) };
 
-		var results = (await _Service.GetFilteredContentByTag(tag, providers, states))
+		var hiddenUsers = (await _Repository.GetBlockedUsers())
+			.Where(b => b.Capabilities == BlockedUserCapabilities.Hidden)
+			.ToArray();
+
+		var results = (await _Service.GetFilteredContentByTag(tag, providers, states, 200))
+			.Where(c => !hiddenUsers.Any(h => h.Provider.Equals(c.Item1.Provider, StringComparison.InvariantCultureIgnoreCase) && h.UserName.Equals(c.Item1.Author.UserName, StringComparison.InvariantCultureIgnoreCase)))
+			.Take(100)
 			.Select(c => ModerationContentModel.ToModerationContentModel(c.Item1, c.Item2))
 			.ToArray();
 		Console.WriteLine($"Found {results.Length} results for {tag} with {providers.Length} providers and {states.Length} states");

src/TagzApp.Common/IModerationRepository.cs

@@ -52,7 +52,7 @@ public interface IModerationRepository
 	/// <param name="userName">The moderator who is blocking the user</param>
 	/// <param name="expirationDate">The date the block expires</param>
 	/// <returns></returns>
-	Task BlockUser(string userId, string provider, string userName, DateTimeOffset expirationDate);
+	Task BlockUser(string userId, string provider, string userName, DateTimeOffset expirationDate, BlockedUserCapabilities capabilities);
 
 	/// <summary>
 	/// Unblock a user

src/TagzApp.Common/Models/BlockedUser.cs

@@ -31,4 +31,14 @@ public class BlockedUser
 	/// </summary>
 	public DateTimeOffset? ExpirationDate { get; set; }
 
+	public BlockedUserCapabilities Capabilities { get; set; } = BlockedUserCapabilities.Moderated;
+
+}
+
+public enum BlockedUserCapabilities
+{
+
+	Moderated = 1,
+	Hidden = 2
+
 }