eep

.
test
2024-11-06 01:56:00 +01:00 · 2024-11-06 01:48:37 +01:00 · 2024-11-06 01:43:21 +01:00 · 2024-11-06 01:07:54 +01:00 · 2024-11-06 01:07:23 +01:00 · 2024-11-06 01:06:41 +01:00
14 changed files with 226 additions and 17 deletions
--- a/Iceshrimp.Backend/Controllers/Web/VersionController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/VersionController.cs
@ -0,0 +1,33 @@
 using System.Net;
 using System.Net.Mime;
 using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Middleware;
 using Iceshrimp.Shared.Helpers;
 using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 namespace Iceshrimp.Backend.Controllers.Web;
 [ApiController]
 [Authenticate]
 [EnableRateLimiting("sliding")]
 [Route("/api/iceshrimp/version")]
 [Produces(MediaTypeNames.Application.Json)]
 public class VersionController : ControllerBase
 {
 	[HttpGet]
 	[ProducesResults(HttpStatusCode.OK)]
 	public Task<VersionResponse> GetVersion()
 	{
 		var version = VersionHelpers.GetVersionInfo();
 		return Task.FromResult(new VersionResponse
 		{
 			Codename   = version.Codename,
 			CommitHash = version.CommitHash,
 			Edition    = version.Edition,
 			Version    = version.Version,
 			RawVersion = version.RawVersion
 		});
 	}
 }
--- a/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml
+++ b/Iceshrimp.Backend/Pages/Shared/FrontendSPA.cshtml
@ -16,6 +16,9 @@
    <link rel="stylesheet" href="~/_content/Iceshrimp.Assets.PhosphorIcons/css/ph-fill.css" asp-append-version="true"/>
    <link rel="icon" type="image/png" href="~/favicon.png" asp-append-version="true"/>
    <link rel="stylesheet" href="~/Iceshrimp.Frontend.styles.css" asp-append-version="true"/>
    <link href="manifest.webmanifest" rel="manifest" />
    <link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
    <link rel="apple-touch-icon" sizes="192x192" href="icon-192.png" />
 </head>
 <body>
@ -38,6 +41,7 @@
 </div>
 <script src="~/_framework/blazor.webassembly.js" asp-append-version="true"></script>
 <script>navigator.serviceWorker.register('service-worker.js');</script>
 </body>
 </html>
--- a/Iceshrimp.Frontend/Components/TimelineNote.razor
+++ b/Iceshrimp.Frontend/Components/TimelineNote.razor
@ -14,7 +14,7 @@ else
                    <Line></Line>
                </div>
                <div class="note">
-                    <NoteComponent Note="Note.Reply" Indented="true"/>
+                    <NoteComponent Note="Note.Reply" Indented="true" AsQuote="true"/>
                </div>
            </div>
        }
--- a/Iceshrimp.Frontend/Components/UpdateNotifier.razor
+++ b/Iceshrimp.Frontend/Components/UpdateNotifier.razor
@ -0,0 +1,8 @@
 <div class="body">
    <h3>UpdateNotifier</h3>
    New version available, pls update!
    aaa
 </div>
@code {
 }
--- a/Iceshrimp.Frontend/Core/ControllerModels/VersionControllerModel.cs
+++ b/Iceshrimp.Frontend/Core/ControllerModels/VersionControllerModel.cs
@ -0,0 +1,10 @@
 using Iceshrimp.Frontend.Core.Services;
 using Iceshrimp.Shared.Schemas.Web;
 namespace Iceshrimp.Frontend.Core.ControllerModels;
 internal class VersionControllerModel(ApiClient api)
 {
 	public Task<VersionResponse> GetVersion() =>
 		api.Call<VersionResponse>(HttpMethod.Get, "/version");
 }
--- a/Iceshrimp.Frontend/Core/Services/ApiService.cs
+++ b/Iceshrimp.Frontend/Core/Services/ApiService.cs
@ -18,6 +18,7 @@ internal class ApiService(ApiClient client)
 	public readonly MiscControllerModel          Misc           = new(client);
 	public readonly ProfileControllerModel       Profile        = new(client);
 	public readonly FilterControllerModel        Filters        = new(client);
 	public readonly VersionControllerModel       Version        = new(client);
 	public void SetBearerToken(string token) => client.SetToken(token);
 }
--- a/Iceshrimp.Frontend/Core/Services/UpdateService.cs
+++ b/Iceshrimp.Frontend/Core/Services/UpdateService.cs
@ -0,0 +1,50 @@
 using System.Timers;
 using Iceshrimp.Frontend.Core.Miscellaneous;
 using Iceshrimp.Shared.Helpers;
 using Iceshrimp.Shared.Schemas.Web;
 using Timer = System.Timers.Timer;
 namespace Iceshrimp.Frontend.Core.Services;
 internal class UpdateService
 {
 	private readonly ApiService             _api;
 	private readonly ILogger<UpdateService> _logger;
 	public UpdateService(ApiService api, ILogger<UpdateService> logger)
 	{
 		_api                =  api;
 		_logger             =  logger;
 		UpdateTimer         =  new Timer { AutoReset = true, Enabled = true, Interval = 60000, };
 		UpdateTimer.Elapsed += (_, _) => CheckVersion();
 		CheckVersion();
 	}
 	private VersionInfo FrontendVersion { get; } = VersionHelpers.GetVersionInfo();
 	private Timer       UpdateTimer     { get; }
 	private async Task<VersionResponse?> GetVersion()
 	{
 		try
 		{
 			var backendVersion = await _api.Version.GetVersion();
 			_logger.LogInformation("Successfully fetched backend version.");
 			return backendVersion;
 		}
 		catch (ApiException e)
 		{
 			_logger.LogError(e, "Failed to fetch backend version.");
 			return null;
 		}
 	}
 	private async void CheckVersion()
 	{
 		var version = await GetVersion();
 		if (version is null) return;
 		if (version.Version != FrontendVersion.Version)
 		{
 			throw new NotImplementedException();
 		}
 	}
 }
--- a/Iceshrimp.Frontend/Iceshrimp.Frontend.csproj
+++ b/Iceshrimp.Frontend/Iceshrimp.Frontend.csproj
@ -12,34 +12,45 @@
    </PropertyGroup>
    <ItemGroup>
-        <None Update="Components/MfmText.razor.css" CssScope="mfm" />
+        <None Update="Components/MfmText.razor.css" CssScope="mfm"/>
        <None Include="wwwroot\icon-512.png" />
    </ItemGroup>
    <ItemGroup>
-        <ProjectReference Include="..\Iceshrimp.Parsing\Iceshrimp.Parsing.fsproj" />
+        <ProjectReference Include="..\Iceshrimp.Parsing\Iceshrimp.Parsing.fsproj"/>
-        <ProjectReference Include="..\Iceshrimp.Shared\Iceshrimp.Shared.csproj" />
+        <ProjectReference Include="..\Iceshrimp.Shared\Iceshrimp.Shared.csproj"/>
    </ItemGroup>
    <ItemGroup>
-        <PackageReference Include="AngleSharp" Version="1.1.2" />
+        <PackageReference Include="AngleSharp" Version="1.1.2"/>
-        <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
+        <PackageReference Include="Blazored.LocalStorage" Version="4.5.0"/>
-        <PackageReference Include="BlazorIntersectionObserver" Version="3.1.0" />
+        <PackageReference Include="BlazorIntersectionObserver" Version="3.1.0"/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.10"/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10"/>
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.10"/>
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.10"/>
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10"/>
-        <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1"/>
        <PackageReference Include="TypedSignalR.Client" Version="3.6.0" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
-          <PrivateAssets>all</PrivateAssets>
+            <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="Iceshrimp.Assets.PhosphorIcons" Version="2.1.1" />
+        <PackageReference Include="Iceshrimp.Assets.PhosphorIcons" Version="2.1.1"/>
    </ItemGroup>
    <!-- Transitive dependency version overrides to patch security vulnerabilities -->
    <ItemGroup>
-        <PackageReference Include="MessagePack" Version="2.5.187" />
+        <PackageReference Include="MessagePack" Version="2.5.187"/>
    </ItemGroup>
    <!-- Required for PWA Features -->
    <PropertyGroup>
        <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
    </PropertyGroup>
    <ItemGroup>
        <ServiceWorker Include="wwwroot\service-worker.js"
                       PublishedContent="wwwroot\service-worker.published.js"/>
    </ItemGroup>
    <ItemGroup>
--- a/Iceshrimp.Frontend/Startup.cs
+++ b/Iceshrimp.Frontend/Startup.cs
@ -28,6 +28,7 @@ builder.Services.AddSingleton<EmojiService>();
 builder.Services.AddSingleton<VersionService>();
 builder.Services.AddSingleton<MessageService>();
 builder.Services.AddSingleton<GlobalComponentSvc>();
 builder.Services.AddSingleton<UpdateService>();
 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddBlazoredLocalStorageAsSingleton();
--- a/Iceshrimp.Frontend/wwwroot/icon-512.png
+++ b/Iceshrimp.Frontend/wwwroot/icon-512.png
--- a/Iceshrimp.Frontend/wwwroot/manifest.webmanifest
+++ b/Iceshrimp.Frontend/wwwroot/manifest.webmanifest
@ -0,0 +1,22 @@
 {
  "name": "Iceshrimp.Frontend",
  "short_name": "Iceshrimp.Frontend",
  "id": "./",
  "start_url": "./",
  "display": "standalone",
  "background_color": "#ffffff",
  "theme_color": "#03173d",
  "prefer_related_applications": false,
  "icons": [
    {
      "src": "icon-512.png",
      "type": "image/png",
      "sizes": "512x512"
    },
    {
      "src": "icon-192.png",
      "type": "image/png",
      "sizes": "192x192"
    }
  ]
 }
--- a/Iceshrimp.Frontend/wwwroot/service-worker.js
+++ b/Iceshrimp.Frontend/wwwroot/service-worker.js
@ -0,0 +1,4 @@
 // In development, always fetch from the network and do not enable offline support.
 // This is because caching would make development more difficult (changes would not
 // be reflected on the first load after each change).
 self.addEventListener('fetch', () => { });
--- a/Iceshrimp.Frontend/wwwroot/service-worker.published.js
+++ b/Iceshrimp.Frontend/wwwroot/service-worker.published.js
@ -0,0 +1,55 @@
 // Caution! Be sure you understand the caveats before publishing an application with
 // offline support. See https://aka.ms/blazor-offline-considerations
 self.importScripts('./service-worker-assets.js');
 self.addEventListener('install', event => event.waitUntil(onInstall(event)));
 self.addEventListener('activate', event => event.waitUntil(onActivate(event)));
 self.addEventListener('fetch', event => event.respondWith(onFetch(event)));
 const cacheNamePrefix = 'offline-cache-';
 const cacheName = `${cacheNamePrefix}${self.assetsManifest.version}`;
 const offlineAssetsInclude = [ /\.dll$/, /\.pdb$/, /\.wasm/, /\.html/, /\.js$/, /\.json$/, /\.css$/, /\.woff$/, /\.png$/, /\.jpe?g$/, /\.gif$/, /\.ico$/, /\.blat$/, /\.dat$/ ];
 const offlineAssetsExclude = [ /^service-worker\.js$/ ];
 // Replace with your base path if you are hosting on a subfolder. Ensure there is a trailing '/'.
 const base = "/";
 const baseUrl = new URL(base, self.origin);
 const manifestUrlList = self.assetsManifest.assets.map(asset => new URL(asset.url, baseUrl).href);
 async function onInstall(event) {
    console.info('Service worker: Install');
    // Fetch and cache all matching items from the assets manifest
    const assetsRequests = self.assetsManifest.assets
        .filter(asset => offlineAssetsInclude.some(pattern => pattern.test(asset.url)))
        .filter(asset => !offlineAssetsExclude.some(pattern => pattern.test(asset.url)))
        .map(asset => new Request(asset.url, { integrity: asset.hash, cache: 'no-cache' }));
    await caches.open(cacheName).then(cache => cache.addAll(assetsRequests));
 }
 async function onActivate(event) {
    console.info('Service worker: Activate');
    // Delete unused caches
    const cacheKeys = await caches.keys();
    await Promise.all(cacheKeys
        .filter(key => key.startsWith(cacheNamePrefix) && key !== cacheName)
        .map(key => caches.delete(key)));
 }
 async function onFetch(event) {
    let cachedResponse = null;
    if (event.request.method === 'GET') {
        // For all navigation requests, try to serve index.html from cache,
        // unless that request is for an offline resource.
        // If you need some URLs to be server-rendered, edit the following check to exclude those URLs
        const shouldServeIndexHtml = event.request.mode === 'navigate'
            && !manifestUrlList.some(url => url === event.request.url);
        const request = shouldServeIndexHtml ? 'index.html' : event.request;
        const cache = await caches.open(cacheName);
        cachedResponse = await cache.match(request);
    }
    return cachedResponse || fetch(event.request);
 }
--- a/Iceshrimp.Shared/Schemas/Web/VersionResponse.cs
+++ b/Iceshrimp.Shared/Schemas/Web/VersionResponse.cs
@ -0,0 +1,10 @@
 namespace Iceshrimp.Shared.Schemas.Web;
 public class VersionResponse
 {
 	public required string  Codename   { get; set; }
 	public required string  Edition    { get; set; }
 	public required string? CommitHash { get; set; }
 	public required string  RawVersion { get; set; }
 	public required string  Version    { get; set; }
 }
Author	SHA1	Message	Date
Lilian	c433286cab	eep	2024-11-06 01:56:00 +01:00
Lilian	d359897bcd	.	2024-11-06 01:48:37 +01:00
Lilian	bf59339a4c	test	2024-11-06 01:43:21 +01:00
Lilian	f3c82e3f05	test	2024-11-06 01:07:54 +01:00
Lilian	fa1590512f	[frontend/core] Add version controller model	2024-11-06 01:07:23 +01:00
Lilian	69f0727138	[backend/web] Add version endpoint	2024-11-06 01:06:41 +01:00
Lilian	3ad40f8d2e	test test	2024-11-04 22:21:55 +01:00
Lilian	d6717890ec	[frontend/components] Disable interacting with inline-replies	2024-11-03 19:39:55 +01:00