Added media upload and made username optional on registration

Author: Ghitu

src/Matrix.php

@@ -11,6 +11,7 @@
 use Updivision\Matrix\Exceptions\RateLimitExceededException;
 use Updivision\Matrix\Exceptions\UnsupportedContentTypeException;
 use Updivision\Matrix\Resources\Room;
+use Updivision\Matrix\Resources\Media;
 use Updivision\Matrix\Resources\UserData;
 use Updivision\Matrix\Resources\UserSession;
 
@@ -45,6 +46,12 @@ class Matrix
      */
     private $baseUrl;
 
+    /**
+     * @internal
+     * @var string
+     */
+    private $domain;
+
     /**
      * Constructs a new matrix api instance
      *
@@ -56,7 +63,7 @@ public function __construct($domain)
     {
         $this->validateConstructorArgs($domain);
 
-        $this->baseUrl = $domain.'_matrix/client/r0';
+        $this->domain = $domain;
 
         $this->client = new Client();
 
@@ -78,10 +85,14 @@ public function __construct($domain)
      * @throws RateLimitExceededException
      * @throws UnsupportedContentTypeException
      */
-    public function request($method, $endpoint, array $data = null, array $query = null)
+    public function request($method, $endpoint, array $data = null, array $query = null, $rawData = false)
     {
         $options = ['json' => $data];
 
+        if ($rawData) {
+            $options = $data;
+        }
+
         if (isset($query)) {
             $options['query'] = $query;
         }
@@ -155,11 +166,19 @@ public function session()
 
     public function user()
     {
+        $this->baseUrl = $this->domain.'_matrix/client/r0';
         return new UserData($this);
     }
 
     public function room()
     {
+        $this->baseUrl = $this->domain.'_matrix/client/r0';
         return new Room($this);
     }
+
+    public function media()
+    {
+        $this->baseUrl = $this->domain.'_matrix/media/r0';
+        return new Media($this);
+    }
 }

src/Resources/Media.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Updivision\Matrix\Resources;
+
+use Updivision\Matrix\Resources\AbstractResource;
+
+/**
+ * Media management
+ *
+ * This provides methods to create and update media
+ *
+ * @package Matrix\Resources
+ */
+class Media extends AbstractResource
+{
+    /**
+     * The resource endpoint
+     *
+     * @internal
+     * @var string
+     */
+    protected $endpoint = '';
+
+    public function upload($file, $contentType)
+    {
+        if ($this->check()) {
+            $data = file_get_contents($file);
+            return $this->matrix()->request('POST', $this->endpoint('upload'), [
+                    'body' => $data,
+                    'headers'  => [
+                        'Content-Type' => $contentType,
+                        'Content-Length' => strlen($data)
+                    ]
+                ], [
+                    'filename' => basename($file),
+                    'access_token' => $this->data['access_token']
+                ], true);
+        }
+        throw new \Exception('Not authenticated');
+    }
+}

src/Resources/UserData.php

@@ -113,7 +113,7 @@ public function getProfile($userId = null)
             }
             $userId = $this->data['user_id'];
         }
-        return $this->matrix()->request('GET', $this->endpoint('profile/'.$userId));
+        return $this->matrix()->request('GET', $this->endpoint('profile/'.urlencode($userId)));
     }
 
     /**
@@ -132,7 +132,7 @@ public function getAvatar($userId = null)
             }
             $userId = $this->data['user_id'];
         }
-        return $this->matrix()->request('GET', $this->endpoint('profile/'.$userId.'/avatar_url'));
+        return $this->matrix()->request('GET', $this->endpoint('profile/'.urlencode($userId).'/avatar_url'));
     }
 
     /**
@@ -147,7 +147,7 @@ public function setAvatar($avatarUrl)
     {
         if ($this->check()) {
             $userId = $this->data['user_id'];
-            return $this->matrix()->request('PUT', $this->endpoint('profile/'.$userId.'/avatar_url'), [
+            return $this->matrix()->request('PUT', $this->endpoint('profile/'.urlencode($userId).'/avatar_url'), [
                 'avatar_url' => $avatarUrl
             ], [
                 'access_token' => $this->data['access_token']
@@ -172,7 +172,7 @@ public function getDisplayName($userId = null)
             }
             $userId = $this->data['user_id'];
         }
-        return $this->matrix()->request('GET', $this->endpoint('profile/'.$userId.'/displayname'));
+        return $this->matrix()->request('GET', $this->endpoint('profile/'.urlencode($userId).'/displayname'));
     }
 
     /**
@@ -187,7 +187,7 @@ public function setDisplayName($displayName)
     {
         if ($this->check()) {
             $userId = $this->data['user_id'];
-            return $this->matrix()->request('PUT', $this->endpoint('profile/'.$userId.'/displayname'), [
+            return $this->matrix()->request('PUT', $this->endpoint('profile/'.urlencode($userId).'/displayname'), [
                 'displayname' => $displayName
             ], [
                 'access_token' => $this->data['access_token']
@@ -204,16 +204,21 @@ public function setDisplayName($displayName)
      */
     public function register($username, $password)
     {
-        $data = $this->matrix()->request('POST', $this->endpoint('register'), [
+        $userData = [
             'auth' => [
                 'type' => 'm.login.dummy'
             ],
-            'bind_email' => true,
-            'bind_msisdn' => true,
+            'bind_email' => false,
+            'bind_msisdn' => false,
             'password' => $password,
-            'username' => $username,
-            'x_show_msisdn' => true
-        ], [
+            'x_show_msisdn' => false
+        ];
+
+        if ($username) {
+            $userData['username'] = $username;
+        }
+
+        $data = $this->matrix()->request('POST', $this->endpoint('register'), $userData, [
             'kind' => 'user'
         ]);
         $this->setData($data);