Merge remote-tracking branch 'origin/master' into akun

@@ -431,7 +431,7 @@ class WebTraffic extends Command
                         $query->whereIn('ip_area', $main_countries);
                         $query->whereIn('ip_area', $main_countries);
                     }
                     }
                     if($filter_countries){
                     if($filter_countries){
-                        $query->whereNotIn('ip_area', $main_countries);
+                        $query->whereNotIn('ip_area', $filter_countries);
                     }
                     }
                 })->inRandomOrder()->first();
                 })->inRandomOrder()->first();
             if(!$ipdata){
             if(!$ipdata){

@@ -398,7 +398,7 @@ class ImageController extends Controller
                 foreach ($str_data as $k => $v){
                 foreach ($str_data as $k => $v){
                     $arr = explode('/',$v);
                     $arr = explode('/',$v);
                     if ($arr[0] == 'text') {
                     if ($arr[0] == 'text') {
-                        $arr[1] = urlSafeBase64Encode($arr[1]);
+                        $arr[1] = urlSafeBase64Encode($arr[1] ?? 'shuiying');
                         $v = implode('/',$arr);
                         $v = implode('/',$arr);
                     }
                     }
                     if ($arr[0] == 'font') {
                     if ($arr[0] == 'font') {