minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 17:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Possible fix for patreon auto-creds update

Browse Source
This commit is contained in:
Kwoth
2022-01-07 06:28:58 +01:00
parent c0ce22a6b7
commit c3ba805acf
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/NadekoBot/Modules/Utility/Services/PatreonRewardsService.cs
View File

@@ -4,7 +4,9 @@ using NadekoBot.Services.Database.Models;
using NadekoBot.Modules.Utility.Common.Patreon; using NadekoBot.Modules.Utility.Common.Patreon;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Json; using System.Net.Http.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
@@ -146,15 +148,22 @@ namespace NadekoBot.Modules.Utility.Services
if (DateTime.UtcNow.Day < 5) if (DateTime.UtcNow.Day < 5)
return; return;
// if the user has the necessary patreon creds if (string.IsNullOrWhiteSpace(creds.Patreon.CampaignId))
// and the access token expired or doesn't exist
// -> update access token
if (!HasPatreonCreds(creds))
return; return;
if (LastAccessTokenUpdate(creds).Month < DateTime.UtcNow.Month var lastUpdate = LastAccessTokenUpdate(creds);
var now = DateTime.UtcNow;
if (lastUpdate.Year != now.Year
|| lastUpdate.Month != now.Month
|| string.IsNullOrWhiteSpace(creds.Patreon.AccessToken)) || string.IsNullOrWhiteSpace(creds.Patreon.AccessToken))
{ {
// if the user has the necessary patreon creds
// and the access token expired or doesn't exist
// -> update access token
if (!HasPatreonCreds(creds))
return;
var success = await UpdateAccessToken(creds); var success = await UpdateAccessToken(creds);
if (!success) if (!success)
return; return;
@@ -164,7 +173,7 @@ namespace NadekoBot.Modules.Utility.Services
await getPledgesLocker.WaitAsync().ConfigureAwait(false); await getPledgesLocker.WaitAsync().ConfigureAwait(false);
try try
{ {
var members = new List<PatreonMember>(); var members = new List<PatreonMember>();
var users = new List<PatreonUser>(); var users = new List<PatreonUser>();
using (var http = _httpFactory.CreateClient()) using (var http = _httpFactory.CreateClient())
@@ -185,7 +194,7 @@ namespace NadekoBot.Modules.Utility.Services
if (data is null) if (data is null)
break; break;
members.AddRange(data.Data); members.AddRange(data.Data);
users.AddRange(data.Included); users.AddRange(data.Included);
} while (!string.IsNullOrWhiteSpace(page = data?.Links?.Next)); } while (!string.IsNullOrWhiteSpace(page = data?.Links?.Next));
@@ -209,12 +218,19 @@ namespace NadekoBot.Modules.Utility.Services
EntitledTo: > 0 EntitledTo: > 0
}) })
.ToList(); .ToList();
foreach (var pledge in userData) foreach (var pledge in userData)
{ {
await ClaimReward(pledge.UserId, pledge.PatreonUserId, pledge.EntitledTo); await ClaimReward(pledge.UserId, pledge.PatreonUserId, pledge.EntitledTo);
} }
} }
catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Unauthorized)
{
Log.Warning("Patreon credentials invalid or expired. I will try to refresh them during the next run");
var db = _redis.GetDatabase();
await db.KeyDeleteAsync($"{creds.RedisKey()}_patreon_update");
}
catch (Exception ex) catch (Exception ex)
{ {
Log.Warning(ex, "Error refreshing patreon pledges"); Log.Warning(ex, "Error refreshing patreon pledges");
@@ -223,7 +239,6 @@ namespace NadekoBot.Modules.Utility.Services
{ {
getPledgesLocker.Release(); getPledgesLocker.Release();
} }
} }
public async Task<int> ClaimReward(ulong userId, string patreonUserId, int cents) public async Task<int> ClaimReward(ulong userId, string patreonUserId, int cents)