mirror of
https://github.com/TeamOctolings/Octobot.git
synced 2025-04-19 16:33:36 +03:00
Merge branch 'master' into fix-180
This commit is contained in:
commit
caaeb69b31
3 changed files with 7 additions and 9 deletions
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
public static class BuildInfo
|
public static class BuildInfo
|
||||||
{
|
{
|
||||||
public static string RepositoryUrl => ThisAssembly.Git.RepositoryUrl;
|
public const string RepositoryUrl = "https://github.com/TeamOctolings/Octobot";
|
||||||
|
|
||||||
public static string IssuesUrl => $"{RepositoryUrl}/issues";
|
public const string IssuesUrl = $"{RepositoryUrl}/issues";
|
||||||
|
|
||||||
public static string WikiUrl => $"{RepositoryUrl}/wiki";
|
public const string WikiUrl = $"{RepositoryUrl}/wiki";
|
||||||
|
|
||||||
private static string Commit => ThisAssembly.Git.Commit;
|
private const string Commit = ThisAssembly.Git.Commit;
|
||||||
|
|
||||||
private static string Branch => ThisAssembly.Git.Branch;
|
private const string Branch = ThisAssembly.Git.Branch;
|
||||||
|
|
||||||
public static bool IsDirty => ThisAssembly.Git.IsDirty;
|
public static bool IsDirty => ThisAssembly.Git.IsDirty;
|
||||||
|
|
||||||
|
|
|
@ -5,10 +5,9 @@ namespace Octobot.Data;
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class MemberData
|
public sealed class MemberData
|
||||||
{
|
{
|
||||||
public MemberData(ulong id, DateTimeOffset? bannedUntil = null, List<Reminder>? reminders = null)
|
public MemberData(ulong id, List<Reminder>? reminders = null)
|
||||||
{
|
{
|
||||||
Id = id;
|
Id = id;
|
||||||
BannedUntil = bannedUntil;
|
|
||||||
if (reminders is not null)
|
if (reminders is not null)
|
||||||
{
|
{
|
||||||
Reminders = reminders;
|
Reminders = reminders;
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Remora.Discord.Commands.Extensions;
|
|
||||||
using Remora.Results;
|
using Remora.Results;
|
||||||
|
|
||||||
namespace Octobot.Extensions;
|
namespace Octobot.Extensions;
|
||||||
|
@ -19,7 +18,7 @@ public static class LoggerExtensions
|
||||||
/// <param name="message">The message to use if this result has failed.</param>
|
/// <param name="message">The message to use if this result has failed.</param>
|
||||||
public static void LogResult(this ILogger logger, IResult result, string? message = "")
|
public static void LogResult(this ILogger logger, IResult result, string? message = "")
|
||||||
{
|
{
|
||||||
if (result.IsSuccess || result.Error.IsUserOrEnvironmentError())
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue