Merge pull request #22 from gerbenjacobs/v2

Merging V2 onto master
gerbenjacobs · Dec 10, 2015 · ceb93fb · ceb93fb
2 parents f21ea9e + b0f11eb
commit ceb93fb
Show file tree

Hide file tree

Showing 20 changed files with 5,916 additions and 1,919 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: php
 php:
  - 5.3
+ - 5.4
  - 5.5
 before_install: 
  - composer self-update

diff --git a/README.md b/README.md
@@ -1,13 +1,14 @@
 [![Build status] (https://api.travis-ci.org/gerbenjacobs/HabboAPI.svg)](https://travis-ci.org/gerbenjacobs/HabboAPI)
 [![Latest Stable Version](https://poser.pugx.org/gerbenjacobs/habbo-api/v/stable.svg)](https://packagist.org/packages/gerbenjacobs/habbo-api)
+[![Join the chat at https://gitter.im/gerbenjacobs/HabboAPI](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gerbenjacobs/HabboAPI) 
 # HabboAPI
 This PHP wrapper library is used to collect data from the _undcoumented_ Habbo API.  
 The project requires PHP 5.3 and uses the Composer autoloader and PSR-4 standard.
 
 See the `example.php` file on how you could use this library.
 
 ## How to use it
-1. Add [the Composer package](https://packagist.org/packages/gerbenjacobs/habbo-api) to your package.json file: `"gerbenjacobs/habbo-api": "v1.*"`
+1. Add [the Composer package](https://packagist.org/packages/gerbenjacobs/habbo-api) to your package.json file: `"gerbenjacobs/habbo-api": "v2.*"`
 2. On the page you want to use it add `include 'vendor/autoload.php'`
 3. Create a HabboParser and construct it with the IP that the server runs on (to prevent JS Cookie issues) and the base URL of the API
 4. Create a HabboAPI instance and inject the HabboParser
@@ -23,7 +24,7 @@ See the `example.php` file on how you could use this library.
     use HabboAPI\HabboParser;
 
     // Create new Parser and API instance
-    $habboParser = new HabboParser('https://www.habbo.com/api/public/');
+    $habboParser = new HabboParser('com');
     $habboApi = new HabboAPI($habboParser);
 
     // Find the user 'koeientemmer' and get their ID

diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
     }
   ],
   "require": {
-    "php": ">=5.3.0"
+    "php": ">=5.3.0",
+    "nesbot/carbon": "^1.21"
   },
   "autoload": {
     "psr-4": {

diff --git a/example.php b/example.php
@@ -8,11 +8,13 @@
 // Shortcut for the FQN
 use HabboAPI\Entities\Badge;
 use HabboAPI\Entities\Habbo;
+use HabboAPI\Entities\Photo;
+use HabboAPI\Entities\Profile;
 use HabboAPI\HabboAPI;
 use HabboAPI\HabboParser;
 
 // Create new Parser and API instance
-$habboParser = new HabboParser('https://www.habbo.com/api/public/');
+$habboParser = new HabboParser('com');
 $habboApi = new HabboAPI($habboParser);
 
 // Find the user 'koeientemmer' and get their ID
@@ -31,71 +33,80 @@
 
 if ($myHabbo->hasProfile()) {
     // Collect all the profile info
+    /** @var Profile $myProfile */
     $myProfile = $habboApi->getProfile($myHabbo->getId());
 } else {
     // This Habbo has a closed home, only show their Habbo object
-    $myProfile = array('habbo' => $myHabbo);
+    $profile = new Profile();
+    $myProfile = $profile->setHabbo($myHabbo);
 }
 
+$myPhotos = $habboApi->getPhotos($myHabbo->getId());
+
 // Export as HTML
 $html = [
     'habbo' => '',
     'worn_badges' => '',
     'friends' => '',
     'groups' => '',
     'rooms' => '',
-    'badges' => ''
+    'badges' => '',
+    'photos' => ''
 ];
 
-// Print all the $profile data in a pretty format, except for 'habbo'
-$lastSection = 'habbo';
-foreach ($myProfile as $section => $data) {
 
-    // Print section name
-    if ($section != $lastSection) {
-        $lastSection = $section;
-        $html[$section] .= '<h2>' . ucfirst($section) . ' (' . count($data) . ')</h2>';
-    }
+// Some markup for the Habbo part
 
-    // Some markup for the Habbo part
-    if ($section == 'habbo') {
-        /* @var Habbo $habbo */
-        $habbo = $data;
-        $html['habbo'] .= '<img src="http://www.habbo.com/habbo-imaging/avatarimage?figure=' . $habbo->getFigureString() . '&size=l&gesture=sml&head_direction=3"
+/* @var Habbo $habbo */
+$habbo = $myProfile->getHabbo();
+$html['habbo'] .= '<img src="http://www.habbo.com/habbo-imaging/avatarimage?figure=' . $habbo->getFigureString() . '&size=l&gesture=sml&head_direction=3"
             alt="' . $habbo->getHabboName() . '" title="' . $habbo->getHabboName() . '" style="float: left; margin-right: 10px;" />';
-        $html['habbo'] .= '<h3>' . $habbo->getHabboName() . '</h3>';
-        $html['habbo'] .= '<p>' . $habbo->getMotto() . '<br><em>' . date('d-M-Y', strtotime($habbo->getMemberSince())) . '</em></p>';
-        if ($habbo->getProfileVisible()) {
-            $html['habbo'] .= '<p><a href="https://www.habbo.com/profile/' . $habbo->getHabboName() . '">View home &raquo;</a></p>';
-        }
-        if ($badges = $habbo->getSelectedBadges()) {
-            foreach ($badges as $badge) {
-                /** @var Badge $badge */
-                $html['worn_badges'] .=
-                    '
-                    <div class="media">
-                        <div class="media-left media-middle">
-                            <a href="#">
-                                <img class="media-object" src="http://images.habbo.com/c_images/album1584/' . $badge->getCode() . '.gif" alt="' . $badge->getName() . '">
-                            </a>
-                        </div>
-                        <div class="media-body">
-                            <h4 class="media-heading">' . $badge->getName() . '</h4>
-                            <em>' . $badge->getDescription() . '</em>
-                        </div>
-                    </div>
-                    ';
-            }
-        }
-    } else {
-        // Show all the other sections as an unordered list
-        if (in_array($section, array("friends", "groups", "rooms", "badges"))) {
-            $html[$section] .= '<ul>';
-            foreach ($data as $object) {
-                $html[$section] .= '<li>' . $object . '</li>'; // uses the __toString() method
-            }
-            $html[$section] .= '</ul>';
-        }
+$html['habbo'] .= '<h3>' . $habbo->getHabboName() . '</h3>';
+$html['habbo'] .= '<p>' . $habbo->getMotto() . '<br><em>' . $habbo->getMemberSince()->toFormattedDateString() . '</em></p>';
+if ($habbo->getProfileVisible()) {
+    $html['habbo'] .= '<p><a href="https://www.habbo.com/profile/' . $habbo->getHabboName() . '">View home &raquo;</a></p>';
+}
+if ($badges = $habbo->getSelectedBadges()) {
+    foreach ($badges as $badge) {
+        /** @var Badge $badge */
+        $html['worn_badges'] .= '
+            <div class="media">
+                <div class="media-left media-middle">
+                    <a href="#">
+                        <img class="media-object" src="http://images.habbo.com/c_images/album1584/' . $badge->getCode() . '.gif" alt="' . $badge->getName() . '">
+                    </a>
+                </div>
+                <div class="media-body">
+                    <h4 class="media-heading">' . $badge->getName() . '</h4>
+                    <em>' . $badge->getDescription() . '</em>
+                </div>
+            </div>
+        ';
+    }
+}
+
+// Show all the other sections as an unordered list
+foreach (array("friends", "groups", "rooms", "badges") as $section) {
+    $html[$section] .= '<ul>';
+    $method_name = sprintf('get%s', ucfirst($section));
+    foreach (call_user_func(array($myProfile, $method_name)) as $object) {
+        $html[$section] .= '<li>' . $object . '</li>'; // uses the __toString() method
+    }
+    $html[$section] .= '</ul>';
+}
+
+// Generate the photos
+if ($myPhotos) {
+    /** @var Photo $myPhoto */
+    foreach ($myPhotos as $myPhoto) {
+        $html['photos'] .= '
+            <div class="col-md-3">
+                <a href="https://www.habbo.com/profile/' . $myPhoto->getCreatorName() . '/photo/' . $myPhoto->getId() . '" class="thumbnail">
+                  <img src="' . $myPhoto->getPreviewUrl() . '" alt="' . $myPhoto->getId() . '">
+                </a>
+                <div class="caption">Taken on ' . $myPhoto->getTakenOn()->toFormattedDateString() . ' by ' . $myPhoto->getCreatorName() . '</div>
+            </div>
+        ';
     }
 }
 ?>
@@ -147,7 +158,14 @@
         </div>
     </div>
 
+    <hr>
+
+    <div class="row">
+        <?php echo $html['photos']; ?>
+    </div>
+
     <?php if ($myHabbo->hasProfile()): ?>
+        <hr>
         <div class="row">
             <div class="col-md-3">
                 <?php echo $html['badges']; ?>

diff --git a/src/Entities/Habbo.php b/src/Entities/Habbo.php
@@ -3,6 +3,7 @@
  * The entitymodel for a Habbo object
  */
 namespace HabboAPI\Entities;
+use Carbon\Carbon;
 
 /**
  * Class Habbo
@@ -27,11 +28,13 @@ class Habbo implements Entity
      */
     public function parse($data)
     {
+        // These attributes are shared between Habbo and Friends
         $this->setId($data['uniqueId']);
         $this->setHabboName($data['name']);
         $this->setMotto($data['motto']);
         $this->setFigureString($data['figureString']);
 
+        // These could be missing..
         if (isset($data['memberSince'])) {
             $this->setMemberSince($data['memberSince']);
         }
@@ -111,19 +114,19 @@ protected function setId($id)
     }
 
     /**
-     * @return mixed
+     * @return Carbon
      */
     public function getMemberSince()
     {
         return $this->memberSince;
     }
 
     /**
-     * @param mixed $memberSince
+     * @param Carbon $memberSince
      */
     protected function setMemberSince($memberSince)
     {
-        $this->memberSince = $memberSince;
+        $this->memberSince = Carbon::parse($memberSince);
     }
 
     /**