Merge pull request #61 from Kriper1111/master

Author: Decicus

.gitignore

@@ -7,4 +7,5 @@ Homestead.json
 /access.log
 /error.log
 .phpintel
-.idea
+.idea
+.vscode

app/Http/Controllers/TwitchController.php

@@ -1833,6 +1833,7 @@ public function subEmotes(Request $request, $channel = null)
     {
         $channel = $channel ?: $request->input('channel', null);
         $wantsJson = (($request->wantsJson() || $request->exists('json')) ? true : false);
+        $wantsPlans = ($request->exists('tiers') && $wantsJson);
         $id = $request->input('id', 'false');
 
         if (empty($channel)) {
@@ -1913,6 +1914,20 @@ public function subEmotes(Request $request, $channel = null)
         }
 
         // We only care about the emote codes.
+        // or do we?
+        if ($wantsPlans) {
+            $plans = $emotes['plans'];
+            $emotesData = $emotes['emotes'];
+            $emotesTiers = $plans->sortEmotes($emotesData);
+            return $this->json([
+                'emotes' => [
+                    'tier1' => $emotesTiers['$4.99'],
+                    'tier2' => $emotesTiers['$9.99'],
+                    'tier3' => $emotesTiers['$24.99'],
+                ],
+            ]);
+        }
+
         $emotes = $emotes['emotes'];
         $emoteCodes = $emotes->codes();
 

app/Http/Resources/TwitchEmotes/Channel.php

@@ -17,6 +17,7 @@ public function toArray($request)
         $res = $this->resource;
 
         $emotes = EmotesCollection::make(collect($res['emotes']));
+        $plans = Plans::make($res['plans']);
 
         return [
             'name' => $res['channel_name'],
@@ -27,7 +28,7 @@ public function toArray($request)
             'generated_at' => $res['generated_at'],
 
             'emotes' => $emotes,
-            'plans' => $res['plans'],
+            'plans' => $plans,
             'badges' => [
                 'subscribers' => $res['subscriber_badges'] ?? null,
                 'bits' => $res['bits_badges'] ?? null,

app/Http/Resources/TwitchEmotes/Plans.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Resources\TwitchEmotes;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class Plans extends ResourceCollection
+{
+    // Should convert the resource into an array
+    public function toArray($request)
+    {
+        $res = $this->resource;
+
+        return [
+            'tier1' => $res['$4.99'],
+            'tier2' => $res['$9.99'],
+            'tier3' => $res['$24.99'],
+        ];
+    }
+
+    /**
+     * Sorts emotes by their tier, returns them as an array
+     *
+     * @param array $emotes
+     * @return array
+     */
+    public function sortEmotes($emotes)
+    {
+        return $this->collection
+                    ->map(function($plans) use($emotes){
+                        $accumulator = [];
+                        foreach ($emotes as $emote){
+                            if ((string) $emote['emoticon_set'] === $plans){
+                                array_push($accumulator, $emote['code']);
+                            };
+                        }
+                        return($accumulator);
+                    })
+                    ->toArray();
+    }
+}