liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run dotnet format

Browse Source
This commit is contained in:
spiral
2021-08-27 11:03:47 -04:00
parent 05989242f9
commit ac2671452d
278 changed files with 1913 additions and 1808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PluralKit.API/Controllers/v1/AccountController.cs
View File

@@ -10,7 +10,7 @@ namespace PluralKit.API
{
[ApiController]
[ApiVersion("1.0")]
[Route( "v{version:apiVersion}/a" )]
[Route("v{version:apiVersion}/a")]
public class AccountController: ControllerBase
{
private readonly IDatabase _db;
@@ -27,7 +27,7 @@ namespace PluralKit.API
var system = await _db.Execute(c => _repo.GetSystemByAccount(c, aid));
if (system == null)
return NotFound("Account not found.");
return Ok(system.ToJson(User.ContextFor(system)));
}
}

18
PluralKit.API/Controllers/v1/MemberController.cs
View File

@@ -14,7 +14,7 @@ namespace PluralKit.API
{
[ApiController]
[ApiVersion("1.0")]
[Route( "v{version:apiVersion}/m" )]
[Route("v{version:apiVersion}/m")]
public class MemberController: ControllerBase
{
private readonly IDatabase _db;
@@ -43,14 +43,14 @@ namespace PluralKit.API
{
if (!properties.ContainsKey("name"))
return BadRequest("Member name must be specified.");
var systemId = User.CurrentSystem();
await using var conn = await _db.Obtain();
var systemData = await _repo.GetSystem(conn, systemId);
// Enforce per-system member limit
var memberCount = await conn.QuerySingleAsync<int>("select count(*) from members where system = @System", new {System = systemId});
var memberCount = await conn.QuerySingleAsync<int>("select count(*) from members where system = @System", new { System = systemId });
var memberLimit = systemData?.MemberLimitOverride ?? Limits.MaxMemberCount;
if (memberCount >= memberLimit)
return BadRequest($"Member limit reached ({memberCount} / {memberLimit}).");
@@ -74,7 +74,7 @@ namespace PluralKit.API
await tx.RollbackAsync();
return BadRequest($"Request field '{e.Message}' is invalid.");
}
member = await _repo.UpdateMember(conn, member.Id, patch, transaction: tx);
await tx.CommitAsync();
return Ok(member.ToJson(User.ContextFor(member), needsLegacyProxyTags: true));
@@ -88,7 +88,7 @@ namespace PluralKit.API
var member = await _repo.GetMemberByHid(conn, hid);
if (member == null) return NotFound("Member not found.");
var res = await _auth.AuthorizeAsync(User, member, "EditMember");
if (!res.Succeeded) return Unauthorized($"Member '{hid}' is not part of your system.");
@@ -106,11 +106,11 @@ namespace PluralKit.API
{
return BadRequest($"Request field '{e.Message}' is invalid.");
}
var newMember = await _repo.UpdateMember(conn, member.Id, patch);
return Ok(newMember.ToJson(User.ContextFor(newMember), needsLegacyProxyTags: true));
}
[HttpDelete("{hid}")]
[Authorize]
public async Task<ActionResult> DeleteMember(string hid)
@@ -119,7 +119,7 @@ namespace PluralKit.API
var member = await _repo.GetMemberByHid(conn, hid);
if (member == null) return NotFound("Member not found.");
var res = await _auth.AuthorizeAsync(User, member, "EditMember");
if (!res.Succeeded) return Unauthorized($"Member '{hid}' is not part of your system.");
@@ -127,4 +127,4 @@ namespace PluralKit.API
return Ok();
}
}
}
}

8
PluralKit.API/Controllers/v1/MessageController.cs
View File

@@ -22,10 +22,10 @@ namespace PluralKit.API
[JsonProperty("system")] public JObject System;
[JsonProperty("member")] public JObject Member;
}
[ApiController]
[ApiVersion("1.0")]
[Route( "v{version:apiVersion}/msg" )]
[Route("v{version:apiVersion}/msg")]
public class MessageController: ControllerBase
{
private readonly IDatabase _db;
@@ -45,7 +45,7 @@ namespace PluralKit.API
return new MessageReturn
{
Timestamp = Instant.FromUnixTimeMilliseconds((long) (msg.Message.Mid >> 22) + 1420070400000),
Timestamp = Instant.FromUnixTimeMilliseconds((long)(msg.Message.Mid >> 22) + 1420070400000),
Id = msg.Message.Mid.ToString(),
Channel = msg.Message.Channel.ToString(),
Sender = msg.Message.Sender.ToString(),
@@ -53,6 +53,6 @@ namespace PluralKit.API
System = msg.System.ToJson(User.ContextFor(msg.System)),
Original = msg.Message.OriginalMid?.ToString()
};
}
}
}
}

8
PluralKit.API/Controllers/v1/MetaController.cs
View File

@@ -13,8 +13,8 @@ namespace PluralKit.API
{
[ApiController]
[ApiVersion("1.0")]
[Route( "v{version:apiVersion}" )]
public class MetaController : ControllerBase
[Route("v{version:apiVersion}")]
public class MetaController: ControllerBase
{
private readonly IDatabase _db;
private readonly ModelRepository _repo;
@@ -33,7 +33,7 @@ namespace PluralKit.API
var o = new JObject();
o.Add("shards", shards.ToJSON());
o.Add("version", BuildInfoService.Version);
return Ok(o);
}
}
@@ -53,7 +53,7 @@ namespace PluralKit.API
s.Add("status", "down");
else
s.Add("status", "up");
s.Add("ping", shard.Ping);
s.Add("last_heartbeat", shard.LastHeartbeat.ToString());
s.Add("last_connection", shard.LastConnection.ToString());

30
PluralKit.API/Controllers/v1/SystemController.cs
View File

@@ -37,8 +37,8 @@ namespace PluralKit.API
[ApiController]
[ApiVersion("1.0")]
[Route( "v{version:apiVersion}/s" )]
public class SystemController : ControllerBase
[Route("v{version:apiVersion}/s")]
public class SystemController: ControllerBase
{
private readonly IDatabase _db;
private readonly ModelRepository _repo;
@@ -88,9 +88,9 @@ namespace PluralKit.API
public async Task<ActionResult<IEnumerable<SwitchesReturn>>> GetSwitches(string hid, [FromQuery(Name = "before")] Instant? before)
{
if (before == null) before = SystemClock.Instance.GetCurrentInstant();
await using var conn = await _db.Obtain();
var system = await _repo.GetSystemByHid(conn, hid);
if (system == null) return NotFound("System not found.");
@@ -104,7 +104,7 @@ namespace PluralKit.API
) as members from switches
where switches.system = @System and switches.timestamp < @Before
order by switches.timestamp desc
limit 100;", new {System = system.Id, Before = before});
limit 100;", new { System = system.Id, Before = before });
return Ok(res);
}
@@ -112,16 +112,16 @@ namespace PluralKit.API
public async Task<ActionResult<FrontersReturn>> GetFronters(string hid)
{
await using var conn = await _db.Obtain();
var system = await _repo.GetSystemByHid(conn, hid);
if (system == null) return NotFound("System not found.");
var auth = await _auth.AuthorizeAsync(User, system, "ViewFront");
if (!auth.Succeeded) return StatusCode(StatusCodes.Status403Forbidden, "Unauthorized to view fronter.");
var sw = await _repo.GetLatestSwitch(conn, system.Id);
if (sw == null) return NotFound("System has no registered switches.");
if (sw == null) return NotFound("System has no registered switches.");
var members = _repo.GetSwitchMembers(conn, sw.Id);
return Ok(new FrontersReturn
{
@@ -162,7 +162,7 @@ namespace PluralKit.API
{
if (param.Members.Distinct().Count() != param.Members.Count)
return BadRequest("Duplicate members in member list.");
await using var conn = await _db.Obtain();
// We get the current switch, if it exists
@@ -177,8 +177,8 @@ namespace PluralKit.API
}
// Resolve member objects for all given IDs
var membersList = (await conn.QueryAsync<PKMember>("select * from members where hid = any(@Hids)", new {Hids = param.Members})).ToList();
var membersList = (await conn.QueryAsync<PKMember>("select * from members where hid = any(@Hids)", new { Hids = param.Members })).ToList();
foreach (var member in membersList)
if (member.System != User.CurrentSystem())
return BadRequest($"Cannot switch to member '{member.Hid}' not in system.");
@@ -186,12 +186,12 @@ namespace PluralKit.API
// membersList is in DB order, and we want it in actual input order
// so we go through a dict and map the original input appropriately
var membersDict = membersList.ToDictionary(m => m.Hid);
var membersInOrder = new List<PKMember>();
// We do this without .Select() since we want to have the early return bail if it doesn't find the member
foreach (var givenMemberId in param.Members)
{
if (!membersDict.TryGetValue(givenMemberId, out var member))
if (!membersDict.TryGetValue(givenMemberId, out var member))
return BadRequest($"Member '{givenMemberId}' not found.");
membersInOrder.Add(member);
}