Merge remote-tracking branch 'remotes/upstream/master'

Author: damms005

src/Embera/Adapter.php

@@ -8,6 +8,10 @@
 
 namespace Nahid\Talk\Embera;
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> remotes/upstream/master
 use Embera\Adapters\Service;
 
 /**
@@ -17,6 +21,7 @@
  */
 class Adapter extends Service
 {
+<<<<<<< HEAD
 	protected $config;
 
 	/**
@@ -48,4 +53,37 @@ protected function validateUrl()
 
 		return preg_match('#' . $parsedUrl['host'] . '#i', (string) $this->url);
 	}
+=======
+    protected $config;
+
+    /**
+     * Adapter constructor.
+     *
+     * @param string $url
+     * @param array  $config
+     * @param        $oembed
+     */
+    public function __construct($url, array $config = array(), $oembed)
+    {
+        $this->apiUrl = config('talk.oembed.url');
+        parent::__construct($url, $config, $oembed);
+    }
+
+    /**
+     * Validates that the url belongs to this service.
+     * Should be implemented on all children and should
+     * return a boolean (preg_match returns 0 or 1 that
+     * is why I'm also allowing 'int' as a return type).
+     *
+     * The current url is made available via $this->url
+     *
+     * @return bool|int
+     */
+    protected function validateUrl()
+    {
+        $parsedUrl = parse_url($this->apiUrl);
+
+        return preg_match('#' . $parsedUrl['host'] . '#i', (string)$this->url);
+    }
+>>>>>>> remotes/upstream/master
 }

src/Html/HtmlString.php

@@ -8,80 +8,80 @@
 
 class HtmlString implements Htmlable
 {
-	/**
-	 * @var string
-	 */
-	protected $string;
+    /**
+     * @var string
+     */
+    protected $string;
 
-	/**
-	 * @var Embera
-	 */
-	protected $driver;
+    /**
+     * @var Embera
+     */
+    protected $driver;
 
-	/**
-	 * HtmlString constructor.
-	 *
-	 * @param $string
-	 */
-	public function __construct($string, Embera $driver)
-	{
-		$this->setDriver($driver);
-		$this->setString($string);
-	}
+    /**
+     * HtmlString constructor.
+     *
+     * @param $string
+     */
+    public function __construct($string, Embera $driver)
+    {
+        $this->setDriver($driver);
+        $this->setString($string);
+    }
 
-	/**
-	 * Get content as a string of HTML.
-	 *
-	 * @return string
-	 */
-	public function toHtml()
-	{
-		if (config('talk.oembed.enabled')) {
-			$parsedUrl = parse_url(config('talk.oembed.url'));
-			$this->driver->addProvider(
-				$parsedUrl['host'],
-				Adapter::class,
-				[
-					'api_key' => config('talk.oembed.key'),
-				]
-			);
-		}
+    /**
+     * Get content as a string of HTML.
+     *
+     * @return string
+     */
+    public function toHtml()
+    {
+        if (config('talk.oembed.enabled')) {
+            $parsedUrl = parse_url(config('talk.oembed.url'));
+            $this->driver->addProvider(
+                $parsedUrl['host'],
+                Adapter::class,
+                [
+                    'api_key' => config('talk.oembed.key'),
+                ]
+            );
+        }
 
-		$result = $this->driver->autoEmbed($this->string);
+        $result = $this->driver->autoEmbed($this->string);
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getString()
-	{
-		return $this->string;
-	}
+    /**
+     * @return string
+     */
+    public function getString()
+    {
+        return $this->string;
+    }
 
-	/**
-	 * @param string $string
-	 */
-	public function setString($string)
-	{
-		$this->string = $string;
-	}
+    /**
+     * @param string $string
+     */
+    public function setString($string)
+    {
+        $this->string = $string;
+    }
 
-	/**
-	 * @return Embera
-	 */
-	public function getDriver()
-	{
-		return $this->driver;
-	}
+    /**
+     * @return Embera
+     */
+    public function getDriver()
+    {
+        return $this->driver;
+    }
 
-	/**
-	 * @param Embera $driver
-	 */
-	public function setDriver($driver)
-	{
-		$this->driver = $driver;
-	}
+    /**
+     * @param Embera $driver
+     */
+    public function setDriver($driver)
+    {
+        $this->driver = $driver;
+    }
 
 }

src/Html/HtmlStringInterface.php

@@ -12,8 +12,8 @@
 
 interface HtmlStringInterface
 {
-	/**
-	 * @return Htmlable
-	 */
-	public function toHtmlString();
+    /**
+     * @return Htmlable
+     */
+    public function toHtmlString();
 }

src/Messages/Message.php

@@ -35,7 +35,7 @@ class Message extends Model implements HtmlStringInterface
 	public function getHumansTimeAttribute()
 	{
 		//laravel sometimes has $this=null but attributes proprty works perfectly well
-		$date = \Carbon\Carbon::parse($this->attributes['created_at']);
+		$date = Carbon::parse($this->attributes['created_at']);
 		$now  = $date->now();
 
 		return $date->diffForHumans($now, true);

src/Messages/MessageRepository.php

@@ -6,34 +6,34 @@
 
 class MessageRepository extends Repository
 {
-	public function takeModel()
-	{
-		return Message::class;
-	}
-
-	public function deleteMessages($conversationId)
-	{
-		return (boolean) Message::where('conversation_id', $conversationId)->delete();
-	}
-
-	public function softDeleteMessage($messageId, $authUserId)
-	{
-		$message = $this->with(['conversation' => function ($q) use ($authUserId) {
-			$q->where('user_one', $authUserId);
-			$q->orWhere('user_two', $authUserId);
-		}])->find($messageId);
-
-		if (is_null($message->conversation)) {
-			return false;
-		}
-
-		if ($message->user_id == $authUserId) {
-			$message->deleted_from_sender = 1;
-		} else {
-			$message->deleted_from_receiver = 1;
-		}
-
-		return (boolean) $this->update($message);
-
-	}
+    public function takeModel()
+    {
+        return Message::class;
+    }
+
+    public function deleteMessages($conversationId)
+    {
+        return (boolean) Message::where('conversation_id', $conversationId)->delete();
+    }
+
+    public function softDeleteMessage($messageId, $authUserId)
+    {
+        $message = $this->with(['conversation' => function ($q) use ($authUserId) {
+            $q->where('user_one', $authUserId);
+            $q->orWhere('user_two', $authUserId);
+        }])->find($messageId);
+
+        if (is_null($message->conversation)) {
+            return false;
+        }
+
+        if ($message->user_id == $authUserId) {
+            $message->deleted_from_sender = 1;
+        } else {
+            $message->deleted_from_receiver = 1;
+        }
+
+        return (boolean) $this->update($message);
+
+    }
 }