mirror of
https://github.com/CannedNet/CannedNet.git
synced 2026-10-25 15:09:23 -07:00
finish migration, added [Authorize]
This commit is contained in:
Lapis
@@ -9,6 +9,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.8" />
|
||||
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.2.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.1" />
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
{
|
||||
"Accounts": "https://accounts.lapis.codes",
|
||||
"AI": "https://ai.lapis.codes",
|
||||
"API": "https://api.lapis.codes",
|
||||
"Auth": "https://auth.lapis.codes",
|
||||
"BugReporting": "https://bugreporting.lapis.codes",
|
||||
"Cards": "https://cards.lapis.codes",
|
||||
"CDN": "https://cdn.lapis.codes",
|
||||
"Chat": "https://chatrr.lapis.codes",
|
||||
"Clubs": "https://clubs.lapis.codes",
|
||||
"CMS": "https://cms.lapis.codes",
|
||||
"Commerce": "https://commerce.lapis.codes",
|
||||
"Data": "https://data.lapis.codes",
|
||||
"DataCollection": "https://datacollection.lapis.codes",
|
||||
"Discovery": "https://discovery.lapis.codes",
|
||||
"Econ": "https://econ.lapis.codes",
|
||||
"GameLogs": "https://gamelogs.lapis.codes",
|
||||
"Geo": "https://geo.lapis.codes",
|
||||
"Images": "https://img.lapis.codes",
|
||||
"Leaderboard": "https://leaderboard.lapis.codes",
|
||||
"Link": "https://link.lapis.codes",
|
||||
"Lists": "https://lists.lapis.codes",
|
||||
"Matchmaking": "https://match.lapis.codes",
|
||||
"Moderation": "https://moderation.lapis.codes",
|
||||
"Notifications": "https://notify.lapis.codes",
|
||||
"PlatformNotifications": "https://platformnotifications.lapis.codes",
|
||||
"PlayerSettings": "https://playersettings.lapis.codes",
|
||||
"RoomComments": "https://roomcomments.lapis.codes",
|
||||
"RoomieIntegrations": "https://roomieintegrations.lapis.codes",
|
||||
"Rooms": "https://rooms.lapis.codes",
|
||||
"Storage": "https://storage.lapis.codes",
|
||||
"Strings": "https://strings.lapis.codes",
|
||||
"StringsCDN": "https://strings-cdn.lapis.codes",
|
||||
"Studio": "https://studio.lapis.codes",
|
||||
"Thorn": "https://thorn.lapis.codes",
|
||||
"Videos": "https://videos.lapis.codes",
|
||||
"WWW": "https://lapis.codes"
|
||||
"Accounts": "https://cannednet.lapis.codes/accounts",
|
||||
"AI": "https://cannednet.lapis.codes/ai",
|
||||
"API": "https://cannednet.lapis.codes/api",
|
||||
"Auth": "https://cannednet.lapis.codes/auth",
|
||||
"BugReporting": "https://cannednet.lapis.codes/bugreporting",
|
||||
"Cards": "https://cannednet.lapis.codes/cards",
|
||||
"CDN": "https://cannednet.lapis.codes/cdn",
|
||||
"Chat": "https://cannednet.lapis.codes/chat",
|
||||
"Clubs": "https://cannednet.lapis.codes/clubs",
|
||||
"CMS": "https://cannednet.lapis.codes/cms",
|
||||
"Commerce": "https://cannednet.lapis.codes/commerce",
|
||||
"Data": "https://cannednet.lapis.codes/data",
|
||||
"DataCollection": "https://cannednet.lapis.codes/datacollection",
|
||||
"Discovery": "https://cannednet.lapis.codes/discovery",
|
||||
"Econ": "https://cannednet.lapis.codes/econ",
|
||||
"GameLogs": "https://cannednet.lapis.codes/gamelogs",
|
||||
"Geo": "https://cannednet.lapis.codes/geo",
|
||||
"Images": "https://cannednet.lapis.codes/img",
|
||||
"Leaderboard": "https://cannednet.lapis.codes/leaderboard",
|
||||
"Link": "https://cannednet.lapis.codes/link",
|
||||
"Lists": "https://cannednet.lapis.codes/lists",
|
||||
"Matchmaking": "https://cannednet.lapis.codes/match",
|
||||
"Moderation": "https://cannednet.lapis.codes/moderation",
|
||||
"Notifications": "https://cannednet.lapis.codes/notify",
|
||||
"PlatformNotifications": "https://cannednet.lapis.codes/platformnotifications",
|
||||
"PlayerSettings": "https://cannednet.lapis.codes/playersettings",
|
||||
"RoomComments": "https://cannednet.lapis.codes/roomcomments",
|
||||
"RoomieIntegrations": "https://cannednet.lapis.codes/roomieintegrations",
|
||||
"Rooms": "https://cannednet.lapis.codes/rooms",
|
||||
"Storage": "https://cannednet.lapis.codes/storage",
|
||||
"Strings": "https://cannednet.lapis.codes/strings",
|
||||
"StringsCDN": "https://cannednet.lapis.codes/stringscdn",
|
||||
"Studio": "https://cannednet.lapis.codes/studio",
|
||||
"Thorn": "https://cannednet.lapis.codes/thorn",
|
||||
"Videos": "https://cannednet.lapis.codes/videos",
|
||||
"WWW": "https://cannednet.lapis.codes"
|
||||
}
|
||||
@@ -2,8 +2,10 @@ using CannedNet.Data;
|
||||
using CannedNet.Hubs;
|
||||
using CannedNet.Services;
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Authentication.JwtBearer;
|
||||
using Microsoft.AspNetCore.SignalR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
|
||||
namespace CannedNet;
|
||||
|
||||
@@ -23,6 +25,7 @@ public static class Program
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
|
||||
builder.Services.ConfigureHttpJsonOptions(options => options.SerializerOptions.PropertyNamingPolicy = null);
|
||||
builder.Services.AddDbContext<AppDbContext>(options => options.UseNpgsql(connectionString));
|
||||
builder.Services.AddSingleton<NotificationService>();
|
||||
@@ -30,12 +33,43 @@ public static class Program
|
||||
builder.Services.AddScoped<JwtTokenService>();
|
||||
builder.Services.AddSignalR();
|
||||
|
||||
builder.Services.AddAuthentication(options =>
|
||||
{
|
||||
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||
options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||
})
|
||||
.AddJwtBearer(options =>
|
||||
{
|
||||
var rsa = Signatures.GetRsaInstance();
|
||||
var securityKey = new RsaSecurityKey(rsa) { KeyId = "7C2F041398671515B0862CB23FAF95B03" };
|
||||
|
||||
options.TokenValidationParameters = new TokenValidationParameters
|
||||
{
|
||||
ValidateIssuerSigningKey = true,
|
||||
IssuerSigningKey = securityKey,
|
||||
ValidateIssuer = true,
|
||||
ValidIssuer = "https://lapis.codes",
|
||||
ValidateAudience = true,
|
||||
ValidAudience = "https://lapis.codes/resources",
|
||||
ValidateLifetime = true,
|
||||
ClockSkew = TimeSpan.Zero,
|
||||
|
||||
// sub is account id
|
||||
NameClaimType = "sub",
|
||||
RoleClaimType = "role"
|
||||
};
|
||||
});
|
||||
|
||||
builder.Services.AddAuthorization();
|
||||
|
||||
WebApplication app = builder.Build();
|
||||
|
||||
app.MapHub<NotificationsHub>("/hub/v1");
|
||||
app.UseHttpsRedirection();
|
||||
//app.UseRequestLogging();
|
||||
app.MapControllers();
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
|
||||
IHubContext<NotificationsHub> hubContext = app.Services.GetRequiredService<IHubContext<NotificationsHub>>();
|
||||
NotificationService.SetHubContext(hubContext);
|
||||
|
||||
@@ -2,6 +2,7 @@ using CannedNet.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Text.Json;
|
||||
using CannedNet.Models;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
@@ -111,246 +112,13 @@ public class APIController : ControllerBase
|
||||
return Results.Json(progressions);
|
||||
}
|
||||
|
||||
[HttpGet("avatar/v4/items")]
|
||||
public async Task<IResult> GetAvatarItemsV4(HttpRequest request, AppDbContext db, JwtTokenService jwtService) {
|
||||
string authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
string token = authHeader.Substring("Bearer ".Length);
|
||||
string? accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out int id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
List<AvatarItem> ownedItems = await db.AvatarItems
|
||||
.Where(i => i.OwnerAccountId == id)
|
||||
.ToListAsync();
|
||||
|
||||
List<object> defaultItems = new List<object>
|
||||
[HttpPost("avatar/v2/set")]
|
||||
[Authorize]
|
||||
public async Task<IResult> SetAvatarV2(HttpRequest request, AppDbContext db, JwtTokenService jwtService)
|
||||
{
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "5d13a7a2-8213-40e6-90a6-efdd76a3fdcb,,,", PlatformMask = -1, FriendlyName = "Flowing Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "1d27b674-f9e2-4ffc-9d8c-a58a1be06457,,,", PlatformMask = -1, FriendlyName = "Afro Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "d84c0ff9-8fbe-4ed8-abf3-7996e81888ab,,,", PlatformMask = -1, FriendlyName = "Large Afro Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "e5b83dfc-b2e1-4dcb-a4ab-9d3a4c8a34ae,,,", PlatformMask = -1, FriendlyName = "Long Wavy Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7dd6f7b0-7ba0-429f-a04f-e32d3a79ee61,,,", PlatformMask = -1, FriendlyName = "Short Wavy Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "eb9611c6-bb50-41a2-93e9-7f959815a846,,,", PlatformMask = -1, FriendlyName = "Dreads Long Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "1fd69ef8-0b74-4962-af5a-67f0bf0358f2,,,", PlatformMask = -1, FriendlyName = "Ponytail Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "a12f724f-4a73-4ab8-aad4-6bfc662b4dd6,,,", PlatformMask = -1, FriendlyName = "Undercut Long Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "0753d7a4-8247-4fca-a6fc-359c26086140,,,", PlatformMask = -1, FriendlyName = "Fonzie Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "77d3c585-4928-4471-a425-89036efe7299,,,", PlatformMask = -1, FriendlyName = "Spiky Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "92302d9d-c527-418c-ac5d-1fa869727505,,,", PlatformMask = -1, FriendlyName = "Part Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "f9dd08f8-16d3-4c39-af4f-89f7bb6e80d3,,,", PlatformMask = -1, FriendlyName = "Undercut Short Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "b148cb1e-df81-442f-aea6-ab1727aad00e,,,", PlatformMask = -1, FriendlyName = "Chunky Afro Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "e36bcd98-7e85-43fa-89f8-57e4ec33823a,,,", PlatformMask = -1, FriendlyName = "Bob with Bangs Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "880a3cc0-7407-4b61-b759-f9dd890fe9e5,,,", PlatformMask = -1, FriendlyName = "Bob Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "21599b51-c50f-43d8-ac5f-62c30cd02ca5,,,", PlatformMask = -1, FriendlyName = "Lori Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "193a3bf9-abc0-4d78-8d63-92046908b1c5,,,", PlatformMask = -1, FriendlyName = "Emo Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "79b90274-6eec-4664-acfb-4a123334661e,,,", PlatformMask = -1, FriendlyName = "Pig Tails Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "da4e7b34-2095-4a9e-801e-4f409039e0dd,,,", PlatformMask = -1, FriendlyName = "Buzz Cut Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "9d9fadb6-97eb-480e-a224-4e0179082071,,,", PlatformMask = -1, FriendlyName = "Meatball Buns Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "d8280c0c-d803-4513-be10-a0ba96d8821e,,,", PlatformMask = -1, FriendlyName = "Flowhawk Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "e286863c-2967-4d00-b837-b49487b9484a,,,", PlatformMask = -1, FriendlyName = "Fauxhawk Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2cb4f372-3372-4583-8b57-c4e3988e3c28,,,", PlatformMask = -1, FriendlyName = "Punky Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "06306723-ca20-4aa6-b7b3-917113f41ac3,,,", PlatformMask = -1, FriendlyName = "Cat-Eye Glasses (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "c70005d5-6276-4a98-acb3-6a77bc19379a,,,", PlatformMask = -1, FriendlyName = "Glasses (Teal)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "8d10cc78-6b00-45f3-affb-205e9cc5b03f,,,", PlatformMask = -1, FriendlyName = "Beard (Close)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "cc96f8a5-bc5b-4f89-83b7-ecd53905ada7,,,", PlatformMask = -1, FriendlyName = "Beard (Thick)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "c6c08eb5-381a-4193-9722-80da95d62abe,,,", PlatformMask = -1, FriendlyName = "Business Tie (Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "4d507dfa-4a99-4ac0-8537-229e9dc0eb4a,,,", PlatformMask = -1, FriendlyName = "Rec Room Tank Top (Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "d0a9262f-5504-46a7-bb10-7507503db58e,,,", PlatformMask = -1, FriendlyName = "Rec Room Shirt (Crew Neck, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "d0a9262f-5504-46a7-bb10-7507503db58e,95e4cc30-cb68-473d-a395-feadf5b51512,0440f08f-ef1d-49d8-942b-523056e8bb45,", PlatformMask = -1, FriendlyName = "Rec Room T-Shirt (Crew Neck, Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,,,", PlatformMask = -1, FriendlyName = "Collared Shirt (Plaid, Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,,,", PlatformMask = -1, FriendlyName = "T-Shirt", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "8aa79563-ace1-4ba7-ad0c-f3210a78142f,,,", PlatformMask = -1, FriendlyName = "Rec Room Shirt (V-Neck, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "8aa79563-ace1-4ba7-ad0c-f3210a78142f,95e4cc30-cb68-473d-a395-feadf5b51512,05f0ee6e-c824-470e-9178-5ed576c6fe0c,", PlatformMask = -1, FriendlyName = "Rec Room T-Shirt (V-Neck, Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "21caa68e-c3fa-474c-af5e-af1e742b7a60,,,", PlatformMask = -1, FriendlyName = "Tennis Skirt (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "21caa68e-c3fa-474c-af5e-af1e742b7a60,c5deba2a-6e35-4b13-8e94-8ba5457f39df,b75ef67d-00c3-4ac1-9b72-212032460294,", PlatformMask = -1, FriendlyName = "Tennis Skirt (Yellow)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "21caa68e-c3fa-474c-af5e-af1e742b7a60,758752bd-db2f-43d2-b580-55b3e1efffd5,b75ef67d-00c3-4ac1-9b72-212032460294,", PlatformMask = -1, FriendlyName = "Tennis Skirt (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2296ed0d-df56-4d46-b33a-aae9230a47fc,,,", PlatformMask = -1, FriendlyName = "Zipper Dress (Yellow)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,,,", PlatformMask = -1, FriendlyName = "Wristbands (White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "71921831-ba6f-408b-a00e-2fd97663636f,,,", PlatformMask = -1, FriendlyName = "Wrist Tape (White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,55901f12-d5b5-4fa8-b4c8-e479689ee39d,f600037d-c9c0-43fa-b45b-02f456f9dd5f,", PlatformMask = -1, FriendlyName = "Collared Shirt (Denim)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,bf82f2f6-9af8-431e-a296-0890dea48ba7,d015cae7-a905-49e4-8823-6dec069689a6,", PlatformMask = -1, FriendlyName = "Collared Shirt (Argyle)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,EfdMcnfHt0mr0PQ_maaYOg,DRJcNhkqvkKFEaZpOguR6w,", PlatformMask = -1, FriendlyName = "Collared Shirt (Flowers, Green)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,6d703981-2734-4c45-8983-cdd5f328902f,a0271cd0-e172-4d3f-aa2f-9806f21a82d2,", PlatformMask = -1, FriendlyName = "Tank Top (Camo)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,5c4a2b35-0e1c-44de-8c3a-96d4a6458b1b,9c03f381-7357-4d0f-8cda-8737d4c43d25,", PlatformMask = -1, FriendlyName = "Tank Top (Rainbow)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,51ef8d39-2b94-4f9e-9620-07b6b0a913a5,d2a692e6-e1a9-4cfe-8154-10b52be7f8c8,", PlatformMask = -1, FriendlyName = "Jersey (Orange)", Tooltip = "", Rarity = 10 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,ad61c418-6d77-4a99-8ac5-9f10f5a3d42f,b292eb4b-07e3-4a48-99b5-3c6587a1e02e,", PlatformMask = -1, FriendlyName = "Tank Top (Dots)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,48abd952-214f-48b2-a8f1-1146f6f69aa2,b78008e8-abbd-4ece-be34-9a911f721fcc,", PlatformMask = -1, FriendlyName = "Tank Top (Zebra)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "14ef6b00-debf-4a85-9755-b4d37df496d3,8377ab96-c908-457f-9fee-b784c9a759f3,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Baseball Cap (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "14ef6b00-debf-4a85-9755-b4d37df496d3,dee70c38-7a99-4c2b-9181-665f1bf75aca,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Baseball Cap (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,7d8e55fe-3c34-4b4b-9753-0021f6cc6454,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Cream)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,1b1d08f2-12ca-43dd-a44f-ea2820b919b4,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,51ef8d39-2b94-4f9e-9620-07b6b0a913a5,018a5c07-e956-457d-a540-a5e2cd68da09,", PlatformMask = -1, FriendlyName = "Headband (Orange, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,cbe29e9f-f2ac-47fb-97e1-8bad16abb89d,018a5c07-e956-457d-a540-a5e2cd68da09,", PlatformMask = -1, FriendlyName = "Headband (Pink, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,dee70c38-7a99-4c2b-9181-665f1bf75aca,018a5c07-e956-457d-a540-a5e2cd68da09,", PlatformMask = -1, FriendlyName = "Headband (Blue, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,6dd95046-acf8-42fe-ab78-80a334096a9d,56a92c8d-af53-413e-929e-4a9a3cfad780,", PlatformMask = -1, FriendlyName = "Headband (Red, White, Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,dee70c38-7a99-4c2b-9181-665f1bf75aca,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,1b1d08f2-12ca-43dd-a44f-ea2820b919b4,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,51ef8d39-2b94-4f9e-9620-07b6b0a913a5,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,cbe29e9f-f2ac-47fb-97e1-8bad16abb89d,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Pink)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,8377ab96-c908-457f-9fee-b784c9a759f3,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "fcfcaf63-deb4-45f7-b711-c051c9ea45cb,,,", PlatformMask = -1, FriendlyName = "Top Bun Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "de0ac50d-2adb-4114-bd2e-68953b13d706,,,", PlatformMask = -1, FriendlyName = "Blazer (Blue, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "de0ac50d-2adb-4114-bd2e-68953b13d706,6f2e74bf-1e95-463d-97db-d5d1a53b2c28,be2b9293-1d3c-4b1c-b4c5-fad3ab16cf54,", PlatformMask = -1, FriendlyName = "Blazer (Black, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "de0ac50d-2adb-4114-bd2e-68953b13d706,9374bf66-2ee5-493b-8439-efce4b201904,be2b9293-1d3c-4b1c-b4c5-fad3ab16cf54,", PlatformMask = -1, FriendlyName = "Blazer (Grey, Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "de0ac50d-2adb-4114-bd2e-68953b13d706,272fe8eb-5061-4729-a7a8-414ff667a82f,be2b9293-1d3c-4b1c-b4c5-fad3ab16cf54,", PlatformMask = -1, FriendlyName = "Blazer (Grey, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "de0ac50d-2adb-4114-bd2e-68953b13d706,0ffad843-d6c9-425a-8686-7217009c867e,be2b9293-1d3c-4b1c-b4c5-fad3ab16cf54,", PlatformMask = -1, FriendlyName = "Blazer (Green, Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "9c8fc7f0-8f99-4aad-a34f-8d979f6ae352,e0397982-c2c2-4733-9a40-46e18675b5af,dafa658e-753b-46cb-bd85-85c1de5e6ea7,", PlatformMask = -1, FriendlyName = "Button Top (Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "9c8fc7f0-8f99-4aad-a34f-8d979f6ae352,,,", PlatformMask = -1, FriendlyName = "Button Top (Pink)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "9c8fc7f0-8f99-4aad-a34f-8d979f6ae352,49f5864f-9d40-497c-88c8-e87f64d41d74,dafa658e-753b-46cb-bd85-85c1de5e6ea7,", PlatformMask = -1, FriendlyName = "Button Top (Tan)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "9c8fc7f0-8f99-4aad-a34f-8d979f6ae352,c5deba2a-6e35-4b13-8e94-8ba5457f39df,dafa658e-753b-46cb-bd85-85c1de5e6ea7,", PlatformMask = -1, FriendlyName = "Button Top (Yellow)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6d815b35-6f68-4ed4-817d-70f141e1a571,f750de46-3758-4f7d-9709-0a84b1027009,2c8924aa-68f8-4912-9759-18992f72f08a,", PlatformMask = -1, FriendlyName = "Collared Dress (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6d815b35-6f68-4ed4-817d-70f141e1a571,d66aa400-aa5a-4539-a25d-5f8ce94dc281,2c8924aa-68f8-4912-9759-18992f72f08a,", PlatformMask = -1, FriendlyName = "Collared Dress (Green)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6d815b35-6f68-4ed4-817d-70f141e1a571,6564acf1-4d70-4f92-92ac-08e2b76dbb6b,2c8924aa-68f8-4912-9759-18992f72f08a,", PlatformMask = -1, FriendlyName = "Collared Dress (Purple)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6d815b35-6f68-4ed4-817d-70f141e1a571,,,", PlatformMask = -1, FriendlyName = "Collared Dress (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "241506f6-bf88-4b46-b5fe-513a225421f4,,,", PlatformMask = -1, FriendlyName = "Half Up Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6b9e022c-0b68-48fd-8eca-da8573c18900,d6edbc00-3c1d-4f49-8412-3ef8c7c5f4c2,cf119781-5bd9-4b85-9a0b-12e82e988c23,", PlatformMask = -1, FriendlyName = "Long Scarf (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2296ed0d-df56-4d46-b33a-aae9230a47fc,6d703981-2734-4c45-8983-cdd5f328902f,cfabdefe-0890-436e-b2a3-b5c712e22955,", PlatformMask = -1, FriendlyName = "Zipper Dress (Green)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2296ed0d-df56-4d46-b33a-aae9230a47fc,830be2fa-60a5-48cc-931f-34b670eae4bd,cfabdefe-0890-436e-b2a3-b5c712e22955,", PlatformMask = -1, FriendlyName = "Zipper Dress (Purple)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2296ed0d-df56-4d46-b33a-aae9230a47fc,bbfa08e3-8e6b-4e0f-b264-1b398d7cd44a,cfabdefe-0890-436e-b2a3-b5c712e22955,", PlatformMask = -1, FriendlyName = "Zipper Dress (White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,484b6c13-af22-4ad5-8c43-34c0de095d49,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Light Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,f8b0cfe8-e129-4578-8bb5-f60af5d38599,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Green)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,67bcca75-4ab1-4964-8688-9908c464d355,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Gold)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,1b1d08f2-12ca-43dd-a44f-ea2820b919b4,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Tank Top (Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,dee70c38-7a99-4c2b-9181-665f1bf75aca,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Tank Top (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,51ef8d39-2b94-4f9e-9620-07b6b0a913a5,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Tank Top (Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "7b857a8c-92ad-4028-a2c2-b3c20cdab5f2,8377ab96-c908-457f-9fee-b784c9a759f3,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Tank Top (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6b9e022c-0b68-48fd-8eca-da8573c18900,5c4a2b35-0e1c-44de-8c3a-96d4a6458b1b,cf119781-5bd9-4b85-9a0b-12e82e988c23,", PlatformMask = -1, FriendlyName = "Long Scarf (Purple)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6b9e022c-0b68-48fd-8eca-da8573c18900,6dd95046-acf8-42fe-ab78-80a334096a9d,cf119781-5bd9-4b85-9a0b-12e82e988c23,", PlatformMask = -1, FriendlyName = "Long Scarf (White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,dee70c38-7a99-4c2b-9181-665f1bf75aca,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,f8b0cfe8-e129-4578-8bb5-f60af5d38599,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Green)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,8377ab96-c908-457f-9fee-b784c9a759f3,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,,,", PlatformMask = -1, FriendlyName = "Headband (White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,67bcca75-4ab1-4964-8688-9908c464d355,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Yellow)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "24a240f4-1574-420b-b898-a7e91f170759,,,", PlatformMask = -1, FriendlyName = "Back Bun Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "c45ed7b8-99bd-4a4b-a9ff-e16edf5d7a18,,,", PlatformMask = -1, FriendlyName = "High Pony Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "14ef6b00-debf-4a85-9755-b4d37df496d3,484b6c13-af22-4ad5-8c43-34c0de095d49,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Baseball Cap (Light Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "14ef6b00-debf-4a85-9755-b4d37df496d3,1b1d08f2-12ca-43dd-a44f-ea2820b919b4,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Baseball Cap (Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "14ef6b00-debf-4a85-9755-b4d37df496d3,51ef8d39-2b94-4f9e-9620-07b6b0a913a5,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Baseball Cap (Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "14ef6b00-debf-4a85-9755-b4d37df496d3,,,", PlatformMask = -1, FriendlyName = "Baseball Cap (White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "14ef6b00-debf-4a85-9755-b4d37df496d3,67bcca75-4ab1-4964-8688-9908c464d355,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Baseball Cap (Yellow)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "896c2491-2f96-4986-9cbd-b3b31ef5d8c5,,,", PlatformMask = -1, FriendlyName = "Equestrian Coat (Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "896c2491-2f96-4986-9cbd-b3b31ef5d8c5,55901f12-d5b5-4fa8-b4c8-e479689ee39d,d344b8cc-85a8-4ace-9f92-38c84f396e99,", PlatformMask = -1, FriendlyName = "Equestrian Coat (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "896c2491-2f96-4986-9cbd-b3b31ef5d8c5,4828b50c-95b6-466a-bb25-514891d78202,d344b8cc-85a8-4ace-9f92-38c84f396e99,", PlatformMask = -1, FriendlyName = "Equestrian Coat (Grey)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "896c2491-2f96-4986-9cbd-b3b31ef5d8c5,d6823e01-69f0-4f85-b94a-74894356a2cf,d344b8cc-85a8-4ace-9f92-38c84f396e99,", PlatformMask = -1, FriendlyName = "Equestrian Coat (Maroon)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "09177621-9ecd-4f6a-b6a5-64490139141d,,,", PlatformMask = -1, FriendlyName = "Flat Top Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "95ab7a7c-c35d-4da5-9955-0921064470b6,,,", PlatformMask = -1, FriendlyName = "Gekko Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,0ecb8a2a-cffc-47db-aeda-fb0684aef1e5,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Grey)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,484b6c13-af22-4ad5-8c43-34c0de095d49,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Light Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,51ef8d39-2b94-4f9e-9620-07b6b0a913a5,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,cbe29e9f-f2ac-47fb-97e1-8bad16abb89d,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Headband (Pink)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "40528de7-38a3-4a7c-8f93-6d3bfa5573f2,8377ab96-c908-457f-9fee-b784c9a759f3,018a5c07-e956-457d-a540-a5e2cd68da09,", PlatformMask = -1, FriendlyName = "Headband (Red, White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "62ce4109-8dee-4895-bf1b-bfa143db4c7e,,,", PlatformMask = -1, FriendlyName = "Slim Blazer (Teal)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "62ce4109-8dee-4895-bf1b-bfa143db4c7e,cd5d7285-202d-42d0-b93f-04245875793e,0f36bb97-c61b-4281-929f-ff1d0d11be86,", PlatformMask = -1, FriendlyName = "Slim Blazer (Green)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "62ce4109-8dee-4895-bf1b-bfa143db4c7e,ad61c418-6d77-4a99-8ac5-9f10f5a3d42f,0f36bb97-c61b-4281-929f-ff1d0d11be86,", PlatformMask = -1, FriendlyName = "Slim Blazer (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "8b9f1413-e786-4a30-946c-9292f207875a,,,", PlatformMask = -1, FriendlyName = "Pulp Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "5cd08cfb-c729-4c30-96d9-6a99bb934d91,,,", PlatformMask = -1, FriendlyName = "Rec Room Sash", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "1a71064b-794f-40fa-9109-8ad36602b6e1,,,", PlatformMask = -1, FriendlyName = "Shagg Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "84cd594c-1cd8-4b4d-8409-85c8fd5fb02a,761a3193-60f0-4190-80c7-285b8192e794,91a451c1-b285-4c48-b14d-59ded8cc006f,", PlatformMask = -1, FriendlyName = "Stoll Dress (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "84cd594c-1cd8-4b4d-8409-85c8fd5fb02a,a819f49b-6c7a-49d3-9e6a-d9d79ef5019f,91a451c1-b285-4c48-b14d-59ded8cc006f,", PlatformMask = -1, FriendlyName = "Stoll Dress (Green)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "84cd594c-1cd8-4b4d-8409-85c8fd5fb02a,64850553-cdfe-455a-ac00-dafbe63d613e,91a451c1-b285-4c48-b14d-59ded8cc006f,", PlatformMask = -1, FriendlyName = "Stoll Dress (Orange)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "84cd594c-1cd8-4b4d-8409-85c8fd5fb02a,,,", PlatformMask = -1, FriendlyName = "Stoll Dress (Pink)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "71921831-ba6f-408b-a00e-2fd97663636f,1b1d08f2-12ca-43dd-a44f-ea2820b919b4,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wrist Tape (Black)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "71921831-ba6f-408b-a00e-2fd97663636f,7d8e55fe-3c34-4b4b-9753-0021f6cc6454,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wrist Tape (Cream)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,0ecb8a2a-cffc-47db-aeda-fb0684aef1e5,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Grey)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ecc1dbe6-ca06-4564-b2a6-30956194d1e9,7d8e55fe-3c34-4b4b-9753-0021f6cc6454,0b2395e1-ebcc-47e9-aaf1-faf9e9cec4cd,", PlatformMask = -1, FriendlyName = "Wristbands (Cream)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "6b9e022c-0b68-48fd-8eca-da8573c18900,,,", PlatformMask = -1, FriendlyName = "Long Scarf (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,0iSsaY-HgkmLaRHCn5vEdw,PioQ0o3yP0a6szPZ4EKs2A,", PlatformMask = -1, FriendlyName = "Collared Shirt (Blue)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,jGj28vhq8EGwP2RuM074aQ,PioQ0o3yP0a6szPZ4EKs2A,", PlatformMask = -1, FriendlyName = "Collared Shirt (Yellow)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,kmj5zOjcwku_WWKroCeiVQ,PioQ0o3yP0a6szPZ4EKs2A,", PlatformMask = -1, FriendlyName = "Collared Shirt (Pink)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,FAviMCQ_EE2Mpt6QPo5OEw,PioQ0o3yP0a6szPZ4EKs2A,", PlatformMask = -1, FriendlyName = "Collared Shirt (Red)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "2e59d8d0-91a0-4449-bfdc-a5d663fd9343,MFrcSQ1DYUm8imvy4ypgvw,PioQ0o3yP0a6szPZ4EKs2A,", PlatformMask = -1, FriendlyName = "Collared Shirt (White)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "de0ac50d-2adb-4114-bd2e-68953b13d706,05ac07e1-67f0-486c-abf5-a62866475abb,be2b9293-1d3c-4b1c-b4c5-fad3ab16cf54,", PlatformMask = -1, FriendlyName = "Blazer (Black, Cream)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "0088603e-ec3b-4478-8694-e6fb1989b3f2,,,", PlatformMask = -1, FriendlyName = "Angled Bob Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "ffea7a65-613f-4835-921e-6dd15f357b7e,,,", PlatformMask = -1, FriendlyName = "Long Bangs Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "45f5e714-8a5f-4385-a97f-675066167011,,,", PlatformMask = -1, FriendlyName = "Seventies Stache", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "9bf5d259-7774-4cbe-a90f-7f188cc0dce7,,,", PlatformMask = -1, FriendlyName = "Thick Goatee", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "a6cbfe76-534a-4655-a8a8-3fed13d001c7,,,", PlatformMask = -1, FriendlyName = "Bald Top Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "CTcrvbo3OEepIV4oW8bx4w,,,", PlatformMask = -1, FriendlyName = "Receding Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "-twtjyBdQ02EAdOfBGTiEw,,,", PlatformMask = -1, FriendlyName = "Van Dyke Beard", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "45eaab67-19c2-4601-8f80-3565a4dceba4,,,", PlatformMask = -1, FriendlyName = "Pompadour Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "c855dcc3-96cb-470d-b159-d37a025a47d1,,,", PlatformMask = -1, FriendlyName = "Dutch Braid Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "d7730a9e-78a1-4356-bc09-6b066615850b,,,", PlatformMask = -1, FriendlyName = "Afro Updo Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "8c35c804-e8d5-49d2-8d5a-ea19fb70bfa6,,,", PlatformMask = -1, FriendlyName = "Pencil Bun Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "5beeb4c4-f276-4eae-87aa-9302e45b05b7,,,", PlatformMask = -1, FriendlyName = "Cornrows Hair", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "b6rLwzD4NkKV7xKn9ZYVkA,sxUE0iOSZEmezm54T7xI3Q,tlpa7195x0CkmSjpR1RArQ,", PlatformMask = -1, FriendlyName = "Rec Room Hoodie - Pride (Rainbow Pride)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "fe15ca53-c5b8-4acf-9309-ff3f4e610fc9,,,", PlatformMask = -1, FriendlyName = "Winged Hat - Pride (Rainbow Pride)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "b6rLwzD4NkKV7xKn9ZYVkA,D_Xmo0rOzkS-kgq1CYXt3g,tnCJp2eDI0SwjVfJMhk3LQ,", PlatformMask = -1, FriendlyName = "Rec Room Hoodie - Pride (Trans Pride)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "fe15ca53-c5b8-4acf-9309-ff3f4e610fc9,knXPidb-Rkayfc3kSHfZeQ,1yMyo6oTjU-VAygoeWaohQ,", PlatformMask = -1, FriendlyName = "Winged Hat - Pride (Trans Pride)", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "88b6ddeb-a455-460d-91d9-a4569ef6903c,,,", PlatformMask = -1, FriendlyName = "Square Earrings ", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "0abb6b08-20ce-444f-879e-0d1344df096c,,,", PlatformMask = -1, FriendlyName = "Round Earrings", Tooltip = "", Rarity = 0 },
|
||||
new { AvatarItemType = 0, AvatarItemDesc = "9b5bde11-7408-4798-9fcb-c7ec175444df,,,", PlatformMask = -1, FriendlyName = "Hoop Earrings", Tooltip = "", Rarity = 0 }
|
||||
};
|
||||
|
||||
List<object> allItems = ownedItems.Concat(defaultItems).ToList();
|
||||
|
||||
return Results.Json(allItems);
|
||||
}
|
||||
|
||||
[HttpGet("avatar/v2")]
|
||||
public async Task<IResult> GetAvatarV2(HttpRequest request, AppDbContext db, JwtTokenService jwtService) {
|
||||
string authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
string token = authHeader.Substring("Bearer ".Length);
|
||||
string? accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
PlayerAvatar? avatar = await db.PlayerAvatars.FirstOrDefaultAsync(a => a.OwnerAccountId == id);
|
||||
|
||||
if (avatar == null)
|
||||
{
|
||||
avatar = new PlayerAvatar
|
||||
{
|
||||
OwnerAccountId = id,
|
||||
OutfitSelections = "",
|
||||
FaceFeatures = "{}",
|
||||
SkinColor = "",
|
||||
HairColor = ""
|
||||
};
|
||||
db.PlayerAvatars.Add(avatar);
|
||||
await db.SaveChangesAsync();
|
||||
}
|
||||
|
||||
return Results.Json(new
|
||||
{
|
||||
OutfitSelections = avatar.OutfitSelections,
|
||||
FaceFeatures = avatar.FaceFeatures,
|
||||
SkinColor = avatar.SkinColor,
|
||||
HairColor = avatar.HairColor
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void MapEndpoints(WebApplication app) {
|
||||
var jwtService = app.Services.GetRequiredService<JwtTokenService>();
|
||||
var storefrontService = app.Services.GetRequiredService<StorefrontFillService>();
|
||||
var notificationService = app.Services.GetRequiredService<NotificationService>();
|
||||
|
||||
app.MapPost("/api/avatar/v2/set", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
|
||||
request.EnableBuffering();
|
||||
var avatarUpdate = await System.Text.Json.JsonSerializer.DeserializeAsync<PlayerAvatar>(request.Body);
|
||||
|
||||
@@ -373,33 +141,26 @@ public class APIController : ControllerBase
|
||||
|
||||
await db.SaveChangesAsync();
|
||||
return Results.Ok(avatar);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/PlayerReporting/v1/moderationBlockDetails", () =>
|
||||
Results.Content("{\"ReportCategory\":0,\"Duration\":0,\"GameSessionId\":0,\"IsHostKick\":false,\"Message\":\"\",\"PlayerIdReporter\":null,\"IsBan\":false}", "application/json"));
|
||||
[HttpGet("PlayerReporting/v1/moderationBlockDetails")]
|
||||
public IResult GetModerationBlockDetails()
|
||||
{
|
||||
return Results.Content("{\"ReportCategory\":0,\"Duration\":0,\"GameSessionId\":0,\"IsHostKick\":false,\"Message\":\"\",\"PlayerIdReporter\":null,\"IsBan\":false}", "application/json");
|
||||
}
|
||||
|
||||
app.MapGet("/api/PlayerReporting/v1/voteToKickReasons", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("PlayerReporting/v1/voteToKickReasons")]
|
||||
public IResult GetVoteToKickReasons()
|
||||
{
|
||||
var json = System.IO.File.ReadAllText("JSON/vtkreasons.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/settings/v2" +
|
||||
"", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("settings/v2")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetSettings(HttpRequest request, AppDbContext db, JwtTokenService jwtService)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
|
||||
|
||||
var settings = await db.PlayerSettings
|
||||
.Where(s => s.PlayerId == id)
|
||||
@@ -447,121 +208,59 @@ public class APIController : ControllerBase
|
||||
}
|
||||
|
||||
return Results.Json(settings);
|
||||
});
|
||||
|
||||
app.MapPost("/api/settings/v2/set", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
request.Body.Position = 0;
|
||||
using var reader = new StreamReader(request.Body);
|
||||
var body = await reader.ReadToEndAsync();
|
||||
|
||||
Console.WriteLine($"Settings request body: {body}");
|
||||
|
||||
var settings = new List<PlayerSetting>();
|
||||
|
||||
if (body.TrimStart().StartsWith("["))
|
||||
{
|
||||
settings = System.Text.Json.JsonSerializer.Deserialize<List<PlayerSetting>>(body) ?? [];
|
||||
}
|
||||
else
|
||||
{
|
||||
var single = System.Text.Json.JsonSerializer.Deserialize<PlayerSetting>(body);
|
||||
if (single != null) settings.Add(single);
|
||||
}
|
||||
|
||||
settings = settings.Where(s => !string.IsNullOrEmpty(s.Key)).ToList();
|
||||
|
||||
if (!settings.Any())
|
||||
return Results.Ok();
|
||||
|
||||
db.PlayerSettings.RemoveRange(db.PlayerSettings.Where(s => s.PlayerId == id));
|
||||
|
||||
foreach (var setting in settings)
|
||||
[HttpGet("accounts/v1/getBio")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetAccountBio(HttpRequest request, AppDbContext db)
|
||||
{
|
||||
setting.PlayerId = id;
|
||||
setting.Key = setting.Key ?? "";
|
||||
setting.Value = setting.Value ?? "";
|
||||
db.PlayerSettings.Add(setting);
|
||||
}
|
||||
|
||||
await db.SaveChangesAsync();
|
||||
return Results.Ok();
|
||||
});
|
||||
|
||||
app.MapGet("/api/objectives/v1/myprogress", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
var json = System.IO.File.ReadAllText("JSON/tempmyprogress.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
app.MapGet("/api/communityboard/v2/current", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var json = System.IO.File.ReadAllText("JSON/communityboard.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
app.MapGet("/api/playerevents/v1/all", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
return Results.Content("{\"Created\":[],\"Responses\":[]}", "application/json");
|
||||
});
|
||||
app.MapGet("/api/storefronts/v1/p2p/betaEnabled", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
return "false";
|
||||
});
|
||||
app.MapGet("/api/announcement/v1/get", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var json = System.IO.File.ReadAllText("JSON/announcements.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
app.MapGet("/api/quickPlay/v1/getandclear", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
return Results.Content("{\"RoomName\":null,\"ActionCode\":null,\"TargetPlayerId\":null}", "application/json");
|
||||
});
|
||||
app.MapGet("/api/roomkeys/v1/room", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
var roomid = request.Query["roomId"];
|
||||
return "[]";
|
||||
});
|
||||
app.MapGet("/api/accounts/v1/getBio", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
int accountId = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
|
||||
|
||||
var bio = await db.PlayerBios
|
||||
.Where(s => accountId == accountId)
|
||||
.ToListAsync();
|
||||
|
||||
return Results.Json(bio);
|
||||
});
|
||||
app.MapGet("/roomserver/rooms/bulk", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var idParam = request.Query["id"].FirstOrDefault();
|
||||
var nameParam = request.Query["name"].FirstOrDefault();
|
||||
}
|
||||
|
||||
|
||||
[HttpGet("communityboard/v2/current")]
|
||||
public async Task<IResult> CommunityBoardCurrent() {
|
||||
var json = System.IO.File.ReadAllText("JSON/communityboard.json");
|
||||
return Results.Content(json, "application/json");
|
||||
}
|
||||
|
||||
[HttpGet("playerevents/v1/all")]
|
||||
public async Task<IResult> PlayerEventsAll() {
|
||||
return Results.Content("{\"Created\":[],\"Responses\":[]}", "application/json");
|
||||
}
|
||||
|
||||
[HttpGet("storefronts/v1/p2p/betaEnabled")]
|
||||
public IResult StorefrontsP2PBetaEnabled() {
|
||||
return Results.Content("false", "application/json");
|
||||
}
|
||||
|
||||
[HttpGet("announcement/v1/get")]
|
||||
public async Task<IResult> AnnouncementGet() {
|
||||
var json = System.IO.File.ReadAllText("JSON/announcements.json");
|
||||
return Results.Content(json, "application/json");
|
||||
}
|
||||
|
||||
[HttpGet("quickPlay/v1/getandclear")]
|
||||
public async Task<IResult> QuickPlayGetAndClear() {
|
||||
return Results.Content("{\"RoomName\":null,\"ActionCode\":null,\"TargetPlayerId\":null}", "application/json");
|
||||
}
|
||||
|
||||
[HttpGet("roomkeys/v1/room")]
|
||||
public async Task<IResult> RoomKeysRoom() {
|
||||
var roomid = Request.Query["roomId"];
|
||||
return Results.Content("[]", "application/json");
|
||||
}
|
||||
|
||||
[HttpGet("/roomserver/rooms/bulk")]
|
||||
public async Task<IResult> RoomserverRoomsBulk(AppDbContext db) {
|
||||
var idParam = Request.Query["id"].FirstOrDefault();
|
||||
var nameParam = Request.Query["name"].FirstOrDefault();
|
||||
|
||||
if (string.IsNullOrEmpty(idParam) && string.IsNullOrEmpty(nameParam))
|
||||
return Results.BadRequest("Either 'id' or 'name' query parameter is required");
|
||||
@@ -583,9 +282,7 @@ public class APIController : ControllerBase
|
||||
var roomIds = results.Select(r => r.RoomId).ToList();
|
||||
|
||||
if (roomIds.Count == 0)
|
||||
{
|
||||
return Results.Json(new object[0]);
|
||||
}
|
||||
|
||||
var subRooms = db.SubRooms.Where(s => roomIds.Contains(s.RoomId)).ToList();
|
||||
var roles = db.RoomRoles.Where(r => roomIds.Contains(r.RoomId)).ToList();
|
||||
@@ -660,12 +357,11 @@ public class APIController : ControllerBase
|
||||
}).ToList();
|
||||
|
||||
return Results.Json(response);
|
||||
});
|
||||
|
||||
app.MapGet("/roomserver/rooms/hot", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var tagFilter = request.Query["tag"].FirstOrDefault()?.ToLower();
|
||||
}
|
||||
|
||||
[HttpGet("/roomserver/rooms/hot")]
|
||||
public async Task<IResult> RoomserverRoomsHot(AppDbContext db) {
|
||||
var tagFilter = Request.Query["tag"].FirstOrDefault()?.ToLower();
|
||||
var allRooms = await db.Rooms.ToListAsync();
|
||||
|
||||
if (!string.IsNullOrEmpty(tagFilter))
|
||||
@@ -674,15 +370,11 @@ public class APIController : ControllerBase
|
||||
{
|
||||
var roomTags = TryDeserializeRoomTags(r.Tags);
|
||||
if (roomTags == null || roomTags.Length == 0) return false;
|
||||
|
||||
return roomTags.Any(t => t.Tag.Equals(tagFilter, StringComparison.OrdinalIgnoreCase));
|
||||
}).ToList();
|
||||
}
|
||||
|
||||
var hotRooms = allRooms
|
||||
.OrderByDescending(r => r.Id)
|
||||
.ToList();
|
||||
|
||||
var hotRooms = allRooms.OrderByDescending(r => r.Id).ToList();
|
||||
var results = new List<object>();
|
||||
|
||||
foreach (var room in hotRooms)
|
||||
@@ -694,7 +386,7 @@ public class APIController : ControllerBase
|
||||
var external = await db.PromoExternalContents.Where(x => x.RoomId == room.RoomId).ToListAsync();
|
||||
var tags = TryDeserializeTags(room.Tags) ?? new object[0];
|
||||
|
||||
var roomResponse = new
|
||||
results.Add(new
|
||||
{
|
||||
room.RoomId,
|
||||
room.Name,
|
||||
@@ -722,64 +414,21 @@ public class APIController : ControllerBase
|
||||
room.EncryptVoiceChat,
|
||||
room.CreatedAt,
|
||||
Stats = (object?)null,
|
||||
SubRooms = subRooms.Select(s => new
|
||||
{
|
||||
s.SubRoomId,
|
||||
s.RoomId,
|
||||
s.Name,
|
||||
s.DataBlob,
|
||||
s.IsSandbox,
|
||||
s.MaxPlayers,
|
||||
s.Accessibility,
|
||||
s.UnitySceneId,
|
||||
s.DataSavedAt
|
||||
}),
|
||||
Roles = roles.Select(r => new
|
||||
{
|
||||
r.AccountId,
|
||||
r.Role,
|
||||
r.InvitedRole
|
||||
}),
|
||||
LoadScreens = loadScreens.Select(ls => new
|
||||
{
|
||||
ls.ImageUrl,
|
||||
ls.Tooltip,
|
||||
ls.IsThumbnail
|
||||
}),
|
||||
PromoImages = promoImages.Select(pi => new
|
||||
{
|
||||
pi.ImageUrl,
|
||||
pi.Tooltip,
|
||||
pi.SortOrder
|
||||
}),
|
||||
PromoExternalContent = external.Select(ec => new
|
||||
{
|
||||
ec.Type,
|
||||
ec.Url,
|
||||
ec.Tooltip
|
||||
}),
|
||||
SubRooms = subRooms.Select(s => new { s.SubRoomId, s.RoomId, s.Name, s.DataBlob, s.IsSandbox, s.MaxPlayers, s.Accessibility, s.UnitySceneId, s.DataSavedAt }),
|
||||
Roles = roles.Select(r => new { r.AccountId, r.Role, r.InvitedRole }),
|
||||
LoadScreens = loadScreens.Select(ls => new { ls.ImageUrl, ls.Tooltip, ls.IsThumbnail }),
|
||||
PromoImages = promoImages.Select(pi => new { pi.ImageUrl, pi.Tooltip, pi.SortOrder }),
|
||||
PromoExternalContent = external.Select(ec => new { ec.Type, ec.Url, ec.Tooltip }),
|
||||
Tags = tags
|
||||
};
|
||||
results.Add(roomResponse);
|
||||
});
|
||||
}
|
||||
|
||||
var response = new
|
||||
{
|
||||
Results = results,
|
||||
TotalResults = results.Count
|
||||
};
|
||||
|
||||
return Results.Json(response);
|
||||
});
|
||||
|
||||
app.MapGet("/roomserver/roomsandplaylists/hot", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
// should sort by popularity but idk how to yet so we just d it by id order
|
||||
var allRooms = await db.Rooms
|
||||
.Where(r => !r.IsDorm)
|
||||
.OrderByDescending(r => r.Id)
|
||||
.ToListAsync();
|
||||
return Results.Json(new { Results = results, TotalResults = results.Count });
|
||||
}
|
||||
|
||||
[HttpGet("/roomserver/roomsandplaylists/hot")]
|
||||
public async Task<IResult> RoomserverRoomsAndPlaylistsHot(AppDbContext db) {
|
||||
var allRooms = await db.Rooms.Where(r => !r.IsDorm).OrderByDescending(r => r.Id).ToListAsync();
|
||||
var results = new List<object>();
|
||||
|
||||
foreach (var room in allRooms)
|
||||
@@ -791,7 +440,7 @@ public class APIController : ControllerBase
|
||||
var external = await db.PromoExternalContents.Where(x => x.RoomId == room.RoomId).ToListAsync();
|
||||
var tags = TryDeserializeTags(room.Tags) ?? new object[0];
|
||||
|
||||
var roomResponse = new
|
||||
results.Add(new
|
||||
{
|
||||
room.RoomId,
|
||||
room.Name,
|
||||
@@ -819,90 +468,35 @@ public class APIController : ControllerBase
|
||||
room.EncryptVoiceChat,
|
||||
room.CreatedAt,
|
||||
Stats = (object?)null,
|
||||
SubRooms = subRooms.Select(s => new
|
||||
{
|
||||
s.SubRoomId,
|
||||
s.RoomId,
|
||||
s.Name,
|
||||
s.DataBlob,
|
||||
s.IsSandbox,
|
||||
s.MaxPlayers,
|
||||
s.Accessibility,
|
||||
s.UnitySceneId,
|
||||
s.DataSavedAt
|
||||
}),
|
||||
Roles = roles.Select(r => new
|
||||
{
|
||||
r.AccountId,
|
||||
r.Role,
|
||||
r.InvitedRole
|
||||
}),
|
||||
LoadScreens = loadScreens.Select(ls => new
|
||||
{
|
||||
ls.ImageUrl,
|
||||
ls.Tooltip,
|
||||
ls.IsThumbnail
|
||||
}),
|
||||
PromoImages = promoImages.Select(pi => new
|
||||
{
|
||||
pi.ImageUrl,
|
||||
pi.Tooltip,
|
||||
pi.SortOrder
|
||||
}),
|
||||
PromoExternalContent = external.Select(ec => new
|
||||
{
|
||||
ec.Type,
|
||||
ec.Url,
|
||||
ec.Tooltip
|
||||
}),
|
||||
SubRooms = subRooms.Select(s => new { s.SubRoomId, s.RoomId, s.Name, s.DataBlob, s.IsSandbox, s.MaxPlayers, s.Accessibility, s.UnitySceneId, s.DataSavedAt }),
|
||||
Roles = roles.Select(r => new { r.AccountId, r.Role, r.InvitedRole }),
|
||||
LoadScreens = loadScreens.Select(ls => new { ls.ImageUrl, ls.Tooltip, ls.IsThumbnail }),
|
||||
PromoImages = promoImages.Select(pi => new { pi.ImageUrl, pi.Tooltip, pi.SortOrder }),
|
||||
PromoExternalContent = external.Select(ec => new { ec.Type, ec.Url, ec.Tooltip }),
|
||||
Tags = tags
|
||||
};
|
||||
results.Add(roomResponse);
|
||||
});
|
||||
}
|
||||
|
||||
var response = new
|
||||
{
|
||||
Results = results,
|
||||
TotalResults = results.Count
|
||||
};
|
||||
return Results.Json(new { Results = results, TotalResults = results.Count });
|
||||
}
|
||||
|
||||
return Results.Json(response);
|
||||
});
|
||||
app.MapGet("/roomserver/rooms/{id}", async (HttpRequest request, AppDbContext db, string id) =>
|
||||
{
|
||||
// this sucked to do
|
||||
[HttpGet("/roomserver/rooms/{id}")]
|
||||
public async Task<IResult> RoomserverRoomsId(string id, AppDbContext db) {
|
||||
if (!int.TryParse(id, out var roomId))
|
||||
return Results.NotFound();
|
||||
|
||||
var room = await db.Rooms
|
||||
.FirstOrDefaultAsync(r => r.RoomId == roomId);
|
||||
|
||||
var room = await db.Rooms.FirstOrDefaultAsync(r => r.RoomId == roomId);
|
||||
if (room == null)
|
||||
return Results.NotFound();
|
||||
|
||||
var subRooms = true
|
||||
? await db.SubRooms.Where(x => x.RoomId == room.RoomId).ToListAsync()
|
||||
: new List<SubRoom>();
|
||||
|
||||
var roles = true
|
||||
? await db.RoomRoles.Where(x => x.RoomId == room.RoomId).ToListAsync()
|
||||
: new List<RoomRole>();
|
||||
|
||||
var loadScreens = true
|
||||
? await db.LoadScreens.Where(x => x.RoomId == room.RoomId).ToListAsync()
|
||||
: new List<LoadScreen>();
|
||||
|
||||
var promoImages = true
|
||||
? await db.PromoImages.Where(x => x.RoomId == room.RoomId).ToListAsync()
|
||||
: new List<PromoImage>();
|
||||
|
||||
var external = true
|
||||
? await db.PromoExternalContents.Where(x => x.RoomId == room.RoomId).ToListAsync()
|
||||
: new List<PromoExternalContent>();
|
||||
|
||||
var subRooms = await db.SubRooms.Where(x => x.RoomId == room.RoomId).ToListAsync();
|
||||
var roles = await db.RoomRoles.Where(x => x.RoomId == room.RoomId).ToListAsync();
|
||||
var loadScreens = await db.LoadScreens.Where(x => x.RoomId == room.RoomId).ToListAsync();
|
||||
var promoImages = await db.PromoImages.Where(x => x.RoomId == room.RoomId).ToListAsync();
|
||||
var external = await db.PromoExternalContents.Where(x => x.RoomId == room.RoomId).ToListAsync();
|
||||
var tags = TryDeserializeTags(room.Tags) ?? new object[0];
|
||||
|
||||
var response = new
|
||||
return Results.Json(new
|
||||
{
|
||||
room.RoomId,
|
||||
room.Name,
|
||||
@@ -911,12 +505,10 @@ public class APIController : ControllerBase
|
||||
room.ImageName,
|
||||
room.State,
|
||||
room.Accessibility,
|
||||
|
||||
room.SupportsLevelVoting,
|
||||
room.IsRRO,
|
||||
room.IsDorm,
|
||||
room.CloningAllowed,
|
||||
|
||||
room.SupportsVRLow,
|
||||
room.SupportsQuest2,
|
||||
room.SupportsMobile,
|
||||
@@ -924,88 +516,41 @@ public class APIController : ControllerBase
|
||||
room.SupportsWalkVR,
|
||||
room.SupportsTeleportVR,
|
||||
room.SupportsJuniors,
|
||||
|
||||
room.MinLevel,
|
||||
room.WarningMask,
|
||||
room.CustomWarning,
|
||||
|
||||
room.DisableMicAutoMute,
|
||||
room.DisableRoomComments,
|
||||
room.EncryptVoiceChat,
|
||||
|
||||
room.CreatedAt,
|
||||
|
||||
Stats = new RoomStats
|
||||
{
|
||||
CheerCount = 0,
|
||||
FavoriteCount = 0,
|
||||
VisitorCount = 1,
|
||||
VisitCount = 1
|
||||
},
|
||||
|
||||
SubRooms = subRooms.Select(s => new
|
||||
{
|
||||
s.SubRoomId,
|
||||
s.RoomId,
|
||||
s.Name,
|
||||
s.DataBlob,
|
||||
s.IsSandbox,
|
||||
s.MaxPlayers,
|
||||
s.Accessibility,
|
||||
s.UnitySceneId,
|
||||
s.DataSavedAt
|
||||
}).ToList(),
|
||||
|
||||
Roles = roles.Select(r => new
|
||||
{
|
||||
r.AccountId,
|
||||
r.Role,
|
||||
r.InvitedRole
|
||||
}).ToList(),
|
||||
|
||||
LoadScreens = loadScreens.Select(l => new
|
||||
{
|
||||
l.ImageUrl,
|
||||
l.Tooltip,
|
||||
l.IsThumbnail
|
||||
}).ToList(),
|
||||
|
||||
PromoImages = promoImages.Select(p => new
|
||||
{
|
||||
p.ImageUrl,
|
||||
p.Tooltip,
|
||||
p.SortOrder
|
||||
}).ToList(),
|
||||
|
||||
PromoExternalContent = external.Select(e => new
|
||||
{
|
||||
e.Type,
|
||||
e.Url,
|
||||
e.Tooltip
|
||||
}).ToList(),
|
||||
|
||||
Stats = new RoomStats { CheerCount = 0, FavoriteCount = 0, VisitorCount = 1, VisitCount = 1 },
|
||||
SubRooms = subRooms.Select(s => new { s.SubRoomId, s.RoomId, s.Name, s.DataBlob, s.IsSandbox, s.MaxPlayers, s.Accessibility, s.UnitySceneId, s.DataSavedAt }).ToList(),
|
||||
Roles = roles.Select(r => new { r.AccountId, r.Role, r.InvitedRole }).ToList(),
|
||||
LoadScreens = loadScreens.Select(l => new { l.ImageUrl, l.Tooltip, l.IsThumbnail }).ToList(),
|
||||
PromoImages = promoImages.Select(p => new { p.ImageUrl, p.Tooltip, p.SortOrder }).ToList(),
|
||||
PromoExternalContent = external.Select(e => new { e.Type, e.Url, e.Tooltip }).ToList(),
|
||||
Tags = tags
|
||||
};
|
||||
|
||||
return Results.Json(response);
|
||||
});
|
||||
app.MapGet("/api/images/v2/named", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
}
|
||||
|
||||
[HttpGet("images/v2/named")]
|
||||
public async Task<IResult> NamedImages() {
|
||||
var json = System.IO.File.ReadAllText("JSON/namedimages.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
app.MapPost("/api/objectives/v1/updateobjective", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
// TODO: implement saving daily
|
||||
}
|
||||
|
||||
[HttpPost("objectives/v1/updateobjective")]
|
||||
public async Task<IResult> UpdateObjective() {
|
||||
return Results.Ok();
|
||||
});
|
||||
app.MapPost("/api/PlayerReporting/v1/hile", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
// stops crashing the game due to bepinex winhttp.dll ( or melonloader version.dll)
|
||||
}
|
||||
|
||||
[HttpPost("PlayerReporting/v1/hile")]
|
||||
public async Task<IResult> PlayerReportingHile() {
|
||||
return Results.Ok();
|
||||
});
|
||||
app.MapGet("/api/storefronts/v3/giftdropstore/300", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
}
|
||||
|
||||
[HttpGet("storefronts/v3/giftdropstore/300")]
|
||||
public async Task<IResult> GiftDropStore300(StorefrontFillService storefrontService) {
|
||||
var storefronts = await storefrontService.GetStorefrontsAsync();
|
||||
var storefront = storefronts.FirstOrDefault(s => s.StorefrontType == 300 && s.Name == "rc_cafe_storefront");
|
||||
if (storefront == null)
|
||||
@@ -1023,40 +568,19 @@ public class APIController : ControllerBase
|
||||
item.NewUntil,
|
||||
GiftDrops = item.GiftDrops.Select(gd => new
|
||||
{
|
||||
gd.Id,
|
||||
gd.StorefrontItemId,
|
||||
gd.GiftDropId,
|
||||
gd.FriendlyName,
|
||||
gd.Tooltip,
|
||||
gd.ConsumableItemDesc,
|
||||
gd.AvatarItemDesc,
|
||||
gd.AvatarItemType,
|
||||
gd.EquipmentPrefabName,
|
||||
gd.EquipmentModificationGuid,
|
||||
gd.IsQuery,
|
||||
gd.Unique,
|
||||
gd.SubscribersOnly,
|
||||
gd.Level,
|
||||
gd.Rarity,
|
||||
gd.CurrencyType,
|
||||
gd.Currency,
|
||||
gd.Context,
|
||||
gd.ItemSetId,
|
||||
gd.ItemSetFriendlyName
|
||||
gd.Id, gd.StorefrontItemId, gd.GiftDropId, gd.FriendlyName, gd.Tooltip,
|
||||
gd.ConsumableItemDesc, gd.AvatarItemDesc, gd.AvatarItemType,
|
||||
gd.EquipmentPrefabName, gd.EquipmentModificationGuid, gd.IsQuery,
|
||||
gd.Unique, gd.SubscribersOnly, gd.Level, gd.Rarity, gd.CurrencyType,
|
||||
gd.Currency, gd.Context, gd.ItemSetId, gd.ItemSetFriendlyName
|
||||
}).ToList(),
|
||||
Prices = item.Prices.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
p.StorefrontItemId,
|
||||
p.CurrencyType,
|
||||
p.Price
|
||||
}).ToList()
|
||||
Prices = item.Prices.Select(p => new { p.Id, p.StorefrontItemId, p.CurrencyType, p.Price }).ToList()
|
||||
}).ToList();
|
||||
var response = new { storefront.Id, storefront.Name, storefront.StorefrontType, storefront.NextUpdate, StoreItems = storeItems };
|
||||
return Results.Ok(response);
|
||||
});
|
||||
app.MapGet("/api/storefronts/v3/giftdropstore/2", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
return Results.Ok(new { storefront.Id, storefront.Name, storefront.StorefrontType, storefront.NextUpdate, StoreItems = storeItems });
|
||||
}
|
||||
|
||||
[HttpGet("storefronts/v3/giftdropstore/2")]
|
||||
public async Task<IResult> GiftDropStore2(StorefrontFillService storefrontService) {
|
||||
var storefronts = await storefrontService.GetStorefrontsAsync();
|
||||
var storefront = storefronts.FirstOrDefault(s => s.StorefrontType == 2 && s.Name == "rec_center_store");
|
||||
if (storefront == null)
|
||||
@@ -1074,52 +598,23 @@ public class APIController : ControllerBase
|
||||
item.NewUntil,
|
||||
GiftDrops = item.GiftDrops.Select(gd => new
|
||||
{
|
||||
gd.Id,
|
||||
gd.StorefrontItemId,
|
||||
gd.GiftDropId,
|
||||
gd.FriendlyName,
|
||||
gd.Tooltip,
|
||||
gd.ConsumableItemDesc,
|
||||
gd.AvatarItemDesc,
|
||||
gd.AvatarItemType,
|
||||
gd.EquipmentPrefabName,
|
||||
gd.EquipmentModificationGuid,
|
||||
gd.IsQuery,
|
||||
gd.Unique,
|
||||
gd.SubscribersOnly,
|
||||
gd.Level,
|
||||
gd.Rarity,
|
||||
gd.CurrencyType,
|
||||
gd.Currency,
|
||||
gd.Context,
|
||||
gd.ItemSetId,
|
||||
gd.ItemSetFriendlyName
|
||||
gd.Id, gd.StorefrontItemId, gd.GiftDropId, gd.FriendlyName, gd.Tooltip,
|
||||
gd.ConsumableItemDesc, gd.AvatarItemDesc, gd.AvatarItemType,
|
||||
gd.EquipmentPrefabName, gd.EquipmentModificationGuid, gd.IsQuery,
|
||||
gd.Unique, gd.SubscribersOnly, gd.Level, gd.Rarity, gd.CurrencyType,
|
||||
gd.Currency, gd.Context, gd.ItemSetId, gd.ItemSetFriendlyName
|
||||
}).ToList(),
|
||||
Prices = item.Prices.Select(p => new
|
||||
{
|
||||
p.Id,
|
||||
p.StorefrontItemId,
|
||||
p.CurrencyType,
|
||||
p.Price
|
||||
}).ToList()
|
||||
Prices = item.Prices.Select(p => new { p.Id, p.StorefrontItemId, p.CurrencyType, p.Price }).ToList()
|
||||
}).ToList();
|
||||
var response = new { storefront.Id, storefront.Name, storefront.StorefrontType, storefront.NextUpdate, StoreItems = storeItems };
|
||||
return Results.Ok(response);
|
||||
});
|
||||
app.MapPost("/api/storefronts/v2/buyItem", async (HttpRequest request, BuyItemRequest buyRequest, AppDbContext db, JwtTokenService jwtService) =>
|
||||
{
|
||||
return Results.Ok(new { storefront.Id, storefront.Name, storefront.StorefrontType, storefront.NextUpdate, StoreItems = storeItems });
|
||||
}
|
||||
|
||||
[HttpPost("storefronts/v2/buyItem")]
|
||||
[Authorize]
|
||||
public async Task<IResult> BuyItem(BuyItemRequest buyRequest, AppDbContext db, NotificationService notificationService) {
|
||||
try
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
|
||||
|
||||
var storefrontItem = await db.StorefrontItems
|
||||
.Include(si => si.Prices)
|
||||
@@ -1127,45 +622,29 @@ public class APIController : ControllerBase
|
||||
.FirstOrDefaultAsync(si => si.PurchasableItemId == buyRequest.PurchasableItemId);
|
||||
|
||||
if (storefrontItem == null)
|
||||
{
|
||||
return Results.NotFound(new { error = "Item not found" });
|
||||
}
|
||||
|
||||
var price = storefrontItem.Prices.FirstOrDefault(p => p.CurrencyType == buyRequest.CurrencyType);
|
||||
if (price == null)
|
||||
{
|
||||
return Results.BadRequest(new { error = "Currency type not available for this item" });
|
||||
}
|
||||
|
||||
var tokenBalance = await db.TokenBalances
|
||||
.FirstOrDefaultAsync(tb => tb.Id == id &&
|
||||
tb.CurrencyType == buyRequest.CurrencyType &&
|
||||
tb.BalanceType == -1);
|
||||
.FirstOrDefaultAsync(tb => tb.Id == id && tb.CurrencyType == buyRequest.CurrencyType && tb.BalanceType == -1);
|
||||
|
||||
if (tokenBalance == null)
|
||||
{
|
||||
return Results.BadRequest(new { error = "Account has no token balance" });
|
||||
}
|
||||
|
||||
if (tokenBalance.Balance < price.Price)
|
||||
{
|
||||
return Results.BadRequest(new { error = "Insufficient balance" });
|
||||
}
|
||||
|
||||
tokenBalance.Balance -= price.Price;
|
||||
db.TokenBalances.Update(tokenBalance);
|
||||
await db.SaveChangesAsync();
|
||||
|
||||
var receiverAccountId = id;
|
||||
int? senderPlayerId = null;
|
||||
|
||||
if (buyRequest.Gift != null)
|
||||
{
|
||||
receiverAccountId = buyRequest.Gift.ToPlayerId;
|
||||
if (!buyRequest.Gift.Anonymous)
|
||||
{
|
||||
senderPlayerId = id;
|
||||
}
|
||||
}
|
||||
|
||||
var storedGifts = new List<ReceivedGift>();
|
||||
@@ -1178,7 +657,6 @@ public class APIController : ControllerBase
|
||||
Message = buyRequest.Gift?.Message ?? "A gift for you <3",
|
||||
ConsumableItemDesc = giftDrop.ConsumableItemDesc ?? string.Empty,
|
||||
AvatarItemDesc = giftDrop.AvatarItemDesc ?? string.Empty,
|
||||
// FriendlyName = giftDrop.FriendlyName ?? string.Empty,
|
||||
AvatarItemType = giftDrop.AvatarItemType,
|
||||
EquipmentPrefabName = giftDrop.EquipmentPrefabName ?? string.Empty,
|
||||
EquipmentModificationGuid = giftDrop.EquipmentModificationGuid ?? string.Empty,
|
||||
@@ -1194,7 +672,6 @@ public class APIController : ControllerBase
|
||||
ReceivedAt = DateTime.UtcNow,
|
||||
IsConsumed = false
|
||||
};
|
||||
|
||||
db.ReceivedGifts.Add(receivedGift);
|
||||
storedGifts.Add(receivedGift);
|
||||
}
|
||||
@@ -1202,55 +679,32 @@ public class APIController : ControllerBase
|
||||
|
||||
var giftData = storedGifts.Select(rg => new GiftData
|
||||
{
|
||||
Id = rg.Id,
|
||||
FromPlayerId = null,
|
||||
ConsumableItemDesc = rg.ConsumableItemDesc,
|
||||
AvatarItemDesc = rg.AvatarItemDesc,
|
||||
FriendlyName = rg.FriendlyName,
|
||||
AvatarItemType = rg.AvatarItemType,
|
||||
EquipmentPrefabName = rg.EquipmentPrefabName,
|
||||
EquipmentModificationGuid = rg.EquipmentModificationGuid,
|
||||
CurrencyType = rg.CurrencyType,
|
||||
Currency = rg.Currency,
|
||||
Xp = rg.Xp,
|
||||
Level = rg.Level,
|
||||
Platform = rg.Platform,
|
||||
PlatformsToSpawnOn = rg.PlatformsToSpawnOn,
|
||||
BalanceType = rg.BalanceType,
|
||||
GiftContext = rg.GiftContext,
|
||||
GiftRarity = rg.GiftRarity,
|
||||
Message = rg.Message
|
||||
Id = rg.Id, FromPlayerId = null,
|
||||
ConsumableItemDesc = rg.ConsumableItemDesc, AvatarItemDesc = rg.AvatarItemDesc,
|
||||
FriendlyName = rg.FriendlyName, AvatarItemType = rg.AvatarItemType,
|
||||
EquipmentPrefabName = rg.EquipmentPrefabName, EquipmentModificationGuid = rg.EquipmentModificationGuid,
|
||||
CurrencyType = rg.CurrencyType, Currency = rg.Currency, Xp = rg.Xp, Level = rg.Level,
|
||||
Platform = rg.Platform, PlatformsToSpawnOn = rg.PlatformsToSpawnOn, BalanceType = rg.BalanceType,
|
||||
GiftContext = rg.GiftContext, GiftRarity = rg.GiftRarity, Message = rg.Message
|
||||
}).ToList();
|
||||
|
||||
var balanceUpdate = new BalanceUpdate
|
||||
{
|
||||
UpdateResponse = 0,
|
||||
Data = giftData
|
||||
};
|
||||
|
||||
var balanceUpdate = new BalanceUpdate { UpdateResponse = 0, Data = giftData };
|
||||
var response = new BuyItemResponse
|
||||
{
|
||||
BalanceUpdates = new List<BalanceUpdate> { balanceUpdate },
|
||||
Balance = tokenBalance.Balance,
|
||||
CurrencyType = buyRequest.CurrencyType,
|
||||
BalanceType = -1,
|
||||
Platform = -1
|
||||
Balance = tokenBalance.Balance, CurrencyType = buyRequest.CurrencyType,
|
||||
BalanceType = -1, Platform = -1
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
var purchaseNotification = notificationService.CreateNotification(
|
||||
PushNotificationId.StorefrontBalancePurchase,
|
||||
id: storefrontItem.Id,
|
||||
toAccountId: id,
|
||||
PushNotificationId.StorefrontBalancePurchase, id: storefrontItem.Id, toAccountId: id,
|
||||
data: new Dictionary<string, object>
|
||||
{
|
||||
{ "BalanceAddType", 1400 },
|
||||
{ "Delta", -price.Price },
|
||||
{ "Balance", tokenBalance.Balance },
|
||||
{ "CurrencyType", buyRequest.CurrencyType }
|
||||
}
|
||||
);
|
||||
{ "BalanceAddType", 1400 }, { "Delta", -price.Price },
|
||||
{ "Balance", tokenBalance.Balance }, { "CurrencyType", buyRequest.CurrencyType }
|
||||
});
|
||||
await notificationService.SendNotificationToPlayer(id, purchaseNotification);
|
||||
}
|
||||
catch (Exception notifEx)
|
||||
@@ -1258,32 +712,24 @@ public class APIController : ControllerBase
|
||||
Console.WriteLine($"Error sending purchase notification: {notifEx.Message}");
|
||||
}
|
||||
|
||||
|
||||
return Results.Ok(response);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return Results.Problem($"Error processing purchase: {ex.Message}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
app.MapPost("/api/avatar/v2/gifts/generate", async (HttpRequest request, AppDbContext db, JwtTokenService jwtService) =>
|
||||
{
|
||||
[HttpPost("avatar/v2/gifts/generate")]
|
||||
[Authorize]
|
||||
public async Task<IResult> AvatarGiftsGenerate(AppDbContext db) {
|
||||
try
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
request.Body.Position = 0;
|
||||
using var reader = new StreamReader(request.Body);
|
||||
Request.EnableBuffering();
|
||||
Request.Body.Position = 0;
|
||||
using var reader = new StreamReader(Request.Body);
|
||||
var body = await reader.ReadToEndAsync();
|
||||
|
||||
int giftContext = 0;
|
||||
@@ -1331,7 +777,6 @@ public class APIController : ControllerBase
|
||||
if (isEarnableItem && earnableRewards.Any())
|
||||
{
|
||||
var avatarRewards = earnableRewards.Where(er => !string.IsNullOrEmpty(er.AvatarItemDesc)).ToList();
|
||||
|
||||
if (avatarRewards.Any())
|
||||
{
|
||||
var ownedAvatarItems = await db.AvatarItems
|
||||
@@ -1339,10 +784,7 @@ public class APIController : ControllerBase
|
||||
.Select(ai => ai.AvatarItemDesc)
|
||||
.ToListAsync();
|
||||
|
||||
var unownedRewards = avatarRewards
|
||||
.Where(ar => !ownedAvatarItems.Contains(ar.AvatarItemDesc))
|
||||
.ToList();
|
||||
|
||||
var unownedRewards = avatarRewards.Where(ar => !ownedAvatarItems.Contains(ar.AvatarItemDesc)).ToList();
|
||||
if (unownedRewards.Any())
|
||||
{
|
||||
var selectedReward = unownedRewards[random.Next(unownedRewards.Count)];
|
||||
@@ -1351,15 +793,9 @@ public class APIController : ControllerBase
|
||||
avatarItemType = selectedReward.AvatarItemType;
|
||||
giftRarity = selectedReward.GiftRarity;
|
||||
}
|
||||
else
|
||||
{
|
||||
isEarnableItem = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
isEarnableItem = false;
|
||||
else { isEarnableItem = false; }
|
||||
}
|
||||
else { isEarnableItem = false; }
|
||||
}
|
||||
|
||||
if (!isEarnableItem)
|
||||
@@ -1372,78 +808,46 @@ public class APIController : ControllerBase
|
||||
|
||||
var receivedGift = new ReceivedGift
|
||||
{
|
||||
ReceiverAccountId = id,
|
||||
FromPlayerId = 1,
|
||||
Message = message,
|
||||
ConsumableItemDesc = consumableItemDesc,
|
||||
AvatarItemDesc = avatarItemDesc,
|
||||
FriendlyName = friendlyName,
|
||||
AvatarItemType = avatarItemType,
|
||||
EquipmentPrefabName = "",
|
||||
EquipmentModificationGuid = "",
|
||||
CurrencyType = currencyType,
|
||||
Currency = currency,
|
||||
Xp = xp,
|
||||
Level = 0,
|
||||
Platform = -1,
|
||||
PlatformsToSpawnOn = -1,
|
||||
BalanceType = 0,
|
||||
GiftContext = giftContext,
|
||||
GiftRarity = giftRarity,
|
||||
ReceivedAt = DateTime.UtcNow,
|
||||
IsConsumed = false
|
||||
ReceiverAccountId = id, FromPlayerId = 1, Message = message,
|
||||
ConsumableItemDesc = consumableItemDesc, AvatarItemDesc = avatarItemDesc,
|
||||
FriendlyName = friendlyName, AvatarItemType = avatarItemType,
|
||||
EquipmentPrefabName = "", EquipmentModificationGuid = "",
|
||||
CurrencyType = currencyType, Currency = currency, Xp = xp, Level = 0,
|
||||
Platform = -1, PlatformsToSpawnOn = -1, BalanceType = 0,
|
||||
GiftContext = giftContext, GiftRarity = giftRarity,
|
||||
ReceivedAt = DateTime.UtcNow, IsConsumed = false
|
||||
};
|
||||
|
||||
db.ReceivedGifts.Add(receivedGift);
|
||||
await db.SaveChangesAsync();
|
||||
|
||||
var giftData = new
|
||||
return Results.Ok(new
|
||||
{
|
||||
Id = receivedGift.Id,
|
||||
FromPlayerId = 1,
|
||||
ConsumableItemDesc = consumableItemDesc,
|
||||
AvatarItemDesc = avatarItemDesc,
|
||||
FriendlyName = friendlyName,
|
||||
AvatarItemType = avatarItemType,
|
||||
EquipmentPrefabName = "",
|
||||
EquipmentModificationGuid = "",
|
||||
CurrencyType = currencyType,
|
||||
Currency = currency,
|
||||
Xp = xp,
|
||||
Level = 0,
|
||||
Platform = -1,
|
||||
PlatformsToSpawnOn = -1,
|
||||
BalanceType = 0,
|
||||
GiftContext = giftContext,
|
||||
GiftRarity = giftRarity,
|
||||
Message = message
|
||||
};
|
||||
|
||||
return Results.Ok(giftData);
|
||||
Id = receivedGift.Id, FromPlayerId = 1,
|
||||
ConsumableItemDesc = consumableItemDesc, AvatarItemDesc = avatarItemDesc,
|
||||
FriendlyName = friendlyName, AvatarItemType = avatarItemType,
|
||||
EquipmentPrefabName = "", EquipmentModificationGuid = "",
|
||||
CurrencyType = currencyType, Currency = currency, Xp = xp, Level = 0,
|
||||
Platform = -1, PlatformsToSpawnOn = -1, BalanceType = 0,
|
||||
GiftContext = giftContext, GiftRarity = giftRarity, Message = message
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return Results.Problem($"Error generating gift: {ex.Message}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
app.MapPost("/api/avatar/v2/gifts/consume/", async (HttpRequest request, AppDbContext db, JwtTokenService jwtService) =>
|
||||
{
|
||||
[HttpPost("avatar/v2/gifts/consume/")]
|
||||
[Authorize]
|
||||
public async Task<IResult> AvatarGiftsConsume(AppDbContext db) {
|
||||
try
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
request.Body.Position = 0;
|
||||
using var reader = new StreamReader(request.Body);
|
||||
Request.EnableBuffering();
|
||||
Request.Body.Position = 0;
|
||||
using var reader = new StreamReader(Request.Body);
|
||||
var body = await reader.ReadToEndAsync();
|
||||
|
||||
var giftId = 0;
|
||||
@@ -1465,17 +869,12 @@ public class APIController : ControllerBase
|
||||
}
|
||||
|
||||
if (giftId == 0)
|
||||
{
|
||||
return Results.BadRequest(new { success = false, error = "Invalid gift ID" });
|
||||
}
|
||||
|
||||
var receivedGift = await db.ReceivedGifts
|
||||
.FirstOrDefaultAsync(rg => rg.Id == giftId && rg.ReceiverAccountId == id);
|
||||
|
||||
if (receivedGift == null)
|
||||
{
|
||||
return Results.NotFound(new { success = false, error = "Gift not found" });
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(receivedGift.ConsumableItemDesc))
|
||||
{
|
||||
@@ -1484,19 +883,15 @@ public class APIController : ControllerBase
|
||||
|
||||
if (existingConsumable == null)
|
||||
{
|
||||
var newConsumable = new ConsumableItem
|
||||
db.ConsumableItems.Add(new ConsumableItem
|
||||
{
|
||||
OwnerAccountId = id,
|
||||
Ids = new List<int> { giftId },
|
||||
CreatedAts = new List<DateTime> { DateTime.UtcNow },
|
||||
ConsumableItemDesc = receivedGift.ConsumableItemDesc,
|
||||
Count = 1,
|
||||
InitialCount = 1,
|
||||
IsActive = false,
|
||||
ActiveDurationMinutes = 0,
|
||||
IsTransferable = false
|
||||
};
|
||||
db.ConsumableItems.Add(newConsumable);
|
||||
Count = 1, InitialCount = 1, IsActive = false,
|
||||
ActiveDurationMinutes = 0, IsTransferable = false
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1509,32 +904,26 @@ public class APIController : ControllerBase
|
||||
|
||||
if (!string.IsNullOrEmpty(receivedGift.AvatarItemDesc))
|
||||
{
|
||||
var avatarItem = new AvatarItem
|
||||
db.AvatarItems.Add(new AvatarItem
|
||||
{
|
||||
OwnerAccountId = id,
|
||||
AvatarItemDesc = receivedGift.AvatarItemDesc,
|
||||
FriendlyName = receivedGift.FriendlyName ?? ""
|
||||
};
|
||||
db.AvatarItems.Add(avatarItem);
|
||||
});
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(receivedGift.Currency.ToString()) && receivedGift.CurrencyType == 2)
|
||||
{
|
||||
var tokenBalance = await db.TokenBalances
|
||||
.FirstOrDefaultAsync(tb => tb.Id == id &&
|
||||
tb.CurrencyType == receivedGift.CurrencyType &&
|
||||
tb.BalanceType == -1);
|
||||
.FirstOrDefaultAsync(tb => tb.Id == id && tb.CurrencyType == receivedGift.CurrencyType && tb.BalanceType == -1);
|
||||
|
||||
if (tokenBalance == null)
|
||||
{
|
||||
tokenBalance = new TokenBalance
|
||||
db.TokenBalances.Add(new TokenBalance
|
||||
{
|
||||
Id = id,
|
||||
CurrencyType = receivedGift.CurrencyType,
|
||||
BalanceType = -1,
|
||||
Balance = receivedGift.Currency
|
||||
};
|
||||
db.TokenBalances.Add(tokenBalance);
|
||||
Id = id, CurrencyType = receivedGift.CurrencyType,
|
||||
BalanceType = -1, Balance = receivedGift.Currency
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1546,7 +935,6 @@ public class APIController : ControllerBase
|
||||
receivedGift.IsConsumed = true;
|
||||
receivedGift.ConsumedAt = DateTime.UtcNow;
|
||||
db.ReceivedGifts.Update(receivedGift);
|
||||
|
||||
await db.SaveChangesAsync();
|
||||
|
||||
return Results.Ok(RecNetResult.Ok());
|
||||
@@ -1555,58 +943,51 @@ public class APIController : ControllerBase
|
||||
{
|
||||
return Results.Problem($"Error consuming gift: {ex.Message}");
|
||||
}
|
||||
});
|
||||
app.MapGet("/api/rooms/v1/filters", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
}
|
||||
|
||||
[HttpGet("rooms/v1/filters")]
|
||||
public async Task<IResult> RoomsFilters() {
|
||||
var json = System.IO.File.ReadAllText("JSON/roomfilters.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
app.MapGet("/roomserver/rooms/{id}/interactionby/me", async (HttpRequest request, AppDbContext db, string id) =>
|
||||
{
|
||||
// TODO: implement
|
||||
}
|
||||
|
||||
[HttpGet("/roomserver/rooms/{id}/interactionby/me")]
|
||||
public async Task<IResult> RoomInteractionByMe(string id) {
|
||||
return Results.Content("{\"Cheered\":false,\"Favorited\":false}", "application/json");
|
||||
});
|
||||
app.MapPost("/api/images/v4/uploadsaved", async (HttpContext context) =>
|
||||
{
|
||||
}
|
||||
|
||||
[HttpPost("images/v4/uploadsaved")]
|
||||
public async Task<IResult> ImageUploadSaved() {
|
||||
try
|
||||
{
|
||||
var form = await context.Request.ReadFormAsync();
|
||||
var form = await HttpContext.Request.ReadFormAsync();
|
||||
var file = form.Files.FirstOrDefault();
|
||||
|
||||
if (file == null)
|
||||
{
|
||||
return Results.BadRequest(new { error = "No file found in request" });
|
||||
}
|
||||
|
||||
var imageId = Guid.NewGuid().ToString("N");
|
||||
var extension = Path.GetExtension(file.FileName).ToLowerInvariant();
|
||||
|
||||
var validExtensions = new[] { ".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp" };
|
||||
if (string.IsNullOrEmpty(extension) || !validExtensions.Contains(extension))
|
||||
{
|
||||
extension = ".png";
|
||||
}
|
||||
|
||||
var savedFileName = imageId + extension;
|
||||
var filePath = Path.Combine(ImagesDir, savedFileName);
|
||||
|
||||
using (var fileStream = System.IO.File.Create(filePath))
|
||||
{
|
||||
await file.CopyToAsync(fileStream);
|
||||
}
|
||||
|
||||
return Results.Ok(new
|
||||
{
|
||||
ImageName = savedFileName
|
||||
});
|
||||
return Results.Ok(new { ImageName = savedFileName });
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return Results.Problem($"Error uploading image: {ex.Message}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/config/v1/backtrace", () => Results.Ok(new
|
||||
[HttpGet("config/v1/backtrace")]
|
||||
public IResult BacktraceConfig() {
|
||||
return Results.Ok(new
|
||||
{
|
||||
ReportBudget = 125,
|
||||
FilterType = 0,
|
||||
@@ -1617,9 +998,10 @@ public class APIController : ControllerBase
|
||||
MessageCount = 1000,
|
||||
MessageRegex = "^Cannot set the parent of the GameObject .* while its new parent|^\\\\>\\\\x2010x\\\\:\\\\x20|\\\\'LabelTheme\\\\' contains missing PaletteTheme reference on",
|
||||
VersionRegex = ".*"
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private static object[]? TryDeserializeTags(string json)
|
||||
{
|
||||
try
|
||||
|
||||
@@ -9,11 +9,6 @@ namespace CannedNet.Services.Controllers;
|
||||
[ApiController, Route("account")]
|
||||
public class AccountsController : ControllerBase
|
||||
{
|
||||
//[HttpGet]
|
||||
//public Task<IResult> Root() {
|
||||
// return Task.FromResult(Results.Ok("FUCKL MYSJDIOJD"));
|
||||
//}
|
||||
|
||||
[HttpGet("me")]
|
||||
public async Task<IResult> Me(HttpRequest request, AppDbContext db, JwtTokenService jwtService) {
|
||||
string authHeader = request.Headers.Authorization.ToString();
|
||||
@@ -106,7 +101,7 @@ public class AccountsController : ControllerBase
|
||||
return Results.Json(result);
|
||||
}
|
||||
|
||||
[HttpPost("cerate")]
|
||||
[HttpPost("create")]
|
||||
public async Task<IResult> Create(HttpRequest httpRequest, AppDbContext db) {
|
||||
int platform = 0;
|
||||
string platformId = "";
|
||||
|
||||
@@ -1,20 +1,19 @@
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
[ApiController, Route("cdn")]
|
||||
public class CDNController
|
||||
{
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
public void MapEndpoints(WebApplication app)
|
||||
{
|
||||
app.MapGet("/config/LoadingScreenTipData", (HttpRequest request) =>
|
||||
{
|
||||
[HttpGet("config/LoadingScreenTipData")]
|
||||
public Task<IResult> GetLoadingScreenTipData() {
|
||||
var json = File.ReadAllText("JSON/loadingscreentipdata.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
return Task.FromResult(Results.Content(json, "application/json"));
|
||||
}
|
||||
|
||||
app.MapGet("/sigs/{sigName}", async (HttpContext context, string sigName) =>
|
||||
[HttpGet("sigs/{sigName}")]
|
||||
public async Task<IResult> GetSig(string sigName)
|
||||
{
|
||||
var filePath = Path.Combine("Sigs", sigName);
|
||||
|
||||
@@ -27,14 +26,13 @@ public class CDNController
|
||||
{
|
||||
return Results.NotFound();
|
||||
}
|
||||
});
|
||||
app.MapPost("/upload", async (HttpContext context) =>
|
||||
}
|
||||
|
||||
[HttpPost("upload")]
|
||||
public async Task<IResult> Upload(IFormFile file)
|
||||
{
|
||||
try
|
||||
{
|
||||
var form = await context.Request.ReadFormAsync();
|
||||
var file = form.Files.FirstOrDefault();
|
||||
|
||||
if (file == null)
|
||||
{
|
||||
return Results.BadRequest(new { error = "No file found in request" });
|
||||
@@ -43,7 +41,7 @@ public class CDNController
|
||||
var imageId = Guid.NewGuid().ToString("N");
|
||||
var extension = Path.GetExtension(file.FileName).ToLowerInvariant();
|
||||
|
||||
var validExtensions = new[] { ".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp" };
|
||||
var validExtensions = new[] { ".png", ".jpg", ".jpeg" };
|
||||
if (string.IsNullOrEmpty(extension) || !validExtensions.Contains(extension))
|
||||
{
|
||||
extension = ".png";
|
||||
@@ -71,6 +69,5 @@ public class CDNController
|
||||
{
|
||||
return Results.Problem($"Error uploading image: {ex.Message}");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[ApiController, Route("chat")]
|
||||
public class ChatController : ControllerBase
|
||||
{
|
||||
[HttpGet("thread")]
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
public class ClubsController
|
||||
[ApiController, Route("club")]
|
||||
public class ClubsController : ControllerBase
|
||||
{
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
public void MapEndpoints(WebApplication app)
|
||||
{
|
||||
app.MapGet("/club/home/me", () =>
|
||||
[HttpGet("home/me")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetClubHomeMe()
|
||||
{
|
||||
return Results.NotFound();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,13 @@
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
public class CommerceController
|
||||
[ApiController, Route("commerce")]
|
||||
public class CommerceController : ControllerBase
|
||||
{
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
public void MapEndpoints(WebApplication app)
|
||||
{
|
||||
app.MapGet("/purchase/v1/hasspentmoney", (HttpRequest request) =>
|
||||
[HttpGet("purchase/v1/hasspentmoney")]
|
||||
public async Task<IResult> HasSpentMoney()
|
||||
{
|
||||
return Results.NotFound();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,45 +1,33 @@
|
||||
using CannedNet.Data;
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
public class EconController
|
||||
[ApiController, Route("econ")]
|
||||
public class EconController : ControllerBase
|
||||
{
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
public void MapEndpoints(WebApplication app)
|
||||
[HttpGet("api/avatar/v1/defaultunlocked")]
|
||||
public async Task<IResult> DefaultUnlocked()
|
||||
{
|
||||
var jwtService = app.Services.GetRequiredService<JwtTokenService>();
|
||||
var notificationService = app.Services.GetRequiredService<NotificationService>();
|
||||
var storefrontService = app.Services.GetRequiredService<StorefrontFillService>();
|
||||
|
||||
app.MapGet("/api/avatar/v1/defaultunlocked", () =>
|
||||
{
|
||||
var json = File.ReadAllText("JSON/defaultAvatarItems.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/defaultAvatarItems.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/avatar/v1/defaultbaseavataritems", () =>
|
||||
[HttpGet("api/avatar/v1/defaultbaseavataritems")]
|
||||
public async Task<IResult> DefaultBaseAvatarItems()
|
||||
{
|
||||
var json = File.ReadAllText("JSON/defaultAvatarItems.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/defaultAvatarItems.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/avatar/v4/items", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/avatar/v4/items")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetAvatarItemsV4(AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var ownedItems = await db.AvatarItems
|
||||
@@ -206,29 +194,20 @@ public class EconController
|
||||
var allItems = ownedItems.Cast<object>().Concat(defaultItems).ToList();
|
||||
|
||||
return Results.Json(allItems);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/objectives/v1/myprogress", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/objectives/v1/myprogress")]
|
||||
public async Task<IResult> ObjectivesMyProgress()
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
var json = File.ReadAllText("JSON/tempmyprogress.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/tempmyprogress.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/avatar/v2", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/avatar/v2")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetAvatarV2(AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var avatar = await db.PlayerAvatars
|
||||
@@ -255,27 +234,13 @@ public class EconController
|
||||
SkinColor = avatar.SkinColor,
|
||||
HairColor = avatar.HairColor
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/econ/customAvatarItems/v1/owned", async (HttpRequest request) =>
|
||||
[HttpPost("api/settings/v2/set")]
|
||||
[Authorize]
|
||||
public async Task<IResult> SetSettings(HttpRequest request, AppDbContext db)
|
||||
{
|
||||
return Results.Json(new { items = new List<object>() });
|
||||
});
|
||||
|
||||
app.MapPost("/api/settings/v2/set", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
@@ -314,24 +279,25 @@ public class EconController
|
||||
|
||||
await db.SaveChangesAsync();
|
||||
return Results.Ok();
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/equipment/v2/getUnlocked", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("econ/customAvatarItems/v1/owned")]
|
||||
public async Task<IResult> CustomAvatarItemsOwned()
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
return "[]";
|
||||
});
|
||||
return Results.Json(new { items = new List<object>() });
|
||||
}
|
||||
|
||||
app.MapGet("/api/consumables/v2/getUnlocked", async (HttpRequest request, AppDbContext db, JwtTokenService jwtService) =>
|
||||
[HttpGet("api/equipment/v2/getUnlocked")]
|
||||
public async Task<IResult> GetEquipmentUnlocked()
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
return Results.Content("[]", "application/json");
|
||||
}
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out var id))
|
||||
[HttpGet("api/consumables/v2/getUnlocked")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetConsumablesUnlocked(AppDbContext db)
|
||||
{
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var consumables = await db.ConsumableItems
|
||||
@@ -339,22 +305,13 @@ public class EconController
|
||||
.ToListAsync();
|
||||
|
||||
return Results.Json(consumables);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/storefronts/v4/balance/2", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/storefronts/v4/balance/2")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetStorefrontBalance(AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var balance = await db.TokenBalances
|
||||
@@ -362,15 +319,16 @@ public class EconController
|
||||
.ToListAsync();
|
||||
|
||||
return Results.Json(balance);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/storefronts/v3/giftdropstore/3", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/storefronts/v3/giftdropstore/3")]
|
||||
public async Task<IResult> GetGiftDropStore3(AppDbContext db, StorefrontFillService storefrontService)
|
||||
{
|
||||
var storefronts = await storefrontService.GetStorefrontsAsync();
|
||||
var storefront = storefronts.FirstOrDefault(s => s.StorefrontType == 2 && s.Name == "watch_store");
|
||||
if (storefront == null)
|
||||
{
|
||||
var json = File.ReadAllText("JSON/storefront3.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/storefront3.json");
|
||||
return Results.Content(json, "application/json");
|
||||
}
|
||||
var storeItems = storefront.Items.Select(item => new
|
||||
@@ -414,29 +372,20 @@ public class EconController
|
||||
}).ToList();
|
||||
var response = new { storefront.Id, storefront.Name, storefront.StorefrontType, storefront.NextUpdate, StoreItems = storeItems };
|
||||
return Results.Ok(response);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/challenge/v2/getCurrent", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/challenge/v2/getCurrent")]
|
||||
public async Task<IResult> GetCurrentChallenge()
|
||||
{
|
||||
var json = File.ReadAllText("JSON/weeklychallenge.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/weeklychallenge.json");
|
||||
return Results.Content(json, "application/json");
|
||||
//return "{}";
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/avatar/v3/saved", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/avatar/v3/saved")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetSavedAvatars(HttpRequest request, AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
@@ -446,23 +395,17 @@ public class EconController
|
||||
.ToListAsync();
|
||||
|
||||
return Results.Json(items);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/avatar/v2/gifts", async (HttpRequest request, AppDbContext db, JwtTokenService jwtService) =>
|
||||
[HttpGet("api/avatar/v2/gifts")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetGifts(AppDbContext db)
|
||||
{
|
||||
try
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId) || !int.TryParse(accountId.AsSpan(), out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
// Get all pending (unconsumed) gifts for this player
|
||||
var pendingGifts = await db.ReceivedGifts
|
||||
.Where(rg => rg.ReceiverAccountId == id && !rg.IsConsumed)
|
||||
.ToListAsync();
|
||||
@@ -473,23 +416,23 @@ public class EconController
|
||||
{
|
||||
return Results.Problem($"Error retrieving gifts: {ex.Message}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/api/gamerewards/v1/pending", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/gamerewards/v1/pending")]
|
||||
public async Task<IResult> GetGameRewardsPending()
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
return "[]";
|
||||
});
|
||||
return Results.Content("[]", "application/json");
|
||||
}
|
||||
|
||||
app.MapGet("/api/roomkeys/v1/mine", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("api/roomkeys/v1/mine")]
|
||||
public async Task<IResult> GetRoomKeysMine()
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
return "[]";
|
||||
});
|
||||
return Results.Content("[]", "application/json");
|
||||
}
|
||||
|
||||
app.MapPost("/api/CampusCard/v1/UpdateAndGetSubscription", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpPost("api/CampusCard/v1/UpdateAndGetSubscription")]
|
||||
public async Task<IResult> UpdateAndGetSubscription()
|
||||
{
|
||||
return Results.Json(new { subscription = (object?)null, platformAccountSubscribedPlayerId = (object?)null });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.Processing;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
[ApiController, Route("")]
|
||||
[ApiController, Route("img")]
|
||||
public class ImageController : ControllerBase
|
||||
{
|
||||
private static readonly byte[] PlaceholderJpeg;
|
||||
@@ -22,8 +22,6 @@ public class ImageController : ControllerBase
|
||||
PlaceholderJpeg = ms.ToArray();
|
||||
}
|
||||
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
[HttpGet("{imageName}")]
|
||||
public async Task<IResult> GetImage(HttpContext context, string imageName) {
|
||||
string imagesDir = Path.Combine("Images");
|
||||
|
||||
@@ -2,43 +2,43 @@ using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using CannedNet.Data;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using CannedNet.Services;
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
public class MatchmakingController
|
||||
[ApiController, Route("match")]
|
||||
public class MatchmakingController : ControllerBase
|
||||
{
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
public void MapEndpoints(WebApplication app)
|
||||
[HttpPost("player/login")]
|
||||
public async Task<IResult> PlayerLogin()
|
||||
{
|
||||
var jwtService = app.Services.GetRequiredService<JwtTokenService>();
|
||||
return Results.Ok();
|
||||
}
|
||||
|
||||
app.MapPost("/player/login", () => Results.Ok());
|
||||
|
||||
app.MapPost("/player/exclusivelogin", (HttpRequest request) =>
|
||||
[HttpPost("player/exclusivelogin")]
|
||||
public async Task<IResult> PlayerExclusiveLogin()
|
||||
{
|
||||
return Results.Json(new { errorCode = 0 });
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/player", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("player")]
|
||||
public async Task<IResult> GetPlayer(HttpRequest request, AppDbContext db)
|
||||
{
|
||||
var id = request.Query["id"].FirstOrDefault();
|
||||
if (string.IsNullOrEmpty(id) || !int.TryParse(id, out var accountId))
|
||||
{
|
||||
var json = File.ReadAllText("JSON/getplayer.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/getplayer.json");
|
||||
return Results.Content(json, "application/json");
|
||||
}
|
||||
|
||||
var account = await db.Accounts.FindAsync(accountId);
|
||||
if (account == null)
|
||||
{
|
||||
var json = File.ReadAllText("JSON/getplayer.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/getplayer.json");
|
||||
return Results.Content(json, "application/json");
|
||||
}
|
||||
|
||||
// Get the player's active room instance
|
||||
var roomInstance = await db.RoomInstances
|
||||
.Where(r => r.OwnerAccountId == accountId)
|
||||
.OrderByDescending(r => r.Id)
|
||||
@@ -79,22 +79,13 @@ public class MatchmakingController
|
||||
};
|
||||
|
||||
return Results.Json(result);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapPost("/goto/room/{room}", async (HttpRequest request, string room, AppDbContext db) =>
|
||||
[HttpPost("goto/room/{room}")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GotoRoom(HttpRequest request, string room, AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
@@ -135,7 +126,6 @@ public class MatchmakingController
|
||||
int subRoomId = subRoom?.SubRoomId ?? 0;
|
||||
int maxCapacity = subRoom?.MaxPlayers ?? 4;
|
||||
|
||||
|
||||
RoomInstance? instanceToUse;
|
||||
string photonRoomId;
|
||||
|
||||
@@ -229,22 +219,13 @@ public class MatchmakingController
|
||||
}
|
||||
};
|
||||
return Results.Json(response);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapPost("/matchmake/{room}", async (HttpRequest request, string room, AppDbContext db) =>
|
||||
[HttpPost("matchmake/{room}")]
|
||||
[Authorize]
|
||||
public async Task<IResult> MatchmakeRoom(HttpRequest request, string room, AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
@@ -285,7 +266,6 @@ public class MatchmakingController
|
||||
int subRoomId = subRoom?.SubRoomId ?? 0;
|
||||
int maxCapacity = subRoom?.MaxPlayers ?? 4;
|
||||
|
||||
|
||||
RoomInstance? instanceToUse;
|
||||
string photonRoomId;
|
||||
|
||||
@@ -379,13 +359,11 @@ public class MatchmakingController
|
||||
}
|
||||
};
|
||||
return Results.Json(response);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapPost("/matchmake/none", (HttpRequest request) =>
|
||||
[HttpPost("matchmake/none")]
|
||||
public async Task<IResult> MatchmakeNone()
|
||||
{
|
||||
// dormroom location id : 76d98498-60a1-430c-ab76-b54a29b7a163
|
||||
// offline dorm
|
||||
|
||||
return Results.Json(new
|
||||
{
|
||||
errorCode = 0,
|
||||
@@ -409,22 +387,13 @@ public class MatchmakingController
|
||||
EncryptVoiceChat = false
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
app.MapPost("/player/heartbeat", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpPost("player/heartbeat")]
|
||||
[Authorize]
|
||||
public async Task<IResult> PlayerHeartbeat(HttpRequest request, AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
request.EnableBuffering();
|
||||
@@ -445,13 +414,11 @@ public class MatchmakingController
|
||||
if (heartbeat == null)
|
||||
heartbeat = new HeartbeatRequest();
|
||||
|
||||
// Get the player's active room instance (most recent one)
|
||||
var roomInstance = await db.RoomInstances
|
||||
.Where(r => r.OwnerAccountId == id)
|
||||
.OrderByDescending(r => r.Id)
|
||||
.FirstOrDefaultAsync();
|
||||
|
||||
|
||||
return Results.Json(new
|
||||
{
|
||||
playerId = heartbeat.playerId != 0 ? heartbeat.playerId : id,
|
||||
@@ -482,16 +449,18 @@ public class MatchmakingController
|
||||
appVersion = heartbeat.appVersion ?? "",
|
||||
platform = heartbeat.platform
|
||||
});
|
||||
});
|
||||
app.MapPut("/player/statusvisibility", async (HttpRequest request, AppDbContext db) =>
|
||||
}
|
||||
|
||||
[HttpPut("player/statusvisibility")]
|
||||
public async Task<IResult> PlayerStatusVisibility()
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
return Results.Ok();
|
||||
});
|
||||
app.MapPost("/roominstance/{id}/reportjoinresult", async (HttpRequest request, AppDbContext db) =>
|
||||
}
|
||||
|
||||
[HttpPost("roominstance/{id}/reportjoinresult")]
|
||||
public async Task<IResult> ReportJoinResult()
|
||||
{
|
||||
return Results.Ok();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
//TODO: proper NameServer configs
|
||||
[ApiController, Route("")]
|
||||
[ApiController, Route("ns")]
|
||||
public class NSController : ControllerBase
|
||||
{
|
||||
[HttpGet]
|
||||
|
||||
@@ -1,33 +1,18 @@
|
||||
using CannedNet.Data;
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
public class PlayerSettingsController
|
||||
[ApiController, Route("playersettings")]
|
||||
public class PlayerSettingsController : ControllerBase
|
||||
{
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
public void MapEndpoints(WebApplication app)
|
||||
[HttpGet("playersettings")]
|
||||
[Authorize]
|
||||
public async Task<IResult> GetPlayerSettings(AppDbContext db)
|
||||
{
|
||||
var jwtService = app.Services.GetRequiredService<JwtTokenService>();
|
||||
var notificationService = app.Services.GetRequiredService<NotificationService>();
|
||||
|
||||
app.MapGet("/playersettings" +
|
||||
"", async (HttpRequest request, AppDbContext db) =>
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var settings = await db.PlayerSettings
|
||||
@@ -76,22 +61,13 @@ public class PlayerSettingsController
|
||||
}
|
||||
|
||||
return Results.Json(settings);
|
||||
});
|
||||
}
|
||||
|
||||
app.MapPut("/playersettings", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpPut("playersettings")]
|
||||
[Authorize]
|
||||
public async Task<IResult> PutPlayerSettings(HttpRequest request, AppDbContext db)
|
||||
{
|
||||
var authHeader = request.Headers.Authorization.ToString();
|
||||
|
||||
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var token = authHeader.Substring("Bearer ".Length);
|
||||
var accountId = jwtService.ValidateAndGetAccountId(token);
|
||||
|
||||
if (string.IsNullOrEmpty(accountId))
|
||||
return Results.Unauthorized();
|
||||
|
||||
if (!int.TryParse(accountId.AsSpan(), out var id))
|
||||
if (!int.TryParse(User.Identity?.Name, out var id))
|
||||
return Results.Unauthorized();
|
||||
|
||||
var settings = new List<PlayerSetting>();
|
||||
@@ -142,6 +118,5 @@ public class PlayerSettingsController
|
||||
|
||||
await db.SaveChangesAsync();
|
||||
return Results.Ok();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
using CannedNet.Data;
|
||||
using CannedNet.Services.Infrastructure;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace CannedNet.Services.Controllers;
|
||||
|
||||
public class RoomsController
|
||||
[ApiController, Route("rooms")]
|
||||
public class RoomsController : ControllerBase
|
||||
{
|
||||
public WebApplicationBuilder Initialize(string[]? args = null) => ServiceExtensions.CreateRecNetBuilder(args);
|
||||
|
||||
public void MapEndpoints(WebApplication app)
|
||||
{
|
||||
app.MapGet("/rooms", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("rooms")]
|
||||
public async Task<IResult> GetRooms(HttpRequest request, AppDbContext db)
|
||||
{
|
||||
var idParam = request.Query["id"].FirstOrDefault();
|
||||
var nameParam = request.Query["name"].FirstOrDefault();
|
||||
@@ -35,23 +33,23 @@ public class RoomsController
|
||||
return Results.Json(new { });
|
||||
|
||||
return Results.Json(await BuildRoomResponse(result, db));
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/rooms/{roomId:int}", async (int roomId, AppDbContext db) =>
|
||||
[HttpGet("rooms/{roomId:int}")]
|
||||
public async Task<IResult> GetRoomById(int roomId, AppDbContext db)
|
||||
{
|
||||
var result = await db.Rooms.FirstOrDefaultAsync(r => r.RoomId == roomId);
|
||||
if (result == null)
|
||||
return Results.NotFound();
|
||||
|
||||
return Results.Json(await BuildRoomResponse(result, db));
|
||||
});
|
||||
}
|
||||
|
||||
app.MapGet("/roomserver/rooms/createdby/me", async (HttpRequest request, AppDbContext db) =>
|
||||
[HttpGet("roomserver/rooms/createdby/me")]
|
||||
public async Task<IResult> GetRoomsCreatedByMe()
|
||||
{
|
||||
// TODO ADD FUNCTIONALITY
|
||||
var json = File.ReadAllText("JSON/ownedrooms.json");
|
||||
var json = System.IO.File.ReadAllText("JSON/ownedrooms.json");
|
||||
return Results.Content(json, "application/json");
|
||||
});
|
||||
}
|
||||
|
||||
private static async Task<object> BuildRoomResponse(Room result, AppDbContext db)
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
using CannedNet.Services.Controllers;
|
||||
|
||||
namespace CannedNet.Services.Infrastructure;
|
||||
|
||||
public class ServiceRegistry
|
||||
{
|
||||
public required string Name { get; init; }
|
||||
public required int Port { get; init; }
|
||||
public required Type ServiceType { get; init; }
|
||||
public required Action<WebApplicationBuilder> ConfigureBuilder { get; init; }
|
||||
public required Action<WebApplication, JwtTokenService> MapEndpoints { get; init; }
|
||||
}
|
||||
|
||||
public static class Services
|
||||
{
|
||||
public static readonly List<ServiceRegistry> All =
|
||||
[
|
||||
//new() { Name = "NS", Port = 5001, ServiceType = typeof(NSController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new NSController().MapEndpoints(app) },
|
||||
new() { Name = "API", Port = 5000, ServiceType = typeof(APIController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new APIController().MapEndpoints(app) },
|
||||
//new() { Name = "Auth", Port = 5002, ServiceType = typeof(AuthController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, jwt) => new AuthController().MapEndpoints(app) },
|
||||
//new() { Name = "Chat", Port = 5003, ServiceType = typeof(ChatController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new ChatController().MapEndpoints(app) },
|
||||
new() { Name = "Match", Port = 5004, ServiceType = typeof(MatchmakingController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new MatchmakingController().MapEndpoints(app) },
|
||||
//new() { Name = "Accounts", Port = 5005, ServiceType = typeof(AccountsController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, jwt) => new AccountsController().MapEndpoints(app, jwt) },
|
||||
//new() { Name = "Notify", Port = 5006, ServiceType = typeof(NotifyController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new NotifyController().MapEndpoints(app) },
|
||||
new() { Name = "CDN", Port = 5007, ServiceType = typeof(CDNController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new CDNController().MapEndpoints(app) },
|
||||
//new() { Name = "Image", Port = 5008, ServiceType = typeof(ImageController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new ImageController().MapEndpoints(app) },
|
||||
new() { Name = "Clubs", Port = 5009, ServiceType = typeof(ClubsController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new ClubsController().MapEndpoints(app) },
|
||||
new() { Name = "Commerce", Port = 5010, ServiceType = typeof(CommerceController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new CommerceController().MapEndpoints(app) },
|
||||
new() { Name = "Econ", Port = 5011, ServiceType = typeof(EconController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new EconController().MapEndpoints(app) },
|
||||
new() { Name = "PlayerSettings", Port = 5012, ServiceType = typeof(PlayerSettingsController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new PlayerSettingsController().MapEndpoints(app) },
|
||||
new() { Name = "RoomsController", Port = 5013, ServiceType = typeof(RoomsController), ConfigureBuilder = b => b.ConfigureRecNetServices(), MapEndpoints = (app, _) => new RoomsController().MapEndpoints(app) }
|
||||
];
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Security.Claims;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using System.IdentityModel.Tokens.Jwt;
|
||||
using CannedNet.Services;
|
||||
|
||||
namespace CannedNet;
|
||||
|
||||
@@ -14,7 +15,11 @@ public class JwtTokenService
|
||||
|
||||
public JwtTokenService()
|
||||
{
|
||||
_securityKey = new RsaSecurityKey(_rsa) { KeyId = KeyId };
|
||||
var rsa = Signatures.GetRsaInstance()
|
||||
?? throw new InvalidOperationException("jwt - sigs service was not found");
|
||||
|
||||
_securityKey = new RsaSecurityKey(rsa) { KeyId = KeyId };
|
||||
|
||||
_signingCredentials = new SigningCredentials(_securityKey, SecurityAlgorithms.RsaSha256);
|
||||
}
|
||||
|
||||
|
||||
@@ -37,6 +37,12 @@ public static class Signatures
|
||||
}
|
||||
}
|
||||
|
||||
public static RSA? GetRsaInstance()
|
||||
{
|
||||
if (!_initialized) Init();
|
||||
return _rsa;
|
||||
}
|
||||
|
||||
public static string? Sign(byte[] data)
|
||||
{
|
||||
if (_rsa == null) return null;
|
||||
|
||||
Reference in New Issue
Block a user