stream-laravel for laravel 5

Author: concentriccircles

src/GetStream/StreamLaravel/StreamLaravelManager.php

@@ -5,19 +5,17 @@
 class StreamLaravelManager {
 
     public $client;
-    private $config;
 
     public function __construct($api_key, $api_secret, $config)
     {
-        $this->config = $config;
         if (getenv('STREAM_URL') !== false) {
             $this->client = Client::herokuConnect(getenv('STREAM_URL'));
         } else {
-            $this->client = new Client($api_key, $api_secret);
-            $location = $this->config->get("stream-laravel::location");
+            $this->client = new Client($api_key, $api_secret, 'v1.0', '', 10);
+            $location = config("getstream.location");
             $this->client->setLocation($location);
         }
-        $this->userFeed = $this->config->get("stream-laravel::user_feed");
+        $this->userFeed = config("getstream.user_feed");
     }
 
     public function getUserFeed($user_id)
@@ -27,14 +25,14 @@ public function getUserFeed($user_id)
 
     public function getNotificationFeed($user_id)
     {
-        $user_feed = $this->config->get("stream-laravel::notification_feed");
+        $user_feed = config("getstream.notification_feed");
         return $this->client->feed($user_feed, $user_id);
     }
 
     public function getNewsFeeds($user_id)
     {
         $feeds = array();
-        $news_feeds = $this->config->get("stream-laravel::news_feeds");
+        $news_feeds = config("getstream.news_feeds");
         foreach ($news_feeds as $feed) {
             $feeds[$feed] = $this->client->feed($feed, $user_id);
         }

src/GetStream/StreamLaravel/StreamLaravelServiceProvider.php

@@ -18,7 +18,14 @@ class StreamLaravelServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('get-stream/stream-laravel');
+		// $this->registerResources();
+
+		$this->loadViewsFrom(__DIR__.'/../../views', 'stream-laravel');
+
+		$this->publishes([
+		    __DIR__.'/../../config/config.php' => config_path('getstream.php'),
+		    __DIR__.'/../../views' => base_path('resources/views/vendor/stream-laravel'),
+		]);
 	}
 
 	/**
@@ -28,11 +35,17 @@ public function boot()
 	 */
 	public function register()
 	{
+		$this->mergeConfigFrom(
+			__DIR__.'/../../config/config.php', 'getstream'
+		);
+
 		$this->app['feed_manager'] = $this->app->share(function($app)
         {
-        	$manager_class = $app['config']->get('stream-laravel::feed_manager_class');
-        	$api_key = $app['config']->get('stream-laravel::api_key');
-        	$api_secret = $app['config']->get('stream-laravel::api_secret');
+
+        	$manager_class = config('getstream.feed_manager_class');
+        	$api_key = config('getstream.api_key');
+        	$api_secret = config('getstream.api_secret');
+
             return new $manager_class($api_key, $api_secret, $app['config']);
         });
 	}

src/config/config.php

@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
 
     /*
     |-----------------------------------------------------------------------------
@@ -46,4 +46,4 @@
         'flat' => 'flat',
         'aggregated' => 'aggregated',
     )
-);
+];

src/views/render_activity.blade.php

@@ -13,5 +13,6 @@
         @endif
     @endif
 @else
-    {{ ''; Log::warning('The activity could not be rendered, the following field/refs could not be enriched:', $activity->getNotEnrichedData()); }}
+    {{  }}
+    Log::warning('The activity could not be rendered, the following field/refs could not be enriched:', $activity->getNotEnrichedData());
 @endif