Skip to content

Commit ea60ce8

Browse files
CopilotLulalaby
andauthored
Preserve caller-owned invite target streams (#758)
* Initial plan * Handle user-provided invite streams Co-authored-by: Lulalaby <[email protected]> * Preserve caller-owned invite target streams Co-authored-by: Lulalaby <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: Lulalaby <[email protected]>
1 parent e0b712f commit ea60ce8

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

DisCatSharp/Net/Rest/DiscordApiClient.cs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3899,13 +3899,16 @@ internal async Task<DiscordInvite> CreateChannelInviteAsync(ulong channelId, int
38993899
var ret = DiscordJson.DeserializeObject<DiscordInvite>(res.Response, this.Discord);
39003900
ret.Discord = this.Discord;
39013901

3902-
try
3903-
{
3904-
targetUsersCsv?.Stream.Dispose();
3905-
}
3906-
catch
3902+
if (targetUsersCsv is not null && targetUsersCsv.ResetPositionTo is null)
39073903
{
3908-
// ignore
3904+
try
3905+
{
3906+
targetUsersCsv.Stream.Dispose();
3907+
}
3908+
catch
3909+
{
3910+
// ignore
3911+
}
39093912
}
39103913

39113914
return ret;
@@ -5152,13 +5155,16 @@ internal async Task UpdateInviteTargetUsersAsync(string inviteCode, Stream? targ
51525155

51535156
if (targetUsersCsv.ResetPositionTo is not null)
51545157
targetUsersCsv.Stream.Position = targetUsersCsv.ResetPositionTo.Value;
5155-
try
5156-
{
5157-
targetUsersCsv.Stream.Dispose();
5158-
}
5159-
catch
5158+
else if (targetUsersCsv is not null)
51605159
{
5161-
// ignore
5160+
try
5161+
{
5162+
targetUsersCsv.Stream.Dispose();
5163+
}
5164+
catch
5165+
{
5166+
// ignore
5167+
}
51625168
}
51635169
}
51645170

0 commit comments

Comments
 (0)