!INFO: tried to move to postgreSQL did not work

fix: fixed bumping, fixed banning from Reports Menu
feat: improved homepage, finilized comments and posts, moved version from nav menu to sidebar

Signed-off-by: limited_dev <loginakkisativ@gmail.com>

.dockerignore

@@ -24,3 +24,4 @@
 LICENSE
 README.md
 **/creds.json
+**/*.db

.gitignore

@@ -7,6 +7,7 @@ ImageBoardServerApp/wwwroot/img/dynamic
 *.db-wal
 Migrations/
 /ImageBoardServerApp/Data/creds.json
+/ImageBoardServerApp/Data/AppDbContext.cs
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

ImageBoardServerApp/Data/Repository/UsersRepository.cs

@@ -27,6 +27,14 @@ public static class UsersRepository
             .FirstOrDefaultAsync();
     }
 
+    public static async Task<UserData> getUserByIdLiteAsync(int userId)
+    {
+        await using var db = new AppDBContext();
+        return await db.Users
+            .Where(x => x.UserID == userId)
+            .FirstOrDefaultAsync();
+    }
+
     public static async Task<UserData> getUserByEmailRawAsync(string email)
     {
         await using var db = new AppDBContext();

ImageBoardServerApp/ImageBoardServerApp.csproj

@@ -16,12 +16,13 @@
       </PackageReference>
       <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.13" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.8"/>
       <PackageReference Include="Radzen.Blazor" Version="4.10.4" />
       <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="Data\Migrations\"/>
+        <Folder Include="Data\Migrations\"/>
       <Folder Include="wwwroot\img\dynamic\comment\au" />
       <Folder Include="wwwroot\img\dynamic\comment\e\" />
       <Folder Include="wwwroot\img\dynamic\comment\tec" />

ImageBoardServerApp/Pages/Basic/Index.razor

@@ -1,8 +1,9 @@
 @page "/"
+@using ImageBoardServerApp.Util
 @using ImageBoardServerApp.Data.Repository
 @inject AuthenticationStateProvider authStateProvider
 
-<h1>BulletBoard</h1>
+<h1>BulletBoard @ver</h1>
 <p>
     This is a simple <a href="https://en.wiktionary.org/wiki/imageboard">imageboard</a> made in <a href="https://dotnet.microsoft.com/en-us/apps/aspnet/web-apps/blazor">Razor Server</a>.
     <br/>
@@ -12,7 +13,9 @@
     <br/>
     Click <a href="https://www.gnu.org/philosophy/free-sw.en.html">here</a> to learn more about free software.
     <br/>
+    Check out the project on <a href="https://git.limited-dev.de/eric/imageboard">Gitlab</a>.
     <br>
+    <br/>
     We're currently @amountOfUsers User(s), viewing @amountOfPosts Post(s) with @amountOfComments Comment(s).
     <br/>
     Click here to:
@@ -36,6 +39,8 @@
     private int amountOfComments = -1;
     private int amountOfUsers = -1;
 
+    public string ver { get; set; } = TheManager.version;
+
     protected override async Task OnParametersSetAsync()
     {
         var posts = await PostsRepository.getPostsAsync();

ImageBoardServerApp/Pages/Basic/ReportPage.razor

@@ -55,6 +55,8 @@
     {
         if (selectedItem == null || selectedItem == "none")
             return;
+        if (explaination == null)
+            return;
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
@@ -94,10 +96,13 @@
         };
 
         List<ReportData> submittedReports = foundusr.RecivedReports;
-        foreach (var r in submittedReports)
+        if (foundusr.RecivedReports != null)
         {
-            if (r.ReportedPostID == reportData.ReportedPostID && r.ReportedCommentID == reportData.ReportedCommentID)
+            foreach (var r in submittedReports)
-                return;
+            {
+                if (r.ReportedPostID == reportData.ReportedPostID && r.ReportedCommentID == reportData.ReportedCommentID)
+                    return;
+            }
         }
 
         await ReportsRepository.createReportAsync(reportData);

ImageBoardServerApp/Pages/Moderation/BanAndDeleteCommentsOrPosts.razor

@@ -1,10 +1,53 @@
-@page "/sys/modtools/{targetuserid}/{type}/{targetid}"
+@page "/sys/modtools/banandordel/{targetuserid}/{board}/{type}/{threadid}/{targetid}"
+@using ImageBoardServerApp.Data.Repository
 @using System.ComponentModel.DataAnnotations
+@inject NavigationManager navManager
+@inject IJSRuntime js
 
 <AuthorizeView Roles="Admin,Mod">
     <Authorized>
         <div>
-
+            <UserEntry user="user"></UserEntry>
+            <p>
+                <a href="/@board/thread/@threadid">[View Thread]</a>
+            </p>
+            <div>
+                <br/>
+                @if (type == "op")
+                {
+                    <Post post="post" showOpenThread="true"/>
+                }
+                else if (type == "comment")
+                {
+                    <Comment comment="comment"/>
+                }
+                else
+                {
+                    <p>This is not a valid type.</p>
+                }
+            </div>
+            <div>
+                <form>
+                    <RadzenFormField Text="Reason" Variant="Variant.Outlined">
+                        <RadzenTextBox @bind-Value="@reason"/>
+                    </RadzenFormField>
+                    <br/>
+                    <br/>
+                    <span>Ban User: </span>
+                    <a @onclick="() => banTarget(1)" href="javascript:void(0)">1h</a>
+                    <span> </span>
+                    <a @onclick="() => banTarget(2)" href="javascript:void(0)">2h</a>
+                    <span> </span>
+                    <a @onclick="() => banTarget(1 * 24)" href="javascript:void(0)">1d</a>
+                    <span> </span>
+                    <a @onclick="() => banTarget(7 * 24)" href="javascript:void(0)">1w</a>
+                    <span> </span>
+                    <a @onclick="() => banTarget(31 * 24)" href="javascript:void(0)">1m</a>
+                    <span> </span>
+                    <a @onclick="() => banTarget(365 * 24)" href="javascript:void(0)">1yr</a>
+                    <span> </span>
+                </form>
+            </div>
         </div>
     </Authorized>
     <NotAuthorized>
@@ -14,14 +57,82 @@
 
 @code {
 
+    public string timetoBan { get; set; }
+    public string reason { get; set; }
+
+    public UserData user { get; set; }
+    public PostData post { get; set; }
+    public CommentData comment { get; set; }
+
+    private async Task banTarget(int hours)
+    {
+        UserData ud = await UsersRepository.getUserByIdAsync(int.Parse(targetuserid));
+        ud.TimeBanned = DateTimeOffset.Now.ToUnixTimeMilliseconds() + (hours * 3600000);
+        if (reason == "")
+        {
+            reason = "not specified";
+        }
+        ud.BanReason = reason;
+        await UsersRepository.updateUserAsync(ud);
+        navManager.NavigateTo("/@board/", true, true);
+    }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        if (!int.TryParse(targetid, out _) || !int.TryParse(targetuserid, out _))
+        {
+            navManager.NavigateTo("/sys/dead", true);
+            return;
+        }
+
+        var targeti = int.Parse(targetid);
+
+        var targetuseri = int.Parse(targetuserid);
+
+        var u = await UsersRepository.getUserByIdAsync(targetuseri);
+        if (u == null)
+        {
+            navManager.NavigateTo("/sys/dead", true);
+            return;
+        }
+
+        if (targetuseri != u.UserID)
+        {
+            navManager.NavigateTo("/sys/dead", true);
+            return;
+        }
+
+        user = u;
+
+        var isPost = type == "op";
+
+        if (isPost)
+        {
+            post = await PostsRepository.getPostByIdAsync(targeti);
+        }
+        else
+        {
+            comment = await CommentsRepository.getCommentByIdAsync(targeti);
+        }
+        await base.OnParametersSetAsync();
+    }
+
     [Parameter]
     [Required]
     public string targetuserid { get; set; }
 
+    [Parameter]
+    [Required]
+    public string threadid { get; set; }
+
     [Parameter]
     [Required]
     public string type { get; set; }
 
+    [Parameter]
+    [Required]
+    public string board { get; set; }
+
     [Parameter]
     [Required]
     public string targetid { get; set; }

ImageBoardServerApp/Shared/Components/Forms/CommentForm.razor

@@ -118,7 +118,7 @@
             return;
         }
         int userID = foundusr.UserID;
-        if (DateTimeOffset.Now.ToUnixTimeMilliseconds() - foundusr.TimeBanned < 0)
+        if (DateTimeOffset.Now.ToUnixTimeMilliseconds() - foundusr.TimeBanned > 0)
         {
             foundusr.TimeBanned = -1;
         }
@@ -127,7 +127,7 @@
         {
             var dt = TheManager.ConvertToDateTime(foundusr.TimeBanned);
             hasErr = true;
-            postErr = "You are banned for " + foundusr.BanReason + " and may not comment until " + dt.Year + "." + dt.Month + "." + dt.Day + " " + dt.Hour + ":" + dt.Minute + "::" + dt.Second;
+            postErr = "You are banned for \"" + foundusr.BanReason + "\" and may not comment until " + dt.Year + "." + dt.Month + "." + dt.Day + " " + dt.Hour + ":" + dt.Minute + "::" + dt.Second;
             return;
         }
         foundusr.lastActionTimeStamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();

ImageBoardServerApp/Shared/Components/Forms/PostForm.razor

@@ -124,7 +124,7 @@
             return;
         }
         int userID = foundusr.UserID;
-        if (DateTimeOffset.Now.ToUnixTimeMilliseconds() - foundusr.TimeBanned < 0)
+        if (DateTimeOffset.Now.ToUnixTimeMilliseconds() - foundusr.TimeBanned > 0)
         {
             foundusr.TimeBanned = -1;
         }
@@ -133,7 +133,7 @@
         {
             var dt = TheManager.ConvertToDateTime(foundusr.TimeBanned);
             hasErr = true;
-            postErr = "You are banned for " + foundusr.BanReason + " and may not post until " + dt.Year + "." + dt.Month + "." + dt.Day + " " + dt.Hour + ":" + dt.Minute + "::" + dt.Second;
+            postErr = "You are banned for \"" + foundusr.BanReason + "\" and may not post until " + dt.Year + "." + dt.Month + "." + dt.Day + " " + dt.Hour + ":" + dt.Minute + "::" + dt.Second;
             return;
         }
 
@@ -153,7 +153,6 @@
         foundusr.LastUsedName = postUsername;
         await UsersRepository.updateUserAsync(foundusr);
 
-
     //TODO Add check if data is image
 
         if (selectedFile == null || selectedFile.Size >= 512000 * 2 * 10)
@@ -198,11 +197,11 @@
             shouldAnon = postAnon
         };
         int postId = await PostsRepository.createPostAsync(postToPost);
+        await TheManager.bumpThreads(board);
         if (postId != -1)
         {
     //Open post successfull
             NavigationManager.NavigateTo($"/{board.Tag}/thread/{postId}", true, true);
-            await TheManager.bumpThreads(board);
             Console.WriteLine("Post created");
         }
         else

ImageBoardServerApp/Shared/Components/ReportEntry.razor

@@ -18,28 +18,34 @@
     <span>Explaination: @report.ReportExlaination</span>
     <br/>
     <span>Ban User: </span>
-    <a @onclick="() => banTarget(1)" href="javascript:void(0)">1d</a>
+    <a @onclick="() => banTarget(1)" href="javascript:void(0)">1h</a>
     <span> </span>
-    <a @onclick="() => banTarget(7)" href="javascript:void(0)">1w</a>
+    <a @onclick="() => banTarget(2)" href="javascript:void(0)">2h</a>
     <span> </span>
-    <a @onclick="() => banTarget(31)" href="javascript:void(0)">1m</a>
+    <a @onclick="() => banTarget(1 * 24)" href="javascript:void(0)">1d</a>
     <span> </span>
-    <a @onclick="() => banTarget(365)" href="javascript:void(0)">1yr</a>
+    <a @onclick="() => banTarget(7 * 24)" href="javascript:void(0)">1w</a>
+    <span> </span>
+    <a @onclick="() => banTarget(31 * 24)" href="javascript:void(0)">1m</a>
+    <span> </span>
+    <a @onclick="() => banTarget(365 * 24)" href="javascript:void(0)">1yr</a>
     <span> </span>
-    <a @onclick="() => banTarget(99999999)" href="javascript:void(0)">273,972.6 yrs</a>
     <br/>
     <span>Ban Reporter: </span>
-    <a @onclick="() => banReporter(1)" href="javascript:void(0)">1d</a>
+    <a @onclick="() => banReporter(1)" href="javascript:void(0)">1h</a>
     <span> </span>
-    <a @onclick="() => banReporter(7)" href="javascript:void(0)">1w</a>
+    <a @onclick="() => banReporter(2)" href="javascript:void(0)">2h</a>
     <span> </span>
-    <a @onclick="() => banReporter(31)" href="javascript:void(0)">1m</a>
+    <a @onclick="() => banReporter(1 * 24)" href="javascript:void(0)">1d</a>
     <span> </span>
-    <a @onclick="() => banReporter(365)" href="javascript:void(0)">1yr</a>
+    <a @onclick="() => banReporter(7 * 24)" href="javascript:void(0)">1w</a>
+    <span> </span>
+    <a @onclick="() => banReporter(31 * 24)" href="javascript:void(0)">1m</a>
+    <span> </span>
+    <a @onclick="() => banReporter(365 * 24)" href="javascript:void(0)">1yr</a>
     <span> </span>
-    <a @onclick="() => banReporter(99999999)" href="javascript:void(0)">273,972.6 yrs</a>
     <br/>
-    <a @onclick="@removeReport" href="javascript:void(0)" >Done</a>
+    <a @onclick="@removeReport" href="javascript:void(0)">Done</a>
     <br/>
     @if (report.Type == "op")
     {
@@ -52,6 +58,7 @@
 </div>
 
 @code {
+
     [Parameter]
     [Required]
     public ReportData report { get; set; }
@@ -60,7 +67,8 @@
     private async Task banTarget(int days)
     {
         UserData user = report.UserReported;
-        user.TimeBanned = DateTimeOffset.Now.AddDays(days).ToUnixTimeMilliseconds();
+        user.TimeBanned = DateTimeOffset.Now.ToUnixTimeMilliseconds() + (days * 3600000);
+        user.BanReason = report.ReportReason;
         await UsersRepository.updateUserAsync(user);
         await removeReport();
     }
@@ -68,7 +76,8 @@
     private async Task banReporter(int days)
     {
         UserData user = report.UserReporter;
-        user.TimeBanned = DateTimeOffset.Now.AddDays(days).ToUnixTimeMilliseconds();
+        user.TimeBanned = DateTimeOffset.Now.ToUnixTimeMilliseconds() + (days * 3600000);
+        user.BanReason = "misuse of the report system";
         await UsersRepository.updateUserAsync(user);
         await removeReport();
     }
@@ -76,6 +85,7 @@
     private async Task removeReport()
     {
         await ReportsRepository.deleteReportAsync(report.ReportID);
-        navigationManager.NavigateTo("/sys/reports", true, true);
+        navigationManager.NavigateTo("/sys/click/red/_sys_modmenu_reports", true, true);
     }
+
 }

ImageBoardServerApp/Shared/NavMenu.razor

@@ -1,5 +1,4 @@
-@using ImageBoardServerApp.Util
+@using ImageBoardServerApp.Data.Repository
-@using ImageBoardServerApp.Data.Repository
 @inject AuthenticationStateProvider authStateProvider 
 @inject NavigationManager navManager
 
@@ -9,7 +8,7 @@
     </button>
     <div class="container-fluid" id="maintitle" href="/">
         <img src="img/static/logo_trans.png" width="32" height="32" alt="Logo"/>
-        <a class="navbar-brand" id="logo" href="/">BulletBoard @ver</a>
+        <a class="navbar-brand" id="logo" href="/">BulletBoard</a>
     </div>
 </div>
 
@@ -68,8 +67,6 @@
 </div>
 
 @code {
-    public string ver { get; set; } = TheManager.version;
-
     private bool collapseNavMenu = true;
 
     private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;

ImageBoardServerApp/Util/TheManager.cs

@@ -6,7 +6,7 @@ namespace ImageBoardServerApp.Util;
 
 public class TheManager
 {
-    public static string version = "1.0.0-c1";
+    public static string version = "v1.0.0-rc1";
 
     private static long getDiff(PostData post)
     {
@@ -38,14 +38,17 @@ public class TheManager
 
     public static async Task bumpThreads(BoardData board)
     {
+        Console.WriteLine("Bumping..");
         List<PostData> sortedThreads = await getPostList(board.Tag);
         if (sortedThreads.Count > board.maxThreads + 1)
         {
-            for (int i = board.maxThreads + 1; i >= sortedThreads.Count; ++i)
+            Console.WriteLine("Pruning..");
+            foreach (var pd in sortedThreads.TakeLast(sortedThreads.Count() - board.maxThreads))
             {
-                if (sortedThreads[i].IsSticky)
+                if (pd.IsSticky)
                     continue;
-                await deleteThread(sortedThreads[i]);
+                Console.WriteLine($"Removing Post{pd.PostID}");
+                await deleteThread(pd);
             }
         }
     }
@@ -111,8 +114,8 @@ public class TheManager
 
     public static DateTime ConvertToDateTime(long timestamp)
     {
-        DateTime unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        DateTime dateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-        DateTime date = unixEpoch.AddSeconds(timestamp);
+        dateTime = dateTime.AddMilliseconds(timestamp).ToLocalTime();
-        return date;
+        return dateTime;
     }
 }