Merge branch 'main' into dependabot/npm_and_yarn/r2-worker/npm_and_ya…

…rn-07a849e1ae

.github/workflows/build-and-publish.yml

@@ -7,6 +7,8 @@ on:
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
+    permissions:
+      packages: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -65,7 +67,7 @@ jobs:
 
       - name: Restore, Build and Test
         run: |
-          dotnet nuget add source https://nuget.pkg.github.com/atas/index.json -n github --store-password-in-clear-text
+          dotnet nuget add source --username atas --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/atas/index.json"
           dotnet restore
           dotnet build --no-restore
           dotnet test --no-build --verbosity normal --filter FullyQualifiedName~Tests
@@ -74,13 +76,13 @@ jobs:
         run: dotnet publish --configuration Release --output ./publish
 
       - name: Archive Published App
-        run: tar -czf swpapp.tar.gz -C ./publish .
+        run: tar -czf swpserver.tar.gz -C ./publish .
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: swpapp
-          path: swpapp.tar.gz
+          name: swpserver
+          path: swpserver.tar.gz
 
   release:
     runs-on: ubuntu-latest
@@ -97,7 +99,7 @@ jobs:
       - name: Download artifact
         uses: actions/download-artifact@v3
         with:
-          name: swpapp
+          name: swpserver
 
       - name: Set next version
         run: |
@@ -114,8 +116,8 @@ jobs:
 
       - name: Create GitHub Release
         run: |
-          mv swpapp.tar.gz swpapp-$next_version.tar.gz
-          gh release create "v$next_version" swpapp-$next_version.tar.gz\
+          mv swpserver.tar.gz swpserver-$next_version.tar.gz
+          gh release create "v$next_version" swpserver-$next_version.tar.gz\
             --title "Release v$next_version" \
             --notes "$commit_msg"
         env:

README.md

@@ -2,9 +2,13 @@
 
 Server-side application for open-source Swipetor videos swiping web app.
 
-Find more information on the UI side of the project at https://github.com/atas/swipetor-ui
+More information is at www.swipetor.com and on the UI's repo at https://github.com/atas/swipetor-ui
 
-Visit https://demo.swipetor.com for the demo.
+## Demo
+https://demo.swipetor.com
+
+## Setup
+See [Setup](docs/setup.md)
 
 ## Dual Licensing
 
@@ -14,4 +18,4 @@ Visit https://demo.swipetor.com for the demo.
       PR back for any improvements.
     - This license restricts multi-tenant or multi-domain usage.
 - **Dual Licensing**: Please contact at www.swipetor.com.
-- 
+

SwipetorApp/AppDefaults.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Logging;
-using WebAppShared.Types;
+using WebLibServer.Types;
 
 namespace SwipetorApp;
 

SwipetorApp/Areas/Admin/HubsController.cs

@@ -10,8 +10,8 @@
 using SwipetorApp.Services.Contexts;
 using SwipetorApp.Services.PhotoServices;
 using SwipetorApp.System.UserRoleAuth;
-using WebAppShared.DI;
-using WebAppShared.Photos;
+using WebLibServer.DI;
+using WebLibServer.Photos;
 
 namespace SwipetorApp.Areas.Admin;
 

SwipetorApp/Areas/Admin/ViewModels/HubsAddEditViewModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Http;
 using SwipetorApp.Models.DbEntities;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Admin.ViewModels;
 

SwipetorApp/Areas/Api/AuthApi.cs

@@ -10,9 +10,9 @@
 using SwipetorApp.Services.Auth;
 using SwipetorApp.Services.Contexts;
 using SwipetorApp.Services.Users;
-using WebAppShared.Contexts;
-using WebAppShared.Exceptions;
-using WebAppShared.Utils;
+using WebLibServer.Contexts;
+using WebLibServer.Exceptions;
+using WebLibServer.Utils;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/CommentsApi.cs

@@ -13,8 +13,8 @@
 using SwipetorApp.Services.RateLimiter;
 using SwipetorApp.Services.RateLimiter.Rules;
 using SwipetorApp.Services.SqlQueries;
-using WebAppShared.Exceptions;
-using WebAppShared.Security;
+using WebLibServer.Exceptions;
+using WebLibServer.Security;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/EmailApi.cs

@@ -6,7 +6,7 @@
 using SwipetorApp.Services.Contexts;
 using SwipetorApp.Services.Emailing;
 using SwipetorApp.System.UserRoleAuth;
-using WebAppShared.Metrics;
+using WebLibServer.Metrics;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/MediasApi.cs

@@ -21,10 +21,10 @@
 using SwipetorApp.Services.VideoServices;
 using SwipetorApp.Services.WebPush;
 using SwipetorApp.System;
-using WebAppShared.DI;
-using WebAppShared.Disk;
-using WebAppShared.Exceptions;
-using WebAppShared.Uploaders;
+using WebLibServer.DI;
+using WebLibServer.Disk;
+using WebLibServer.Exceptions;
+using WebLibServer.Uploaders;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/Models/AuthEmailLoginCodeModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api.Models;
 

SwipetorApp/Areas/Api/Models/AuthEnterLoginCodeReqModel.cs

@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api.Models;
 

SwipetorApp/Areas/Api/Models/DraftPostAddPhotoViewModel.cs

@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api.Models;
 

SwipetorApp/Areas/Api/Models/MyApiCustomDomainReqModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api.Models;
 

SwipetorApp/Areas/Api/Models/MyApiProfileDescReqModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api.Models;
 

SwipetorApp/Areas/Api/Models/UserApiBecomeCreatorReqModel.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api.Models;
 

SwipetorApp/Areas/Api/MyApi.cs

@@ -16,10 +16,10 @@
 using SwipetorApp.Services.PhotoServices;
 using SwipetorApp.Services.Users;
 using SwipetorApp.System;
-using WebAppShared.DI;
-using WebAppShared.Exceptions;
-using WebAppShared.WebSys;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.DI;
+using WebLibServer.Exceptions;
+using WebLibServer.WebSys;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/PhotosApi.cs

@@ -8,9 +8,9 @@
 using SwipetorApp.Services.Config;
 using SwipetorApp.Services.Contexts;
 using SwipetorApp.Services.PhotoServices;
-using WebAppShared.Exceptions;
-using WebAppShared.Photos;
-using WebAppShared.Uploaders;
+using WebLibServer.Exceptions;
+using WebLibServer.Photos;
+using WebLibServer.Uploaders;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/PmApi.cs

@@ -17,8 +17,8 @@
 using SwipetorApp.Services.Pm;
 using SwipetorApp.Services.SqlQueries;
 using SwipetorApp.Services.SqlQueries.Models;
-using WebAppShared.Exceptions;
-using WebAppShared.Metrics;
+using WebLibServer.Exceptions;
+using WebLibServer.Metrics;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/PostsApi.cs

@@ -20,9 +20,9 @@
 using SwipetorApp.Services.SqlQueries;
 using SwipetorApp.Services.VideoServices;
 using SwipetorApp.System;
-using WebAppShared.DI;
-using WebAppShared.Exceptions;
-using WebAppShared.Metrics;
+using WebLibServer.DI;
+using WebLibServer.Exceptions;
+using WebLibServer.Metrics;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/Api/UsersApi.cs

@@ -20,9 +20,9 @@
 using SwipetorApp.Services.SqlQueries;
 using SwipetorApp.Services.Users;
 using SwipetorApp.System;
-using WebAppShared.Exceptions;
-using WebAppShared.Extensions;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.Exceptions;
+using WebLibServer.Extensions;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.Api;
 

SwipetorApp/Areas/HostMaster/BatchController.cs

@@ -6,9 +6,9 @@
 using SwipetorApp.Models.Enums;
 using SwipetorApp.Models.Extensions;
 using SwipetorApp.Services.Contexts;
-using WebAppShared.DI;
-using WebAppShared.SharedLogic.Sitemaps;
-using WebAppShared.Types;
+using WebLibServer.DI;
+using WebLibServer.SharedLogic.Sitemaps;
+using WebLibServer.Types;
 
 namespace SwipetorApp.Areas.HostMaster;
 

SwipetorApp/Areas/HostMaster/Models/ScraperSaveUserReqModel.cs

@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using WebAppShared.WebSys.MvcAttributes;
+using WebLibServer.WebSys.MvcAttributes;
 
 namespace SwipetorApp.Areas.HostMaster.Models;
 

SwipetorApp/Controllers/FallbackController.cs

@@ -7,7 +7,7 @@
 using SwipetorApp.Models.ViewModels;
 using SwipetorApp.Services.Contexts;
 using SwipetorApp.Services.Users;
-using WebAppShared.Photos;
+using WebLibServer.Photos;
 
 namespace SwipetorApp.Controllers;
 

SwipetorApp/Controllers/HomeController.cs

@@ -13,10 +13,10 @@
 using SwipetorApp.Services.Contexts;
 using SwipetorApp.Services.Emailing;
 using SwipetorApp.System.MvcFilters;
-using WebAppShared.Contexts;
-using WebAppShared.Photos;
-using WebAppShared.Types;
-using WebAppShared.Utils;
+using WebLibServer.Contexts;
+using WebLibServer.Photos;
+using WebLibServer.Types;
+using WebLibServer.Utils;
 
 namespace SwipetorApp.Controllers;
 

SwipetorApp/Controllers/PostsController.cs

@@ -7,9 +7,9 @@
 using SwipetorApp.Models.Extensions;
 using SwipetorApp.Models.ViewModels;
 using SwipetorApp.Services.Contexts;
-using WebAppShared.Photos;
-using WebAppShared.Types;
-using WebAppShared.Utils;
+using WebLibServer.Photos;
+using WebLibServer.Types;
+using WebLibServer.Utils;
 
 namespace SwipetorApp.Controllers;
 

SwipetorApp/Models/DTOs/PhotoDto.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using SwipetorApp.Services.Config.UIConfigs;
-using WebAppShared.Photos;
+using WebLibServer.Photos;
 
 namespace SwipetorApp.Models.DTOs;
 

SwipetorApp/Models/DTOs/SubPlanDto.cs

@@ -1,4 +1,4 @@
-using WebAppShared.SharedLogic.Fx;
+using WebLibServer.SharedLogic.Fx;
 
 namespace SwipetorApp.Models.DTOs;
 

SwipetorApp/Models/DTOs/VideoDto.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using SwipetorApp.Models.DbEntities;
-using WebAppShared.Videos;
+using WebLibServer.Videos;
 
 namespace SwipetorApp.Models.DTOs;
 

SwipetorApp/Models/DbEntities/AuditLog.cs

@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 using SwipetorApp.Models.Enums;
 using Toolbelt.ComponentModel.DataAnnotations.Schema.V5;
-using WebAppShared.Types;
+using WebLibServer.Types;
 
 namespace SwipetorApp.Models.DbEntities;
 

SwipetorApp/Models/DbEntities/Comment.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using Toolbelt.ComponentModel.DataAnnotations.Schema.V5;
-using WebAppShared.Types;
+using WebLibServer.Types;
 
 namespace SwipetorApp.Models.DbEntities;
 

SwipetorApp/Models/DbEntities/DbCx.cs

@@ -13,10 +13,10 @@
 using Newtonsoft.Json;
 using SwipetorApp.Models.Enums;
 using Toolbelt.ComponentModel.DataAnnotations;
-using WebAppShared.Contexts;
-using WebAppShared.SharedLogic.Fx;
-using WebAppShared.Videos;
-using WebAppShared.WebSys;
+using WebLibServer.Contexts;
+using WebLibServer.SharedLogic.Fx;
+using WebLibServer.Videos;
+using WebLibServer.WebSys;
 
 namespace SwipetorApp.Models.DbEntities;
 

SwipetorApp/Models/DbEntities/FavPost.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using Toolbelt.ComponentModel.DataAnnotations.Schema.V5;
-using WebAppShared.Types;
+using WebLibServer.Types;
 
 namespace SwipetorApp.Models.DbEntities;
 

SwipetorApp/Models/DbEntities/Hub.cs

@@ -3,7 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using Toolbelt.ComponentModel.DataAnnotations.Schema.V5;
-using WebAppShared.Types;
+using WebLibServer.Types;
 
 namespace SwipetorApp.Models.DbEntities;