diff --git a/.github/workflows/check-code-style.yml b/.github/workflows/check-code-style.yml new file mode 100644 index 0000000..ee08649 --- /dev/null +++ b/.github/workflows/check-code-style.yml @@ -0,0 +1,16 @@ +name: Check Code Style +on: [pull_request] +jobs: + Test: + runs-on: ubuntu-latest + name: Run Laravel Pint + + steps: + - name: Check out repository code + uses: actions/checkout@v3 + + - name: Install Dependencies + run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress + + - name: Check code style + run: ./vendor/bin/pint --test --preset laravel \ No newline at end of file diff --git a/config/twitch-eventsub.php b/config/twitch-eventsub.php index ae0d0b1..14641e0 100644 --- a/config/twitch-eventsub.php +++ b/config/twitch-eventsub.php @@ -2,4 +2,4 @@ return [ 'callback_url' => env('TWITCH_HELIX_EVENTSUB_CALLBACK_URL', '/twitch/eventsub/webhook'), -]; \ No newline at end of file +]; diff --git a/src/Enums/ChannelPointsCustomRewardRedemptionStatus.php b/src/Enums/ChannelPointsCustomRewardRedemptionStatus.php index 02d7065..7c84248 100644 --- a/src/Enums/ChannelPointsCustomRewardRedemptionStatus.php +++ b/src/Enums/ChannelPointsCustomRewardRedemptionStatus.php @@ -7,14 +7,17 @@ namespace katzen48\Twitch\EventSub\Enums; - class ChannelPointsCustomRewardRedemptionStatus { public const FULFILLED = 'FULFILLED'; + public const UNFULFILLED = 'UNFULFILLED'; + public const CANCELLED = 'CANCELLED'; public const EVENTSUB_FULFILLED = 'fulfilled'; + public const EVENTSUB_UNFULFILLED = 'unfulfilled'; + public const EVENTSUB_CANCELLED = 'cancelled'; -} \ No newline at end of file +} diff --git a/src/Enums/SubscriptionStatus.php b/src/Enums/SubscriptionStatus.php index 1b8ce11..10d359c 100644 --- a/src/Enums/SubscriptionStatus.php +++ b/src/Enums/SubscriptionStatus.php @@ -7,13 +7,17 @@ namespace katzen48\Twitch\EventSub\Enums; - class SubscriptionStatus { public const ENABLED = 'enabled'; + public const VERIFICATION_PENDING = 'webhook_callback_verification_pending'; + public const VERIFICATION_FAILED = 'webhook_callback_verification_failed'; + public const FAILURES_EXCEEDED = 'notification_failures_exceeded'; + public const REVOKED = 'authorization_revoked'; + public const USER_REMOVED = 'user_removed'; -} \ No newline at end of file +} diff --git a/src/EventMap.php b/src/EventMap.php index ef8b0bf..1077a89 100644 --- a/src/EventMap.php +++ b/src/EventMap.php @@ -14,4 +14,4 @@ trait EventMap \katzen48\Twitch\EventSub\Listeners\EventSubListener::class, ], ]; -} \ No newline at end of file +} diff --git a/src/Events/BaseEvent.php b/src/Events/BaseEvent.php index 0cda574..2f1a1f7 100644 --- a/src/Events/BaseEvent.php +++ b/src/Events/BaseEvent.php @@ -18,8 +18,11 @@ class BaseEvent use Dispatchable; public Subscription $subscription; + public string $id; + public int $retries; + public CarbonInterface $timestamp; public function __construct(array $payload, string $id, int $retries, CarbonInterface $timestamp) @@ -36,7 +39,7 @@ public function parsePayload($payload): void if (array_key_exists('event', $payload)) { $this->parseEvent($payload['event']); - } else if(array_key_exists('events', $payload)) { + } elseif (array_key_exists('events', $payload)) { $this->parseEvent($payload['events']); } } @@ -70,6 +73,5 @@ protected function parseCarbon($timestamp): CarbonInterface public function parseEvent($event): void { - } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelBanEvent.php b/src/Events/Channel/ChannelBanEvent.php index 8c54127..96bbf1d 100644 --- a/src/Events/Channel/ChannelBanEvent.php +++ b/src/Events/Channel/ChannelBanEvent.php @@ -8,7 +8,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel; use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelBanEvent extends BaseEvent @@ -55,4 +54,4 @@ public function parseEvent($event): void $this->endsAt = $this->parseCarbon($event['ends_at']); $this->permanent = $event['is_permanent']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelCheerEvent.php b/src/Events/Channel/ChannelCheerEvent.php index 59b01a2..cdfc9c5 100644 --- a/src/Events/Channel/ChannelCheerEvent.php +++ b/src/Events/Channel/ChannelCheerEvent.php @@ -41,4 +41,4 @@ public function parseEvent($event): void $this->message = $event['message']; $this->bits = $event['bits']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelFollowEvent.php b/src/Events/Channel/ChannelFollowEvent.php index abfb449..bf26b20 100644 --- a/src/Events/Channel/ChannelFollowEvent.php +++ b/src/Events/Channel/ChannelFollowEvent.php @@ -8,7 +8,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel; use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelFollowEvent extends BaseEvent @@ -27,7 +26,6 @@ class ChannelFollowEvent extends BaseEvent public CarbonInterface $followedAt; - public function parseEvent($event): void { $this->followerId = $event['user_id']; @@ -38,4 +36,4 @@ public function parseEvent($event): void $this->broadcasterName = $event['broadcaster_user_name']; $this->followedAt = $this->parseCarbon($event['followed_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelModeratorAddEvent.php b/src/Events/Channel/ChannelModeratorAddEvent.php index 687b241..fbedb30 100644 --- a/src/Events/Channel/ChannelModeratorAddEvent.php +++ b/src/Events/Channel/ChannelModeratorAddEvent.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelModeratorAddEvent extends BaseEvent @@ -24,7 +23,6 @@ class ChannelModeratorAddEvent extends BaseEvent public string $broadcasterName; - public function parseEvent($event): void { $this->moderatorId = $event['user_id']; @@ -34,4 +32,4 @@ public function parseEvent($event): void $this->broadcasterLogin = $event['broadcaster_user_login']; $this->broadcasterName = $event['broadcaster_user_name']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelModeratorRemoveEvent.php b/src/Events/Channel/ChannelModeratorRemoveEvent.php index 324b26f..c9de572 100644 --- a/src/Events/Channel/ChannelModeratorRemoveEvent.php +++ b/src/Events/Channel/ChannelModeratorRemoveEvent.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelModeratorRemoveEvent extends BaseEvent @@ -24,7 +23,6 @@ class ChannelModeratorRemoveEvent extends BaseEvent public string $broadcasterName; - public function parseEvent($event): void { $this->moderatorId = $event['user_id']; @@ -34,4 +32,4 @@ public function parseEvent($event): void $this->broadcasterLogin = $event['broadcaster_user_login']; $this->broadcasterName = $event['broadcaster_user_name']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardAddEvent.php b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardAddEvent.php index 7dbe88d..c795d38 100644 --- a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardAddEvent.php +++ b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardAddEvent.php @@ -96,4 +96,4 @@ public function parseEvent($event): void $this->defaultImage->url2x = $event['default_image']['url_2x']; $this->defaultImage->url4x = $event['default_image']['url_4x']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionAddEvent.php b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionAddEvent.php index 59c9a4d..3e3a5cd 100644 --- a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionAddEvent.php +++ b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionAddEvent.php @@ -55,4 +55,4 @@ public function parseEvent($event): void $this->redeemedAt = $this->parseCarbon($event['redeemed_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionUpdateEvent.php b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionUpdateEvent.php index 2176a37..3aa2eff 100644 --- a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionUpdateEvent.php +++ b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRedemptionUpdateEvent.php @@ -55,4 +55,4 @@ public function parseEvent($event): void $this->redeemedAt = $this->parseCarbon($event['redeemed_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRemoveEvent.php b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRemoveEvent.php index 3ab5511..fcb4485 100644 --- a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRemoveEvent.php +++ b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardRemoveEvent.php @@ -96,4 +96,4 @@ public function parseEvent($event): void $this->defaultImage->url2x = $event['default_image']['url_2x']; $this->defaultImage->url4x = $event['default_image']['url_4x']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardUpdateEvent.php b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardUpdateEvent.php index 09357fa..5f2a881 100644 --- a/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardUpdateEvent.php +++ b/src/Events/Channel/ChannelPoints/ChannelPointsCustomRewardUpdateEvent.php @@ -96,4 +96,4 @@ public function parseEvent($event): void $this->defaultImage->url2x = $event['default_image']['url_2x']; $this->defaultImage->url4x = $event['default_image']['url_4x']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelRaidEvent.php b/src/Events/Channel/ChannelRaidEvent.php index 2e1b6a4..ae06e0e 100644 --- a/src/Events/Channel/ChannelRaidEvent.php +++ b/src/Events/Channel/ChannelRaidEvent.php @@ -11,7 +11,6 @@ class ChannelRaidEvent extends BaseEvent { - public string $fromBroadcasterId; public string $fromBroadcasterLogin; @@ -36,4 +35,4 @@ public function parseEvent($event): void $this->toBroadcasterName = $event['to_broadcaster_user_name']; $this->viewers = $event['viewers']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelUnbanEvent.php b/src/Events/Channel/ChannelUnbanEvent.php index 7d36551..7a03e49 100644 --- a/src/Events/Channel/ChannelUnbanEvent.php +++ b/src/Events/Channel/ChannelUnbanEvent.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelUnbanEvent extends BaseEvent @@ -42,4 +41,4 @@ public function parseEvent($event): void $this->moderatorLogin = $event['moderator_user_login']; $this->moderatorName = $event['moderator_user_name']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/ChannelUpdateEvent.php b/src/Events/Channel/ChannelUpdateEvent.php index 640ba7d..c336d53 100644 --- a/src/Events/Channel/ChannelUpdateEvent.php +++ b/src/Events/Channel/ChannelUpdateEvent.php @@ -38,4 +38,4 @@ public function parseEvent($event): void $this->categoryName = $event['category_name']; $this->mature = $event['is_mature']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Goal/ChannelGoalBeginEvent.php b/src/Events/Channel/Goal/ChannelGoalBeginEvent.php index cabe330..852f529 100644 --- a/src/Events/Channel/Goal/ChannelGoalBeginEvent.php +++ b/src/Events/Channel/Goal/ChannelGoalBeginEvent.php @@ -8,7 +8,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel\Goal; use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelGoalBeginEvent extends BaseEvent @@ -61,4 +60,4 @@ public function isNewSubscription(): bool { return $this->type === 'new_subscription'; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Goal/ChannelGoalEndEvent.php b/src/Events/Channel/Goal/ChannelGoalEndEvent.php index da4726d..f85ed3c 100644 --- a/src/Events/Channel/Goal/ChannelGoalEndEvent.php +++ b/src/Events/Channel/Goal/ChannelGoalEndEvent.php @@ -8,7 +8,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel\Goal; use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelGoalEndEvent extends BaseEvent @@ -64,4 +63,4 @@ public function isNewSubscription(): bool { return $this->type === 'new_subscription'; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Goal/ChannelGoalProgressEvent.php b/src/Events/Channel/Goal/ChannelGoalProgressEvent.php index 6871fee..5732163 100644 --- a/src/Events/Channel/Goal/ChannelGoalProgressEvent.php +++ b/src/Events/Channel/Goal/ChannelGoalProgressEvent.php @@ -8,7 +8,6 @@ namespace katzen48\Twitch\EventSub\Events\Channel\Goal; use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class ChannelGoalProgressEvent extends BaseEvent @@ -61,4 +60,4 @@ public function isNewSubscription(): bool { return $this->type === 'new_subscription'; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/HypeTrain/ChannelHypeTrainBeginEvent.php b/src/Events/Channel/HypeTrain/ChannelHypeTrainBeginEvent.php index 6d6ee57..902ae1e 100644 --- a/src/Events/Channel/HypeTrain/ChannelHypeTrainBeginEvent.php +++ b/src/Events/Channel/HypeTrain/ChannelHypeTrainBeginEvent.php @@ -27,7 +27,7 @@ class ChannelHypeTrainBeginEvent extends BaseEvent public int $goal; /** - * @var Collection|HypeTrainContribution $topContributions + * @var Collection|HypeTrainContribution */ public $topContributions; @@ -72,4 +72,4 @@ public function parseEvent($event): void $this->lastContribution->total = $event['last_contribution']['total']; } } -} \ No newline at end of file +} diff --git a/src/Events/Channel/HypeTrain/ChannelHypeTrainEndEvent.php b/src/Events/Channel/HypeTrain/ChannelHypeTrainEndEvent.php index e52d621..1503b74 100644 --- a/src/Events/Channel/HypeTrain/ChannelHypeTrainEndEvent.php +++ b/src/Events/Channel/HypeTrain/ChannelHypeTrainEndEvent.php @@ -25,7 +25,7 @@ class ChannelHypeTrainEndEvent extends BaseEvent public int $total; /** - * @var Collection|HypeTrainContribution $topContributions + * @var Collection|HypeTrainContribution */ public $topContributions; @@ -58,4 +58,4 @@ public function parseEvent($event): void $this->topContributions->add($contribution); } } -} \ No newline at end of file +} diff --git a/src/Events/Channel/HypeTrain/ChannelHypeTrainProgressEvent.php b/src/Events/Channel/HypeTrain/ChannelHypeTrainProgressEvent.php index 192f4dd..f680183 100644 --- a/src/Events/Channel/HypeTrain/ChannelHypeTrainProgressEvent.php +++ b/src/Events/Channel/HypeTrain/ChannelHypeTrainProgressEvent.php @@ -29,7 +29,7 @@ class ChannelHypeTrainProgressEvent extends BaseEvent public int $goal; /** - * @var Collection|HypeTrainContribution $topContributions + * @var Collection|HypeTrainContribution */ public $topContributions; @@ -72,4 +72,4 @@ public function parseEvent($event): void $this->lastContribution->total = $event['last_contribution']['total']; } } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Poll/ChannelPollBeginEvent.php b/src/Events/Channel/Poll/ChannelPollBeginEvent.php index a29e31d..9fb31a7 100644 --- a/src/Events/Channel/Poll/ChannelPollBeginEvent.php +++ b/src/Events/Channel/Poll/ChannelPollBeginEvent.php @@ -66,4 +66,4 @@ public function parseEvent($event): void $this->startedAt = $this->parseCarbon($event['started_at']); $this->endsAt = $this->parseCarbon($event['ends_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Poll/ChannelPollEndEvent.php b/src/Events/Channel/Poll/ChannelPollEndEvent.php index fae714e..2242d8e 100644 --- a/src/Events/Channel/Poll/ChannelPollEndEvent.php +++ b/src/Events/Channel/Poll/ChannelPollEndEvent.php @@ -72,4 +72,4 @@ public function parseEvent($event): void $this->startedAt = $this->parseCarbon($event['started_at']); $this->endedAt = $this->parseCarbon($event['ended_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Poll/ChannelPollProgressEvent.php b/src/Events/Channel/Poll/ChannelPollProgressEvent.php index 6adf4fc..4d26718 100644 --- a/src/Events/Channel/Poll/ChannelPollProgressEvent.php +++ b/src/Events/Channel/Poll/ChannelPollProgressEvent.php @@ -69,4 +69,4 @@ public function parseEvent($event): void $this->startedAt = $this->parseCarbon($event['started_at']); $this->endsAt = $this->parseCarbon($event['ends_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Prediction/ChannelPredictionBeginEvent.php b/src/Events/Channel/Prediction/ChannelPredictionBeginEvent.php index 0b71a3e..bcf4d51 100644 --- a/src/Events/Channel/Prediction/ChannelPredictionBeginEvent.php +++ b/src/Events/Channel/Prediction/ChannelPredictionBeginEvent.php @@ -54,4 +54,4 @@ public function parseEvent($event): void $this->startedAt = $this->parseCarbon($event['started_at']); $this->locksAt = $this->parseCarbon($event['locks_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Prediction/ChannelPredictionEndEvent.php b/src/Events/Channel/Prediction/ChannelPredictionEndEvent.php index 61f6776..321e658 100644 --- a/src/Events/Channel/Prediction/ChannelPredictionEndEvent.php +++ b/src/Events/Channel/Prediction/ChannelPredictionEndEvent.php @@ -75,4 +75,4 @@ public function parseEvent($event): void $this->startedAt = $this->parseCarbon($event['started_at']); $this->endedAt = $this->parseCarbon($event['ended_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Prediction/ChannelPredictionLockEvent.php b/src/Events/Channel/Prediction/ChannelPredictionLockEvent.php index a3bf090..4141f35 100644 --- a/src/Events/Channel/Prediction/ChannelPredictionLockEvent.php +++ b/src/Events/Channel/Prediction/ChannelPredictionLockEvent.php @@ -69,4 +69,4 @@ public function parseEvent($event): void $this->startedAt = $this->parseCarbon($event['started_at']); $this->lockedAt = $this->parseCarbon($event['locked_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Prediction/ChannelPredictionProgressEvent.php b/src/Events/Channel/Prediction/ChannelPredictionProgressEvent.php index ad79c10..6d21408 100644 --- a/src/Events/Channel/Prediction/ChannelPredictionProgressEvent.php +++ b/src/Events/Channel/Prediction/ChannelPredictionProgressEvent.php @@ -68,4 +68,4 @@ public function parseEvent($event): void $this->startedAt = $this->parseCarbon($event['started_at']); $this->locksAt = $this->parseCarbon($event['locks_at']); } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Subscription/ChannelSubscribeEvent.php b/src/Events/Channel/Subscription/ChannelSubscribeEvent.php index b9f9709..49d1d8b 100644 --- a/src/Events/Channel/Subscription/ChannelSubscribeEvent.php +++ b/src/Events/Channel/Subscription/ChannelSubscribeEvent.php @@ -38,4 +38,4 @@ public function parseEvent($event): void $this->tier = $event['tier']; $this->gifted = $event['is_gift']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Subscription/ChannelSubscriptionEndEvent.php b/src/Events/Channel/Subscription/ChannelSubscriptionEndEvent.php index 2bc356e..8a2acc4 100644 --- a/src/Events/Channel/Subscription/ChannelSubscriptionEndEvent.php +++ b/src/Events/Channel/Subscription/ChannelSubscriptionEndEvent.php @@ -38,4 +38,4 @@ public function parseEvent($event): void $this->tier = $event['tier']; $this->gifted = $event['is_gift']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Subscription/ChannelSubscriptionGiftEvent.php b/src/Events/Channel/Subscription/ChannelSubscriptionGiftEvent.php index d6bd2b4..bb792b2 100644 --- a/src/Events/Channel/Subscription/ChannelSubscriptionGiftEvent.php +++ b/src/Events/Channel/Subscription/ChannelSubscriptionGiftEvent.php @@ -44,4 +44,4 @@ public function parseEvent($event): void $this->cumulativeTotal = $event['cumulative_total']; $this->anonymous = $event['is_anonymous']; } -} \ No newline at end of file +} diff --git a/src/Events/Channel/Subscription/ChannelSubscriptionMessageEvent.php b/src/Events/Channel/Subscription/ChannelSubscriptionMessageEvent.php index 01e8b80..23e91ae 100644 --- a/src/Events/Channel/Subscription/ChannelSubscriptionMessageEvent.php +++ b/src/Events/Channel/Subscription/ChannelSubscriptionMessageEvent.php @@ -47,4 +47,4 @@ public function parseEvent($event): void $this->streakMonths = $event['streak_months']; $this->durationMonths = $event['duration_months']; } -} \ No newline at end of file +} diff --git a/src/Events/Drop/DropEntitlementGrantEvent.php b/src/Events/Drop/DropEntitlementGrantEvent.php index f17f23c..c4720b8 100644 --- a/src/Events/Drop/DropEntitlementGrantEvent.php +++ b/src/Events/Drop/DropEntitlementGrantEvent.php @@ -38,4 +38,4 @@ public function parseEvent($event): void $events->add($dropEvent); } } -} \ No newline at end of file +} diff --git a/src/Events/EventParser.php b/src/Events/EventParser.php index 4f49988..1c9de9b 100644 --- a/src/Events/EventParser.php +++ b/src/Events/EventParser.php @@ -29,65 +29,36 @@ public static function parse($payload): string public static function getEventClassMapping(): array { return [ - EventSubType::STREAM_ONLINE => - \katzen48\Twitch\EventSub\Events\Stream\StreamOnlineEvent::class, - EventSubType::STREAM_OFFLINE => - \katzen48\Twitch\EventSub\Events\Stream\StreamOfflineEvent::class, + EventSubType::STREAM_ONLINE => \katzen48\Twitch\EventSub\Events\Stream\StreamOnlineEvent::class, + EventSubType::STREAM_OFFLINE => \katzen48\Twitch\EventSub\Events\Stream\StreamOfflineEvent::class, - EventSubType::CHANNEL_FOLLOW => - \katzen48\Twitch\EventSub\Events\Channel\ChannelFollowEvent::class, - EventSubType::CHANNEL_UPDATE => - \katzen48\Twitch\EventSub\Events\Channel\ChannelUpdateEvent::class, - EventSubType::CHANNEL_SUBSCRIBE => - Channel\Subscription\ChannelSubscribeEvent::class, - EventSubType::CHANNEL_SUBSCRIPTION_END => - Channel\Subscription\ChannelSubscriptionEndEvent::class, - EventSubType::CHANNEL_SUBSCRIPTION_GIFT => - Channel\Subscription\ChannelSubscriptionGiftEvent::class, - EventSubType::CHANNEL_SUBSCRIPTION_MESSAGE => - Channel\Subscription\ChannelSubscriptionMessageEvent::class, - EventSubType::CHANNEL_CHEER => - \katzen48\Twitch\EventSub\Events\Channel\ChannelCheerEvent::class, - EventSubType::CHANNEL_RAID => - \katzen48\Twitch\EventSub\Events\Channel\ChannelRaidEvent::class, - EventSubType::CHANNEL_BAN => - \katzen48\Twitch\EventSub\Events\Channel\ChannelBanEvent::class, - EventSubType::CHANNEL_UNBAN => - \katzen48\Twitch\EventSub\Events\Channel\ChannelUnbanEvent::class, - EventSubType::CHANNEL_MODERATOR_ADD => - \katzen48\Twitch\EventSub\Events\Channel\ChannelModeratorAddEvent::class, - EventSubType::CHANNEL_MODERATOR_REMOVE => - \katzen48\Twitch\EventSub\Events\Channel\ChannelModeratorRemoveEvent::class, - EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARDS_ADD => - Channel\ChannelPoints\ChannelPointsCustomRewardAddEvent::class, - EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARDS_UPDATE => - Channel\ChannelPoints\ChannelPointsCustomRewardUpdateEvent::class, - EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARDS_REMOVE => - Channel\ChannelPoints\ChannelPointsCustomRewardRemoveEvent::class, - EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARD_REDEMPTION_ADD => - Channel\ChannelPoints\ChannelPointsCustomRewardRedemptionAddEvent::class, - EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARD_REDEMPTION_UPDATE => - Channel\ChannelPoints\ChannelPointsCustomRewardRedemptionUpdateEvent::class, - EventSubType::CHANNEL_POLL_BEGIN => - Channel\Poll\ChannelPollBeginEvent::class, - EventSubType::CHANNEL_POLL_PROGRESS => - Channel\Poll\ChannelPollProgressEvent::class, - EventSubType::CHANNEL_POLL_END => - Channel\Poll\ChannelPollEndEvent::class, - EventSubType::CHANNEL_PREDICTION_BEGIN => - Channel\Prediction\ChannelPredictionBeginEvent::class, - EventSubType::CHANNEL_PREDICTION_PROGRESS => - Channel\Prediction\ChannelPredictionProgressEvent::class, - EventSubType::CHANNEL_PREDICTION_LOCK => - Channel\Prediction\ChannelPredictionLockEvent::class, - EventSubType::CHANNEL_PREDICTION_END => - Channel\Prediction\ChannelPredictionEndEvent::class, - EventSubType::CHANNEL_HYPE_TRAIN_BEGIN => - Channel\HypeTrain\ChannelHypeTrainBeginEvent::class, - EventSubType::CHANNEL_HYPE_TRAIN_PROGRESS => - Channel\HypeTrain\ChannelHypeTrainProgressEvent::class, - EventSubType::CHANNEL_HYPE_TRAIN_END => - Channel\HypeTrain\ChannelHypeTrainEndEvent::class, + EventSubType::CHANNEL_FOLLOW => \katzen48\Twitch\EventSub\Events\Channel\ChannelFollowEvent::class, + EventSubType::CHANNEL_UPDATE => \katzen48\Twitch\EventSub\Events\Channel\ChannelUpdateEvent::class, + EventSubType::CHANNEL_SUBSCRIBE => Channel\Subscription\ChannelSubscribeEvent::class, + EventSubType::CHANNEL_SUBSCRIPTION_END => Channel\Subscription\ChannelSubscriptionEndEvent::class, + EventSubType::CHANNEL_SUBSCRIPTION_GIFT => Channel\Subscription\ChannelSubscriptionGiftEvent::class, + EventSubType::CHANNEL_SUBSCRIPTION_MESSAGE => Channel\Subscription\ChannelSubscriptionMessageEvent::class, + EventSubType::CHANNEL_CHEER => \katzen48\Twitch\EventSub\Events\Channel\ChannelCheerEvent::class, + EventSubType::CHANNEL_RAID => \katzen48\Twitch\EventSub\Events\Channel\ChannelRaidEvent::class, + EventSubType::CHANNEL_BAN => \katzen48\Twitch\EventSub\Events\Channel\ChannelBanEvent::class, + EventSubType::CHANNEL_UNBAN => \katzen48\Twitch\EventSub\Events\Channel\ChannelUnbanEvent::class, + EventSubType::CHANNEL_MODERATOR_ADD => \katzen48\Twitch\EventSub\Events\Channel\ChannelModeratorAddEvent::class, + EventSubType::CHANNEL_MODERATOR_REMOVE => \katzen48\Twitch\EventSub\Events\Channel\ChannelModeratorRemoveEvent::class, + EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARDS_ADD => Channel\ChannelPoints\ChannelPointsCustomRewardAddEvent::class, + EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARDS_UPDATE => Channel\ChannelPoints\ChannelPointsCustomRewardUpdateEvent::class, + EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARDS_REMOVE => Channel\ChannelPoints\ChannelPointsCustomRewardRemoveEvent::class, + EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARD_REDEMPTION_ADD => Channel\ChannelPoints\ChannelPointsCustomRewardRedemptionAddEvent::class, + EventSubType::CHANNEL_CHANNEL_POINTS_CUSTOM_REWARD_REDEMPTION_UPDATE => Channel\ChannelPoints\ChannelPointsCustomRewardRedemptionUpdateEvent::class, + EventSubType::CHANNEL_POLL_BEGIN => Channel\Poll\ChannelPollBeginEvent::class, + EventSubType::CHANNEL_POLL_PROGRESS => Channel\Poll\ChannelPollProgressEvent::class, + EventSubType::CHANNEL_POLL_END => Channel\Poll\ChannelPollEndEvent::class, + EventSubType::CHANNEL_PREDICTION_BEGIN => Channel\Prediction\ChannelPredictionBeginEvent::class, + EventSubType::CHANNEL_PREDICTION_PROGRESS => Channel\Prediction\ChannelPredictionProgressEvent::class, + EventSubType::CHANNEL_PREDICTION_LOCK => Channel\Prediction\ChannelPredictionLockEvent::class, + EventSubType::CHANNEL_PREDICTION_END => Channel\Prediction\ChannelPredictionEndEvent::class, + EventSubType::CHANNEL_HYPE_TRAIN_BEGIN => Channel\HypeTrain\ChannelHypeTrainBeginEvent::class, + EventSubType::CHANNEL_HYPE_TRAIN_PROGRESS => Channel\HypeTrain\ChannelHypeTrainProgressEvent::class, + EventSubType::CHANNEL_HYPE_TRAIN_END => Channel\HypeTrain\ChannelHypeTrainEndEvent::class, 'channel.goal.begin' => // TODO change to EventSubType::CHANNEL_GOAL_BEGIN Channel\Goal\ChannelGoalBeginEvent::class, 'channel.goal.progress' => // TODO change to EventSubType::CHANNEL_GOAL_PROGRESS @@ -95,18 +66,13 @@ public static function getEventClassMapping(): array 'channel.goal.end' => // TODO change to EventSubType::CHANNEL_GOAL_END Channel\Goal\ChannelGoalEndEvent::class, - EventSubType::EXTENSION_BITS_TRANSACTION_CREATE => - \katzen48\Twitch\EventSub\Events\Extension\ExtensionBitsTransactionCreateEvent::class, + EventSubType::EXTENSION_BITS_TRANSACTION_CREATE => \katzen48\Twitch\EventSub\Events\Extension\ExtensionBitsTransactionCreateEvent::class, - EventSubType::DROP_ENTITLEMENT_GRANT => - \katzen48\Twitch\EventSub\Events\Drop\DropEntitlementGrantEvent::class, + EventSubType::DROP_ENTITLEMENT_GRANT => \katzen48\Twitch\EventSub\Events\Drop\DropEntitlementGrantEvent::class, - EventSubType::USER_AUTHORIZATION_GRANT => - \katzen48\Twitch\EventSub\Events\User\UserAuthorizationGrantEvent::class, - EventSubType::USER_AUTHORIZATION_REVOKE => - \katzen48\Twitch\EventSub\Events\User\UserAuthorizationRevokeEvent::class, - EventSubType::USER_UPDATE => - \katzen48\Twitch\EventSub\Events\User\UserUpdateEvent::class, + EventSubType::USER_AUTHORIZATION_GRANT => \katzen48\Twitch\EventSub\Events\User\UserAuthorizationGrantEvent::class, + EventSubType::USER_AUTHORIZATION_REVOKE => \katzen48\Twitch\EventSub\Events\User\UserAuthorizationRevokeEvent::class, + EventSubType::USER_UPDATE => \katzen48\Twitch\EventSub\Events\User\UserUpdateEvent::class, ]; } -} \ No newline at end of file +} diff --git a/src/Events/EventSub/CallbackVerificationEvent.php b/src/Events/EventSub/CallbackVerificationEvent.php index f190111..ebe609b 100644 --- a/src/Events/EventSub/CallbackVerificationEvent.php +++ b/src/Events/EventSub/CallbackVerificationEvent.php @@ -19,4 +19,4 @@ public function parsePayload($payload): void $this->challenge = $payload['challenge']; } -} \ No newline at end of file +} diff --git a/src/Events/Extension/ExtensionBitsTransactionCreateEvent.php b/src/Events/Extension/ExtensionBitsTransactionCreateEvent.php index a9679eb..9cd7690 100644 --- a/src/Events/Extension/ExtensionBitsTransactionCreateEvent.php +++ b/src/Events/Extension/ExtensionBitsTransactionCreateEvent.php @@ -38,4 +38,4 @@ public function parseEvent($event): void $this->broadcasterName = $event['broadcaster_user_name']; $this->product = $event['product']; } -} \ No newline at end of file +} diff --git a/src/Events/ModelEventSubscriber.php b/src/Events/ModelEventSubscriber.php index 4dcfa81..3dea569 100644 --- a/src/Events/ModelEventSubscriber.php +++ b/src/Events/ModelEventSubscriber.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Events; - use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Log; use katzen48\Twitch\EventSub\TwitchEventSub; @@ -31,4 +30,4 @@ public static function onCreate($model) $eventSub->subscribeEvent($type, '1', $condition->all()); } } -} \ No newline at end of file +} diff --git a/src/Events/Stream/StreamOfflineEvent.php b/src/Events/Stream/StreamOfflineEvent.php index bbe335d..e938478 100644 --- a/src/Events/Stream/StreamOfflineEvent.php +++ b/src/Events/Stream/StreamOfflineEvent.php @@ -7,8 +7,6 @@ namespace katzen48\Twitch\EventSub\Events\Stream; -use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class StreamOfflineEvent extends BaseEvent @@ -25,4 +23,4 @@ public function parseEvent($event): void $this->broadcasterLogin = $event['broadcaster_user_login']; $this->broadcasterName = $event['broadcaster_user_name']; } -} \ No newline at end of file +} diff --git a/src/Events/Stream/StreamOnlineEvent.php b/src/Events/Stream/StreamOnlineEvent.php index 1f02877..2ac0963 100644 --- a/src/Events/Stream/StreamOnlineEvent.php +++ b/src/Events/Stream/StreamOnlineEvent.php @@ -8,7 +8,6 @@ namespace katzen48\Twitch\EventSub\Events\Stream; use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class StreamOnlineEvent extends BaseEvent @@ -34,4 +33,4 @@ public function parseEvent($event): void $this->type = $event['type']; $this->startedAt = $this->parseCarbon($event['started_at']); } -} \ No newline at end of file +} diff --git a/src/Events/User/UserAuthorizationGrantEvent.php b/src/Events/User/UserAuthorizationGrantEvent.php index dd30cdd..44d3953 100644 --- a/src/Events/User/UserAuthorizationGrantEvent.php +++ b/src/Events/User/UserAuthorizationGrantEvent.php @@ -26,4 +26,4 @@ public function parseEvent($event): void $this->userLogin = $event['user_login']; $this->userName = $event['user_name']; } -} \ No newline at end of file +} diff --git a/src/Events/User/UserAuthorizationRevokeEvent.php b/src/Events/User/UserAuthorizationRevokeEvent.php index 846e0ba..d31b7d8 100644 --- a/src/Events/User/UserAuthorizationRevokeEvent.php +++ b/src/Events/User/UserAuthorizationRevokeEvent.php @@ -7,8 +7,6 @@ namespace katzen48\Twitch\EventSub\Events\User; -use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class UserAuthorizationRevokeEvent extends BaseEvent @@ -28,4 +26,4 @@ public function parseEvent($event): void $this->userLogin = $event['user_login']; $this->userName = $event['user_name']; } -} \ No newline at end of file +} diff --git a/src/Events/User/UserUpdateEvent.php b/src/Events/User/UserUpdateEvent.php index e6482b8..04b8a2c 100644 --- a/src/Events/User/UserUpdateEvent.php +++ b/src/Events/User/UserUpdateEvent.php @@ -7,8 +7,6 @@ namespace katzen48\Twitch\EventSub\Events\User; -use Carbon\CarbonInterface; -use Illuminate\Support\Carbon; use katzen48\Twitch\EventSub\Events\BaseEvent; class UserUpdateEvent extends BaseEvent @@ -34,4 +32,4 @@ public function parseEvent($event): void $this->emailVerified = $event['email_verified'] ?? false; $this->description = $event['description']; } -} \ No newline at end of file +} diff --git a/src/Facades/TwitchEventSub.php b/src/Facades/TwitchEventSub.php index 0494650..712ab79 100644 --- a/src/Facades/TwitchEventSub.php +++ b/src/Facades/TwitchEventSub.php @@ -12,7 +12,6 @@ /** * Class TwitchEventSub - * @package katzen48\Twitch\EventSub\Facades * * @method static string|null subscribeEvent(string $type, string $version, array $condition, bool $batching = false, string $callbackUrl = null) * @method static bool unsubscribeEvent(string $subscriptionId) @@ -23,4 +22,4 @@ protected static function getFacadeAccessor() { return TwitchEventSubService::class; } -} \ No newline at end of file +} diff --git a/src/Listeners/EventSubListener.php b/src/Listeners/EventSubListener.php index 9da1d3e..11fe9e0 100644 --- a/src/Listeners/EventSubListener.php +++ b/src/Listeners/EventSubListener.php @@ -21,4 +21,4 @@ public function handle(EventSubReceived $eventSub) $event::dispatch($eventSub->payload, $eventSub->id, $eventSub->retries, $eventSub->timestamp); } -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPointsCustomRewardPart.php b/src/Objects/ChannelPointsCustomRewardPart.php index 3517d09..de6dd4a 100644 --- a/src/Objects/ChannelPointsCustomRewardPart.php +++ b/src/Objects/ChannelPointsCustomRewardPart.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPointsCustomRewardPart { public string $id; @@ -17,4 +16,4 @@ class ChannelPointsCustomRewardPart public int $cost; public string $prompt; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPointsRedemptionCooldown.php b/src/Objects/ChannelPointsRedemptionCooldown.php index 34801af..3a89315 100644 --- a/src/Objects/ChannelPointsRedemptionCooldown.php +++ b/src/Objects/ChannelPointsRedemptionCooldown.php @@ -7,9 +7,9 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPointsRedemptionCooldown { public bool $enabled; + public int $seconds; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPointsRedemptionLimit.php b/src/Objects/ChannelPointsRedemptionLimit.php index 82c0b54..2226060 100644 --- a/src/Objects/ChannelPointsRedemptionLimit.php +++ b/src/Objects/ChannelPointsRedemptionLimit.php @@ -7,9 +7,9 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPointsRedemptionLimit { public bool $enabled; + public int $value; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPollChoice.php b/src/Objects/ChannelPollChoice.php index 3047dc7..0de07af 100644 --- a/src/Objects/ChannelPollChoice.php +++ b/src/Objects/ChannelPollChoice.php @@ -7,10 +7,9 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPollChoice { public string $id; public string $title; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPollChoiceProgressed.php b/src/Objects/ChannelPollChoiceProgressed.php index 8bfca38..f8c2d2d 100644 --- a/src/Objects/ChannelPollChoiceProgressed.php +++ b/src/Objects/ChannelPollChoiceProgressed.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPollChoiceProgressed extends ChannelPollChoice { public int $bitsVotes; @@ -15,4 +14,4 @@ class ChannelPollChoiceProgressed extends ChannelPollChoice public int $channelPointsVotes; public int $votes; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPollCurrencyVoting.php b/src/Objects/ChannelPollCurrencyVoting.php index 3ce6233..5f094b8 100644 --- a/src/Objects/ChannelPollCurrencyVoting.php +++ b/src/Objects/ChannelPollCurrencyVoting.php @@ -7,10 +7,9 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPollCurrencyVoting { public bool $enabled; public int $amountPerVote; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPredictionOutcome.php b/src/Objects/ChannelPredictionOutcome.php index 6d0bcbc..309fa4e 100644 --- a/src/Objects/ChannelPredictionOutcome.php +++ b/src/Objects/ChannelPredictionOutcome.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPredictionOutcome { public string $id; @@ -15,4 +14,4 @@ class ChannelPredictionOutcome public string $title; public string $color; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPredictionOutcomeProgressed.php b/src/Objects/ChannelPredictionOutcomeProgressed.php index 3caa8ff..f2e2188 100644 --- a/src/Objects/ChannelPredictionOutcomeProgressed.php +++ b/src/Objects/ChannelPredictionOutcomeProgressed.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Objects; - use Illuminate\Support\Collection; class ChannelPredictionOutcomeProgressed extends ChannelPredictionOutcome @@ -20,4 +19,4 @@ class ChannelPredictionOutcomeProgressed extends ChannelPredictionOutcome * @var Collection|ChannelPredictionPredictor contains up to 10 users */ public $topPredictors; -} \ No newline at end of file +} diff --git a/src/Objects/ChannelPredictionPredictor.php b/src/Objects/ChannelPredictionPredictor.php index 7ac877a..5f6886b 100644 --- a/src/Objects/ChannelPredictionPredictor.php +++ b/src/Objects/ChannelPredictionPredictor.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Objects; - class ChannelPredictionPredictor { public string $userName; @@ -19,4 +18,4 @@ class ChannelPredictionPredictor public string $channelPointsWon; public string $channelPointsUsed; -} \ No newline at end of file +} diff --git a/src/Objects/DropEntitlementEvent.php b/src/Objects/DropEntitlementEvent.php index c79034a..7298362 100644 --- a/src/Objects/DropEntitlementEvent.php +++ b/src/Objects/DropEntitlementEvent.php @@ -7,10 +7,9 @@ namespace katzen48\Twitch\EventSub\Objects; - class DropEntitlementEvent { public string $id; public DropEntitlementEventData $data; -} \ No newline at end of file +} diff --git a/src/Objects/DropEntitlementEventData.php b/src/Objects/DropEntitlementEventData.php index 0eb8757..d5e3084 100644 --- a/src/Objects/DropEntitlementEventData.php +++ b/src/Objects/DropEntitlementEventData.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Objects; - use Carbon\CarbonInterface; class DropEntitlementEventData @@ -31,4 +30,4 @@ class DropEntitlementEventData public string $benefitId; public CarbonInterface $createdAt; -} \ No newline at end of file +} diff --git a/src/Objects/HypeTrainContribution.php b/src/Objects/HypeTrainContribution.php index f103fe8..6c355f2 100644 --- a/src/Objects/HypeTrainContribution.php +++ b/src/Objects/HypeTrainContribution.php @@ -7,12 +7,15 @@ namespace katzen48\Twitch\EventSub\Objects; - class HypeTrainContribution { public string $contributorId; + public string $contributorLogin; + public string $contributorName; + public string $type; + public int $total; -} \ No newline at end of file +} diff --git a/src/Objects/Subscription.php b/src/Objects/Subscription.php index 7a643e3..8d53ad6 100644 --- a/src/Objects/Subscription.php +++ b/src/Objects/Subscription.php @@ -7,10 +7,7 @@ namespace katzen48\Twitch\EventSub\Objects; - use Carbon\CarbonInterface; -use katzen48\Twitch\EventSub\Enums\SubscriptionStatus; -use romanzipp\Twitch\Enums\EventSubType; class Subscription { @@ -29,4 +26,4 @@ class Subscription public Transport $transport; public CarbonInterface $created_at; -} \ No newline at end of file +} diff --git a/src/Objects/Transport.php b/src/Objects/Transport.php index 4798af1..1d44484 100644 --- a/src/Objects/Transport.php +++ b/src/Objects/Transport.php @@ -7,10 +7,9 @@ namespace katzen48\Twitch\EventSub\Objects; - class Transport { public string $method; public string $callback; -} \ No newline at end of file +} diff --git a/src/Objects/TwitchCdnImage.php b/src/Objects/TwitchCdnImage.php index 848f0cc..01ee600 100644 --- a/src/Objects/TwitchCdnImage.php +++ b/src/Objects/TwitchCdnImage.php @@ -7,7 +7,6 @@ namespace katzen48\Twitch\EventSub\Objects; - class TwitchCdnImage { public string $url1x; @@ -15,4 +14,4 @@ class TwitchCdnImage public string $url2x; public string $url4x; -} \ No newline at end of file +} diff --git a/src/Providers/TwitchEventSubServiceProvider.php b/src/Providers/TwitchEventSubServiceProvider.php index 4fc42df..fe1fdfc 100644 --- a/src/Providers/TwitchEventSubServiceProvider.php +++ b/src/Providers/TwitchEventSubServiceProvider.php @@ -18,7 +18,7 @@ class TwitchEventSubServiceProvider extends \Illuminate\Support\ServiceProvider public function boot() { $this->publishes([ - dirname(__DIR__) . '/../config/twitch-eventsub.php' => config_path('twitch-eventsub.php'), + dirname(__DIR__).'/../config/twitch-eventsub.php' => config_path('twitch-eventsub.php'), ], 'config'); /** @@ -32,7 +32,7 @@ public function boot() } } - $this->loadRoutesFrom(__DIR__ . '/../routes/twitch-eventsub.php'); + $this->loadRoutesFrom(__DIR__.'/../routes/twitch-eventsub.php'); } public function register() @@ -40,7 +40,7 @@ public function register() parent::register(); $this->mergeConfigFrom( - dirname(__DIR__) . '/../config/twitch-eventsub.php', 'twitch-eventsub' + dirname(__DIR__).'/../config/twitch-eventsub.php', 'twitch-eventsub' ); $this->app->singleton(TwitchEventSub::class, function () { @@ -52,4 +52,4 @@ public function provides() { return [TwitchEventSub::class]; } -} \ No newline at end of file +} diff --git a/src/Traits/SubscribesEventSubs.php b/src/Traits/SubscribesEventSubs.php index 31181c6..174b8f9 100644 --- a/src/Traits/SubscribesEventSubs.php +++ b/src/Traits/SubscribesEventSubs.php @@ -7,18 +7,16 @@ namespace katzen48\Twitch\EventSub\Traits; - use katzen48\Twitch\EventSub\Events\ModelEventSubscriber; /** * Trait SubscribesEventSubs - * @package katzen48\Twitch\EventSub\Traits */ trait SubscribesEventSubs { public static function bootSubscribesEventSubs(): void { - if(!property_exists(static::class, 'eventSubs')) { + if (! property_exists(static::class, 'eventSubs')) { return; } @@ -26,4 +24,4 @@ public static function bootSubscribesEventSubs(): void ModelEventSubscriber::onCreate($model); }); } -} \ No newline at end of file +} diff --git a/src/TwitchEventSub.php b/src/TwitchEventSub.php index 6379213..f3f65a6 100644 --- a/src/TwitchEventSub.php +++ b/src/TwitchEventSub.php @@ -21,11 +21,11 @@ public function __construct() } /** - * @param string $type - * @param string $version - * @param array $condition - * @param bool $batching - * @param string|null $callbackUrl + * @param string $type + * @param string $version + * @param array $condition + * @param bool $batching + * @param string|null $callbackUrl * @return string|null ID of the subscription */ public function subscribeEvent(string $type, string $version, array $condition, bool $batching = false, string $callbackUrl = null): ?string @@ -36,15 +36,15 @@ public function subscribeEvent(string $type, string $version, array $condition, 'condition' => $condition, 'transport' => [ 'method' => 'webhook', - 'callback' => rtrim(config('app.url'), '/') . ($callbackUrl ?: config('twitch-eventsub.callback_url')), + 'callback' => rtrim(config('app.url'), '/').($callbackUrl ?: config('twitch-eventsub.callback_url')), ], ]; - if($this->doesEventAllowBatching($type)) { + if ($this->doesEventAllowBatching($type)) { $sub['is_batching_enabled'] = $batching; } - if($this->doesEventRequireBatching($type)) { + if ($this->doesEventRequireBatching($type)) { $sub['is_batching_enabled'] = true; } @@ -55,6 +55,7 @@ public function subscribeEvent(string $type, string $version, array $condition, } Log::error($result->getErrorMessage()); + return null; } @@ -67,21 +68,22 @@ public function unsubscribeEvent(string $subscriptionId): bool } Log::error($result->getErrorMessage()); + return false; } public function doesEventAllowBatching(string $type): bool { - return match($type) { + return match ($type) { default => false, }; } public function doesEventRequireBatching(string $type): bool { - return match($type) { + return match ($type) { 'drop.entitlement.grant' => true, default => false, }; } -} \ No newline at end of file +} diff --git a/src/routes/twitch-eventsub.php b/src/routes/twitch-eventsub.php index 5ff34e7..a2c0ecc 100644 --- a/src/routes/twitch-eventsub.php +++ b/src/routes/twitch-eventsub.php @@ -3,4 +3,4 @@ Route::post( config('twitch-eventsub.callback_url'), [romanzipp\Twitch\Http\Controllers\EventSubController::class, 'handleWebhook'] -); \ No newline at end of file +);