Skip to content

Commit

Permalink
Merge pull request #68 from ImCarsen/master
Browse files Browse the repository at this point in the history 
Update TwitchLib packages, removed old event overrides from PubSub and Client
  • Loading branch information
@swiftyspiffy
swiftyspiffy authored Sep 19, 2023
2 parents d264b1f + a1554fd commit 8537f52
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 51 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# Files used to weave for NuGet
TwitchLib/FodyWeavers.xml
TwitchLib/packages.config
TwitchLib.Unity/FodyWeavers.xml
TwitchLib.Unity/FodyWeavers.xsd

# User-specific files
*.suo
Expand Down
42 changes: 0 additions & 42 deletions TwitchLib.Unity/Client.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ namespace TwitchLib.Unity
{
public class Client : TwitchClient, ITwitchClient
{
public new bool OverrideBeingHostedCheck { get; set; }

#region Events
/// <summary>
/// Fires whenever a log write happens.
Expand Down Expand Up @@ -109,11 +107,6 @@ public class Client : TwitchClient, ITwitchClient
/// </summary>
public new event EventHandler<OnContinuedGiftedSubscriptionArgs> OnContinuedGiftedSubscription;

/// <summary>
/// Fires when a hosted streamer goes offline and hosting is killed.
/// </summary>
public new event EventHandler OnHostLeft;

/// <summary>
/// Fires when Twitch notifies client of existing users in chat.
/// </summary>
Expand All @@ -124,16 +117,6 @@ public class Client : TwitchClient, ITwitchClient
/// </summary>
public new event EventHandler<OnUserLeftArgs> OnUserLeft;

/// <summary>
/// Fires when the joined channel begins hosting another channel.
/// </summary>
public new event EventHandler<OnHostingStartedArgs> OnHostingStarted;

/// <summary>
/// Fires when the joined channel quits hosting another channel.
/// </summary>
public new event EventHandler<OnHostingStoppedArgs> OnHostingStopped;

/// <summary>
/// Fires when bot has disconnected.
/// </summary>
Expand Down Expand Up @@ -179,16 +162,6 @@ public class Client : TwitchClient, ITwitchClient
/// </summary>
public new event EventHandler<OnSendReceiveDataArgs> OnSendReceiveData;

/// <summary>
/// Fires when client receives notice that a joined channel is hosting another channel.
/// </summary>
public new event EventHandler<OnNowHostingArgs> OnNowHosting;

/// <summary>
/// Fires when the library detects another channel has started hosting the broadcaster's stream. MUST BE CONNECTED AS BROADCASTER.
/// </summary>
public new event EventHandler<OnBeingHostedArgs> OnBeingHosted;

/// <summary>
/// Fires when a raid notification is detected in chat
/// </summary>
Expand All @@ -208,9 +181,6 @@ public class Client : TwitchClient, ITwitchClient
/// <summary>Fires when newly raided channel is mature audience only.</summary>
public new event EventHandler OnRaidedChannelIsMatureAudience;

/// <summary>Fires when a ritual for a new chatter is received.</summary>
public new event EventHandler<OnRitualNewChatterArgs> OnRitualNewChatter;

/// <summary>Fires when the client was unable to join a channel.</summary>
public new event EventHandler<OnFailureToReceiveJoinConfirmationArgs> OnFailureToReceiveJoinConfirmation;

Expand All @@ -237,18 +207,12 @@ public Client() : base(null)
{
ThreadDispatcher.EnsureCreated();

base.OverrideBeingHostedCheck = true;

base.OnLog += (object sender, OnLogArgs e) => { ThreadDispatcher.Enqueue(() => OnLog?.Invoke(sender, e)); };
base.OnConnected += ((object sender, OnConnectedArgs e) => { ThreadDispatcher.Enqueue(() => OnConnected?.Invoke(sender, e)); });

base.OnJoinedChannel += ((object sender, OnJoinedChannelArgs e) => {

ThreadDispatcher.Enqueue(() => OnJoinedChannel?.Invoke(sender, e));

if (OnBeingHosted == null) return;
if (e.Channel.ToLower() != TwitchUsername && !OverrideBeingHostedCheck)
ThreadDispatcher.Enqueue(() => throw new BadListenException("BeingHosted", "You cannot listen to OnBeingHosted unless you are connected to the broadcaster's channel as the broadcaster. You may override this by setting the TwitchClient property OverrideBeingHostedCheck to true."));
});

base.OnIncorrectLogin += ((object sender, OnIncorrectLoginArgs e) => { ThreadDispatcher.Enqueue(() => OnIncorrectLogin?.Invoke(sender, e)); });
Expand All @@ -267,11 +231,8 @@ public Client() : base(null)
base.OnReSubscriber += ((object sender, OnReSubscriberArgs e) => { ThreadDispatcher.Enqueue(() => OnReSubscriber?.Invoke(sender, e)); });
base.OnPrimePaidSubscriber += ((object sender, OnPrimePaidSubscriberArgs e) => { ThreadDispatcher.Enqueue(() => OnPrimePaidSubscriber?.Invoke(sender, e)); });
base.OnContinuedGiftedSubscription += ((object sender, OnContinuedGiftedSubscriptionArgs e) => { ThreadDispatcher.Enqueue(() => OnContinuedGiftedSubscription?.Invoke(sender, e)); });
base.OnHostLeft += ((object sender, EventArgs arg) => { ThreadDispatcher.Enqueue(() => OnHostLeft?.Invoke(sender, arg)); });
base.OnExistingUsersDetected += ((object sender, OnExistingUsersDetectedArgs e) => { ThreadDispatcher.Enqueue(() => OnExistingUsersDetected?.Invoke(sender, e)); });
base.OnUserLeft += ((object sender, OnUserLeftArgs e) => { ThreadDispatcher.Enqueue(() => OnUserLeft?.Invoke(sender, e)); });
base.OnHostingStarted += ((object sender, OnHostingStartedArgs e) => { ThreadDispatcher.Enqueue(() => OnHostingStarted?.Invoke(sender, e)); });
base.OnHostingStopped += ((object sender, OnHostingStoppedArgs e) => { ThreadDispatcher.Enqueue(() => OnHostingStopped?.Invoke(sender, e)); });
base.OnDisconnected += ((object sender, OnDisconnectedEventArgs e) => { ThreadDispatcher.Enqueue(() => OnDisconnected?.Invoke(sender, e)); });
base.OnConnectionError += ((object sender, OnConnectionErrorArgs e) => { ThreadDispatcher.Enqueue(() => OnConnectionError?.Invoke(sender, e)); });
base.OnChatCleared += ((object sender, OnChatClearedArgs e) => { ThreadDispatcher.Enqueue(() => OnChatCleared?.Invoke(sender, e)); });
Expand All @@ -281,12 +242,9 @@ public Client() : base(null)
base.OnModeratorsReceived += ((object sender, OnModeratorsReceivedArgs e) => { ThreadDispatcher.Enqueue(() => OnModeratorsReceived?.Invoke(sender, e)); });
base.OnChatColorChanged += ((object sender, OnChatColorChangedArgs e) => { ThreadDispatcher.Enqueue(() => OnChatColorChanged?.Invoke(sender, e)); });
base.OnSendReceiveData += ((object sender, OnSendReceiveDataArgs e) => { ThreadDispatcher.Enqueue(() => OnSendReceiveData?.Invoke(sender, e)); });
base.OnNowHosting += ((object sender, OnNowHostingArgs e) => { ThreadDispatcher.Enqueue(() => OnNowHosting?.Invoke(sender, e)); });
base.OnBeingHosted += ((object sender, OnBeingHostedArgs e) => { ThreadDispatcher.Enqueue(() => OnBeingHosted?.Invoke(sender, e)); });
base.OnRaidNotification += ((object sender, OnRaidNotificationArgs e) => { ThreadDispatcher.Enqueue(() => OnRaidNotification?.Invoke(sender, e)); });
base.OnGiftedSubscription += ((object sender, OnGiftedSubscriptionArgs e) => { ThreadDispatcher.Enqueue(() => OnGiftedSubscription?.Invoke(sender, e)); });
base.OnRaidedChannelIsMatureAudience += ((object sender, EventArgs arg) => { ThreadDispatcher.Enqueue(() => OnRaidedChannelIsMatureAudience?.Invoke(sender, arg)); });
base.OnRitualNewChatter += ((object sender, OnRitualNewChatterArgs e) => { ThreadDispatcher.Enqueue(() => OnRitualNewChatter?.Invoke(sender, e)); });
base.OnFailureToReceiveJoinConfirmation += ((object sender, OnFailureToReceiveJoinConfirmationArgs e) => { ThreadDispatcher.Enqueue(() => OnFailureToReceiveJoinConfirmation?.Invoke(sender, e)); });
base.OnUnaccountedFor += ((object sender, OnUnaccountedForArgs e) => { ThreadDispatcher.Enqueue(() => OnUnaccountedFor?.Invoke(sender, e)); });
base.OnSelfRaidError += ((object sender, EventArgs e) => { ThreadDispatcher.Enqueue(() => OnSelfRaidError?.Invoke(sender, e)); });
Expand Down
3 changes: 0 additions & 3 deletions TwitchLib.Unity/PubSub.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ public class PubSub : TwitchPubSub, ITwitchPubSub
/// <summary>EventHandler for channel subscriptions.</summary>
public new event EventHandler<OnChannelSubscriptionArgs> OnChannelSubscription;
/// <summary>EventHandler for named event.</summary>
public new event EventHandler<OnChannelCommerceReceivedArgs> OnChannelCommerceReceived;
/// <summary>EventHandler for named event.</summary>
public new event EventHandler<OnChannelExtensionBroadcastArgs> OnChannelExtensionBroadcast;
/// <summary>EventHandler for named event.</summary>
public new event EventHandler<OnFollowArgs> OnFollow;
Expand Down Expand Up @@ -122,7 +120,6 @@ public PubSub(EndPoint proxy = null) : base(null)
base.OnViewCount += ((object sender, OnViewCountArgs e) => { ThreadDispatcher.Enqueue(() => OnViewCount?.Invoke(sender, e)); });
base.OnWhisper += ((object sender, OnWhisperArgs e) => { ThreadDispatcher.Enqueue(() => OnWhisper?.Invoke(sender, e)); });
base.OnChannelSubscription += ((object sender, OnChannelSubscriptionArgs e) => { ThreadDispatcher.Enqueue(() => OnChannelSubscription?.Invoke(sender, e)); });
base.OnChannelCommerceReceived += ((object sender, OnChannelCommerceReceivedArgs e) => { ThreadDispatcher.Enqueue(() => OnChannelCommerceReceived?.Invoke(sender, e)); });
base.OnChannelExtensionBroadcast += ((object sender, OnChannelExtensionBroadcastArgs e) => { ThreadDispatcher.Enqueue(() => OnChannelExtensionBroadcast?.Invoke(sender, e)); });
base.OnFollow += ((object sender, OnFollowArgs e) => { ThreadDispatcher.Enqueue(() => OnFollow?.Invoke(sender, e)); });
base.OnCustomRewardCreated += ((object sender, OnCustomRewardCreatedArgs e) => { ThreadDispatcher.Enqueue(() => OnCustomRewardCreated?.Invoke(sender, e)); });
Expand Down
12 changes: 6 additions & 6 deletions TwitchLib.Unity/TwitchLib.Unity.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageProjectUrl>https://github.com/TwitchLib/TwitchLib.Unity</PackageProjectUrl>
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
<Copyright>Copyright 2021</Copyright>
<PackageReleaseNotes>Version bumps for Unity to match latest dev branch of TwitchLib.</PackageReleaseNotes>
<PackageReleaseNotes>Updates to packages and removed outdated code</PackageReleaseNotes>
<RepositoryUrl>https://github.com/TwitchLib/TwitchLib.Unity</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<PackageTags>twitch library unity3d unity dotnet c# csharp net standard 2.0</PackageTags>
Expand Down Expand Up @@ -42,14 +42,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Costura.Fody" Version="5.0.0-beta0001">
<PackageReference Include="Costura.Fody" Version="5.7.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="TwitchLib.Api" Version="3.2.5-preview-9a3c9a73b72f479e1c27fec4e1c7ec77dd69f125" />
<PackageReference Include="TwitchLib.Client" Version="3.2.3" />
<PackageReference Include="TwitchLib.PubSub" Version="3.2.3" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="TwitchLib.Api" Version="3.9.0" />
<PackageReference Include="TwitchLib.Client" Version="3.3.1" />
<PackageReference Include="TwitchLib.PubSub" Version="3.2.6" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 8537f52

Please sign in to comment.