Merge pull request #4 from yawaflua/yawaflua-patch-1

Удаление призыва к голосу

.github/workflows/dotnet.yml

@@ -5,9 +5,9 @@ name: .NET
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "*" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "*" ]
 
 jobs:
   build:

Controllers/HomeController.cs

@@ -79,7 +79,7 @@ namespace yaflay.ru.Controllers
             }
             string responseBody = await message.Content.ReadAsStringAsync();
             JsonNode response = JsonNode.Parse(responseBody);
-            if (response["user"] != null || Startup.ownerId.FirstOrDefault(response["user"]?["id"].ToString()) == null)
+            if (response["user"] != null || Startup.ownerId?.FirstOrDefault(response["user"]?["id"].ToString()) == null)
             {
                 Redirects redirects = new()
                 {
@@ -109,7 +109,7 @@ namespace yaflay.ru.Controllers
             }
             string responseBody = await message.Content.ReadAsStringAsync();
             JsonNode response = JsonNode.Parse(responseBody);
-            if (response["user"] != null || Startup.ownerId.FirstOrDefault(response["user"]?["id"].ToString()) == null )
+            if (response["user"] != null || Startup.ownerId?.FirstOrDefault(response["user"]?["id"].ToString()) == null )
             {
                 try
                 {
@@ -235,7 +235,7 @@ namespace yaflay.ru.Controllers
             await ctx.SaveChangesAsync();
             return Ok(body.melon);
         }
-        [HttpGet("{uri}")]
+        [HttpGet("r/{uri}")]
         public async Task<IActionResult> FromGitHub(string uri)
         {
             Console.WriteLine(uri);
@@ -248,7 +248,7 @@ namespace yaflay.ru.Controllers
                 if (fromCache != null)
                     cache.Set($"redirectsWithUrl-{uri}", (object)fromCache, DateTime.Now.AddMinutes(10));
             }
-            Console.WriteLine(fromCache.ToString());
+            Console.WriteLine(fromCache?.ToString());
             return Redirect(fromCache?.redirectTo ?? "/404");
            
         } 

Pages/Authorize.cshtml

@@ -61,7 +61,7 @@
             Console.Error.WriteLine("debug: START \\/ \nDon't worry, this message is not bad as you think");
             Console.Error.WriteLine("error: DiscordAuthorize is not worked");
             Console.Error.WriteLine($"debug: Body from discord: {body}\ndebug: Sended data to discord: {message.Content.ReadAsStringAsync().Result}");
-            Console.Error.WriteLine($"info: Check environment data: \nClientId={Startup.clientId}\nClientSecret={Startup.clientSecret}\nRedirectUrl={Startup.redirectUrl}\nOwnerId={Startup.ownerId} ");
+            Console.Error.WriteLine($"info: Check environment data: \nClientId={Startup.clientId}\nClientSecret={Startup.clientSecret}\nRedirectUrl={Startup.redirectUrl}\nOwnerId={String.Join(",", Startup.ownerId)} ");
             Console.Error.WriteLine("info: If any data is null and you set data in environment or appsettings.json, please create issue with this debug messages ");
             Console.Error.WriteLine("debug: END /\\");
         }

Pages/Index.cshtml

@@ -1,4 +1,4 @@
-@page 
+@page "{uri?}"
 @model IndexModel
 @{
     ViewData["Title"] = "yawaflua";

Pages/Index.cshtml.cs

@@ -1,22 +1,46 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Caching.Memory;
+using yaflay.ru.Models;
+using yaflay.ru.Models.Tables;
 
 namespace yaflay.ru.Pages
 {
     public class IndexModel : PageModel
     {
         private readonly ILogger<IndexModel> _logger;
-        //public string? uri { get; set; } = null;
-        public IndexModel(ILogger<IndexModel> logger)
+        public IMemoryCache cache;
+        public AppDbContext ctx;
+        public string? uri { get; set; } = null;
+        public IndexModel(ILogger<IndexModel> logger, IMemoryCache cache, AppDbContext ctx)
         {
             _logger = logger;
-            
+            this.cache = cache;
+            this.ctx = ctx;
         }
 
-        public void OnGet(/**string? uri**/)
+        public void OnGet(string? uri)
         {
-            Page();
-            //this.uri = uri ?? null;
+            
+            this.uri = uri ?? null;
+            Console.WriteLine(uri);
+            if (this.uri != null)
+            {
+                Redirects? fromCache = cache.Get<Redirects>($"redirectsWithUrl-{uri}") ?? null;
+                if (fromCache == null)
+                {
+                    fromCache = ctx.Redirects.FirstOrDefault(k => k.uri == uri);
+                    Console.WriteLine("Im here!");
+                    if (fromCache != null)
+                        cache.Set($"redirectsWithUrl-{uri}", (object)fromCache, DateTime.Now.AddMinutes(10));
+                }
+                Console.WriteLine(fromCache?.ToString());
+                Response.Redirect(fromCache?.redirectTo ?? "/404");
+            }
+            else
+            {
+                Page();
+            }
         }
 
     }

Pages/Shared/_Layout.cshtml

@@ -114,6 +114,7 @@
             </div>
             }
         }
+        
     </div>
     <div class="container">
         <main role="main" class="pb-3">
@@ -141,4 +142,4 @@
 
     @await RenderSectionAsync("Scripts", required: false)
 </body>
-</html>
+</html>

README.md

@@ -1,6 +1,7 @@
 # Hello, there!
-[![](https://img.shields.io/website?url=https%3A%2F%2Fyawaflua.ru&style=for-the-badge)](https://yawaflua.ru)
+[![](https://img.shields.io/website?url=https%3A%2F%2Fyawaflua.ru)](https://yawaflua.ru)
 [![Publish Docker image](https://github.com/yawaflua/yaflay.ru/actions/workflows/docker-image.yml/badge.svg)](https://github.com/yawaflua/yaflay.ru/actions/workflows/docker-image.yml)
+![](https://img.shields.io/github/license/yawaflua/yaflay.ru)
 
 This is my custom site, with url: [yawaflua.ru](https://yawaflua.ru/)
 
@@ -15,13 +16,18 @@ If you wanna help me, create Issue or Pull request.
 - Main page is downloaded from user`s github readme(like [this](https://github.com/yawaflua/yawaflua))
 - Blog system with loading comments after render a page, for optimization
 - Admin panel for blog`s, can make article for blog and write to db new redirect setting(Discord OAuth2)
-- Future plans to make this project fully manageable from a docker-compose file (.env file or environment settings are supported by Docker)
+- Set discord oauth2 and database settings from .env(docker-compose file, another docker-type function) or appsettings.json(only one from this)
 
 # How to start?
 You should to use this command for download this package from ghcr:
-```cli
-docker pull ghcr.io/yawaflua/yaflay.ru:master
-```
+### For latest version
+  ```cli
+  docker pull ghcr.io/yawaflua/yaflay.ru:master
+  ```
+### For stable version
+  ```cli
+  docker pull ghcr.io/yawaflua/yaflay.ru:latest
+  ```
 After that create docker-compose file, for example:
 ```yml
 version: "3.9"

Startup.cs

@@ -57,6 +57,10 @@ namespace yaflay.ru
             if (readmeFile == null)
             {
                 readmeFile = configuration.GetValue<string>("readmeFile");
+                if (readmeFile == null)
+                {
+                    throw new ArgumentException("ReadmeFile link is null");
+                }
             }
             
         }