Merge pull request #2 from Decicus/master

update fork #2

Author: Kriper1111

app/Http/Controllers/MiscController.php

@@ -71,6 +71,10 @@ public function currency(Request $request)
             return Helper::text('An error has occurred retrieving exchange rates');
         }
 
+        if (empty($convert)) {
+            return Helper::text('An error has occurred retrieving exchange rates');
+        }
+
         if ($convert['success'] === false) {
             if (!empty($convert['error'])) {
                 return Helper::text('An error occurred retrieving exchange rates: ' . $convert['error']['type']);

app/Http/Controllers/TwitchController.php

@@ -848,6 +848,11 @@ public function gameOrStatus(Request $request, $route, $channel = null)
 
         $getGame = $this->twitchApi->channels($channel, $this->version);
 
+        // Invalid API response
+        if (empty($getGame)) {
+            return Helper::text(__('generic.error_loading_data_api'));
+        }
+
         if (isset($getGame['message'])) {
             return Helper::text(sprintf('%s - %s', $getGame['error'], $getGame['message']));
         }
@@ -1147,7 +1152,7 @@ public function hosts(Request $request, $hosts = null, $channel = null)
 
         $names = array_slice($hostList, 0, $limit);
         $others = count($hostList) - $limit;
-        $text = __('twitch.multiple_hosts', [
+        $text = trans_choice('twitch.multiple_hosts', $others, [
             'channels' => implode($separator, $names),
             'amount' => $others,
         ]);
@@ -1652,6 +1657,11 @@ public function subcount(Request $request, $subcount = null, $channel = null)
 
             $data = $this->twitchApi->channelSubscriptions($user->id, $token, 1, 0, 'asc', $this->version);
 
+            // Invalid API response
+            if (empty($data)) {
+                return Helper::text(__('generic.error_loading_data_api'));
+            }
+
             if (!empty($data['status'])) {
                 if ($data['status'] === 401) {
                     return Helper::text($needToReAuth);
@@ -1854,6 +1864,11 @@ public function subEmotes(Request $request, $channel = null)
                 return Helper::text('Error occurred retrieving user information for Twitch user: ' . $channel);
             }
 
+            // API returned an empty response, most likely disabled/banned user or it doesn't exist.
+            if (empty($user)) {
+                return Helper::text(__('twitch.user_not_found', ['user' => $channel]));
+            }
+
             if (!empty($user['message'])) {
                 return Helper::text($user['message']);
             }