Merge lp:~gary-wzl77/unity-scope-soundcloud/unity-scope-soundcloud into lp:unity-scope-soundcloud

[Gary.Wang]

Add new features offered by soundcloud which are missing in this scope.

Add new features offered by soundcloud which are missing in this scope.
1.Add detailed track info in card view
2.Load high resolution track picture
3.Support to retrieve comment list
4.Support to post a comment
5.Waveform image url fixed when loading auth user favorite streams
6.Support to mark a "like" for tracks
7.Support to follow an artist
8.Bump framework to ubuntu-sdk-15.04
9.Fix login failed

[lp:~gary-wzl77/unity-scope-soundcloud/unity-scope-soundcloud]

41. By Gary.Wang on 2016-01-26

1.Show user info after login
2.Add "My favorites" department
3.Get specific user's track list

42. By Gary.Wang on 2016-02-02

Use deparments instead of string querying for navigation

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-04 15:01:39 +0000
+++ CMakeLists.txt	2016-02-02 11:41:52 +0000
@@ -55,7 +55,7 @@
 set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
 
 # Important project paths
-set(SCOPE_VERSION "1.0.1-${BZR_REVNO}")
+set(SCOPE_VERSION "1.6.0-${BZR_REVNO}")
 set(CMAKE_INSTALL_PREFIX /)
 set(SCOPE_INSTALL_DIR "/soundcloud")
 set(GETTEXT_PACKAGE "unity-scope-soundcloud")
 
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-11-12 13:18:58 +0000
+++ click/manifest.json.in	2016-02-02 11:41:52 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "@CLICK_ARCH@",
     "description": "Listen to your favourite tracks on SoundCloud",
-    "framework": "ubuntu-sdk-14.10-dev2",
+    "framework": "ubuntu-sdk-15.04",
     "hooks": {
         "soundcloud": {
             "apparmor": "soundcloud.apparmor",
 
=== modified file 'click/soundcloud.apparmor'
--- click/soundcloud.apparmor	2014-11-11 06:54:01 +0000
+++ click/soundcloud.apparmor	2016-02-02 11:41:52 +0000
@@ -3,7 +3,7 @@
     "policy_groups": [
         "accounts"
     ],
-    "policy_version": 1.2
+    "policy_version": 1.3
 }
 
 
 
=== modified file 'click/soundcloud.provider.in'
--- click/soundcloud.provider.in	2014-11-17 09:44:59 +0000
+++ click/soundcloud.provider.in	2016-02-02 11:41:52 +0000
@@ -21,6 +21,7 @@
           <setting type="as" name="Scope">['non-expiring']</setting>
           <setting name="ClientId">eadbbc8380aa72be1412e2abe5f8e4ca</setting>
           <setting type="as" name="AllowedSchemes">['https','http']</setting>
+          <setting name="DisableStateParameter" type="b">true</setting>
         </group>
       </group>
     </group>
 
=== modified file 'data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in'
--- data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in	2014-11-18 15:08:53 +0000
+++ data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in	2016-02-02 11:41:52 +0000
@@ -13,3 +13,5 @@
 PageHeader.ForegroundColor = #ffffffff
 PageHeader.Logo = logo.png
 PageHeader.NavigationBackground = color:///#ddffffff
+PreviewButtonColor=#FF5500
+
 
=== modified file 'include/api/client.h'
--- include/api/client.h	2014-12-04 13:39:07 +0000
+++ include/api/client.h	2016-02-02 11:41:52 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
 #ifndef API_CLIENT_H_
@@ -21,6 +22,7 @@
 
 #include <api/config.h>
 #include <api/track.h>
+#include <api/comment.h>
 
 #include <unity/scopes/OnlineAccountClient.h>
 
@@ -62,6 +64,32 @@
 
     virtual std::future<std::deque<Track>> stream_tracks(int limit=0);
 
+    virtual std::future<std::deque<Comment>> track_comments(const std::string &trackid);
+
+    virtual std::future<bool> post_comment(const std::string &trackid,
+                                           const std::string &postmsg);
+
+    virtual std::future<std::deque<Track>> favorite_tracks();
+
+    virtual std::future<std::deque<Track>> get_user_tracks(const std::string &userid,
+                                                           int limit = 0);
+
+    virtual std::future<bool> is_fav_track(const std::string &trackid);
+
+    virtual std::future<bool> like_track(const std::string &trackid);
+
+    virtual std::future<bool> delete_like_track(const std::string &trackid);
+
+    virtual std::future<bool> is_user_follower(const std::string &userid);
+
+    virtual std::future<bool> follow_user(const std::string &userid);
+
+    virtual std::future<bool> unfollow_user(const std::string &userid);
+
+    virtual std::future<User> get_authuser_info();
+
+    virtual std::future<User> get_user_info(const std::string &userid);
+
     /**
      * Cancel any pending queries (this method can be called from a different thread)
      */
 
=== added file 'include/api/comment.h'
--- include/api/comment.h	1970-01-01 00:00:00 +0000
+++ include/api/comment.h	2016-02-02 11:41:52 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
+ */
+
+#ifndef API_COMMENT_H_
+#define API_COMMENT_H_
+
+#include <api/user.h>
+
+#include <memory>
+#include <string>
+
+namespace Json {
+class Value;
+}
+
+namespace api {
+
+class Comment: public Resource {
+public:
+    typedef std::shared_ptr<Comment> Ptr;
+
+    Comment(const Json::Value &data);
+
+    virtual ~Comment() = default;
+
+    const unsigned int & id() const override;
+
+    const std::string & title() const override;
+
+    const std::string & artwork() const override;
+
+    const std::string & body() const;
+
+    const std::string & created_at() const;
+    
+    const User & user() const;
+
+    Kind kind() const override;
+
+    std::string kind_str() const override;
+
+protected:
+    std::string body_;
+
+    std::string created_at_;
+    
+    unsigned int id_;
+    
+    User user_;
+};
+
+}
+
+#endif // API_COMMENT_H_
 
=== modified file 'include/api/resource.h'
--- include/api/resource.h	2014-11-05 16:17:51 +0000
+++ include/api/resource.h	2016-02-02 11:41:52 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
 #ifndef API_RESOURCE_H_
@@ -27,7 +28,7 @@
 class Resource {
 public:
     enum class Kind {
-        track, user
+        track, user, comment,
     };
 
     typedef std::shared_ptr<Resource> Ptr;
 
=== modified file 'include/api/track.h'
--- include/api/track.h	2014-11-06 11:40:45 +0000
+++ include/api/track.h	2016-02-02 11:41:52 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
 #ifndef API_TRACK_H_
@@ -76,6 +77,16 @@
 
     unsigned int favoritings_count() const;
 
+    unsigned int comment_count() const;
+
+    unsigned int repost_count() const;
+
+    unsigned int likes_count() const;
+
+    const std::string & genre() const;
+
+    const std::string & original_format() const;
+
     const User & user() const;
 
     Kind kind() const override;
@@ -121,6 +132,16 @@
 
     unsigned int favoritings_count_;
 
+    unsigned int comment_count_;
+
+    unsigned int repost_count_;
+
+    unsigned int likes_count_;
+
+    std::string genre_;
+
+    std::string original_format_;
+
     User user_;
 };
 
 
=== modified file 'include/api/user.h'
--- include/api/user.h	2014-11-05 16:17:51 +0000
+++ include/api/user.h	2016-02-02 11:41:52 +0000
@@ -44,6 +44,16 @@
 
     const unsigned int & id() const override;
 
+    const std::string & permalink_url() const;
+
+    const unsigned int & track_count() const;
+
+    const unsigned int & followers_count() const;
+
+    const unsigned int & followings_count() const;
+
+    const std::string & bio() const;
+
     Kind kind() const override;
 
     std::string kind_str() const override;
@@ -54,6 +64,16 @@
     unsigned int id_;
 
     std::string artwork_;
+
+    std::string permalink_;
+
+    unsigned int track_count_;
+
+    unsigned int followers_count_;
+
+    unsigned int followings_count_;
+
+    std::string bio_;
 };
 
 }
 
=== added file 'include/scope/activation.h'
--- include/scope/activation.h	1970-01-01 00:00:00 +0000
+++ include/scope/activation.h	2016-02-02 11:41:52 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
+ */
+
+#ifndef SCOPE_ACTIVATIOIN_H_
+#define SCOPE_ACTIVATIOIN_H_
+
+#include <api/client.h>
+
+#include <unity/scopes/ActivationQueryBase.h>
+
+namespace unity {
+namespace scopes {
+class Result;
+}
+}
+
+namespace scope {
+
+/**
+ * Represents an individual action request.
+ *
+ * Each time a action is performed in the UI a new Action
+ * object is created.
+ */
+class Activation : public unity::scopes::ActivationQueryBase
+{
+public:
+    Activation(const unity::scopes::Result &result,
+           const unity::scopes::ActionMetadata & metadata,
+           std::string const& action_id,
+           std::shared_ptr<unity::scopes::OnlineAccountClient> oa_client);
+
+    ~Activation() = default;
+
+     /**
+     * Trigger the action object with action id.
+     */
+     virtual unity::scopes::ActivationResponse activate() override;
+
+private:
+    std::string const action_id_;
+    
+    api::Client client_;
+};
+
+}
+
+#endif // SCOPE_ACTIVATION_H_
 
=== modified file 'include/scope/preview.h'
--- include/scope/preview.h	2014-11-10 11:54:32 +0000
+++ include/scope/preview.h	2016-02-02 11:41:52 +0000
@@ -14,12 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
 #ifndef SCOPE_PREVIEW_H_
 #define SCOPE_PREVIEW_H_
 
+#include <api/client.h>
+
 #include <unity/scopes/PreviewQueryBase.h>
+#include <unity/scopes/OnlineAccountClient.h>
 
 namespace unity {
 namespace scopes {
@@ -38,7 +42,8 @@
 class Preview: public unity::scopes::PreviewQueryBase {
 public:
     Preview(const unity::scopes::Result &result,
-            const unity::scopes::ActionMetadata &metadata);
+            const unity::scopes::ActionMetadata &metadata,
+            std::shared_ptr<unity::scopes::OnlineAccountClient> oa_client);
 
     ~Preview() = default;
 
@@ -48,6 +53,9 @@
      * Populates the reply object with preview information.
      */
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
+    
+private:
+    api::Client client_;
 };
 
 }
 
=== modified file 'include/scope/query.h'
--- include/scope/query.h	2014-12-04 13:22:43 +0000
+++ include/scope/query.h	2016-02-02 11:41:52 +0000
@@ -51,6 +51,12 @@
                     const unity::scopes::Category::SCPtr &category,
                     const api::Track &track);
 
+    bool push_user_info(const unity::scopes::SearchReplyProxy &reply,
+                           const unity::scopes::Category::SCPtr &category,
+                           const api::User &user);
+
+    bool show_empty_tip(const unity::scopes::SearchReplyProxy &reply);
+
     api::Client client_;
 };
 
 
=== modified file 'include/scope/scope.h'
--- include/scope/scope.h	2014-12-04 13:24:10 +0000
+++ include/scope/scope.h	2016-02-02 11:41:52 +0000
@@ -61,6 +61,15 @@
             unity::scopes::CannedQuery const& q,
             unity::scopes::SearchMetadata const&) override;
 
+    /**
+     * Called each time a new action is requested
+     */
+    unity::scopes::ActivationQueryBase::UPtr perform_action(
+            const unity::scopes::Result &result,
+            const unity::scopes::ActionMetadata &metadata,
+            std::string const& widget_id,
+            std::string const& action_id) override;
+
 protected:
     std::shared_ptr<unity::scopes::OnlineAccountClient> oa_client_;
 };
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-11-18 15:08:53 +0000
+++ po/POTFILES.in	2016-02-02 11:41:52 +0000
@@ -1,16 +1,20 @@
-[type: gettext/ini] data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in
-include/api/resource.h
-include/api/user.h
-include/api/config.h
-include/api/track.h
-include/api/client.h
+tests/unit/scope/test-scope.cpp
+src/scope/preview.cpp
+src/scope/activation.cpp
+src/scope/scope.cpp
+src/scope/query.cpp
+src/api/user.cpp
+src/api/client.cpp
+src/api/track.cpp
+src/api/comment.cpp
 include/scope/preview.h
 include/scope/localization.h
+include/scope/activation.h
 include/scope/query.h
 include/scope/scope.h
-src/api/client.cpp
-src/api/track.cpp
-src/api/user.cpp
-src/scope/query.cpp
-src/scope/scope.cpp
-src/scope/preview.cpp
 \ No newline at end of file
+include/api/resource.h
+include/api/track.h
+include/api/comment.h
+include/api/client.h
+include/api/config.h
+include/api/user.h
 
=== modified file 'po/en_GB.po'
--- po/en_GB.po	2014-11-18 16:42:10 +0000
+++ po/en_GB.po	2016-02-02 11:41:52 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity-scope-soundcloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 14:00+0000\n"
+"POT-Creation-Date: 2016-01-26 16:58+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pete Woods <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,226 +17,310 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:416
+msgid "</b> followers"
+msgstr ""
+
+#: ../src/scope/query.cpp:417
+msgid "</b> followings"
+msgstr ""
+
+#: ../src/scope/query.cpp:415
+msgid "</b> tracks"
+msgstr ""
+
+#: ../src/scope/query.cpp:148
 msgid "Alternative Rock"
 msgstr "Alternative Rock"
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:148
 msgid "Ambient"
 msgstr "Ambient"
 
-#: ../src/scope/query.cpp:97
+#: ../src/scope/query.cpp:133
 msgid "Audiobooks"
 msgstr "Audiobooks"
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Business"
 msgstr "Business"
 
-#: ../src/scope/preview.cpp:84
+#: ../src/scope/preview.cpp:198
 msgid "Buy"
 msgstr "Buy"
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:148
 msgid "Classical"
 msgstr "Classical"
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Comedy"
 msgstr "Comedy"
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:148
 msgid "Country"
 msgstr "Country"
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Dance"
 msgstr "Dance"
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Deep House"
 msgstr "Deep House"
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Disco"
 msgstr "Disco"
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Drum & Bass"
 msgstr "Drum & Bass"
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Dubstep"
 msgstr "Dubstep"
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/query.cpp:150
 msgid "Electro"
 msgstr "Electro"
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/query.cpp:150
 msgid "Electronic"
 msgstr "Electronic"
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Entertainment"
 msgstr "Entertainment"
 
-#: ../src/scope/query.cpp:220
+#: ../src/scope/query.cpp:273
 msgid "Explore"
 msgstr "Explore"
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/query.cpp:150
 msgid "Folk"
 msgstr "Folk"
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/preview.cpp:249
+msgid "Follow"
+msgstr ""
+
+#: ../src/scope/preview.cpp:105
+msgid "Get my tracks"
+msgstr ""
+
+#: ../src/scope/preview.cpp:219
+msgid "Get user tracks"
+msgstr ""
+
+#: ../src/scope/query.cpp:150
 msgid "Hardcore Techno"
 msgstr "Hardcore Techno"
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Hip Hop"
 msgstr "Hip Hop"
 
-#: ../src/scope/query.cpp:111
+#: ../src/scope/query.cpp:147
 msgid "Home"
 msgstr "Home"
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "House"
 msgstr "House"
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Indie Rock"
 msgstr "Indie Rock"
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Jazz"
 msgstr "Jazz"
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Latin"
 msgstr "Latin"
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Learning"
 msgstr "Learning"
 
-#: ../src/scope/query.cpp:306
+#: ../src/scope/preview.cpp:234
+msgid "Like"
+msgstr ""
+
+#: ../src/scope/query.cpp:459
 msgid "Log-in to SoundCloud"
 msgstr "Log in to SoundCloud"
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/preview.cpp:163
+#, fuzzy
+msgid "Login to soundcloud"
+msgstr "Log in to SoundCloud"
+
+#: ../src/scope/query.cpp:152
 msgid "Metal"
 msgstr "Metal"
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/query.cpp:152
 msgid "Minimal Techno"
 msgstr "Minimal Techno"
 
-#: ../src/scope/query.cpp:99
+#: ../src/scope/query.cpp:172
+msgid "My favorites"
+msgstr ""
+
+#: ../src/scope/query.cpp:135
 msgid "News & Politics"
 msgstr "News & Politics"
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/query.cpp:445
+msgid "No tracks can be found"
+msgstr ""
+
+#: ../src/scope/query.cpp:152
 msgid "Piano"
 msgstr "Piano"
 
-#: ../src/scope/preview.cpp:103
+#: ../src/scope/preview.cpp:213
 msgid "Play in browser"
 msgstr "Play in browser"
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/preview.cpp:155
+msgid "Please login to post a comment  "
+msgstr ""
+
+#: ../src/scope/query.cpp:152
 msgid "Pop"
 msgstr "Pop"
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/preview.cpp:187
+msgid "Post"
+msgstr ""
+
+#: ../src/scope/query.cpp:153
 msgid "Progressive House"
 msgstr "Progressive House"
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/query.cpp:153
 msgid "Punk"
 msgstr "Punk"
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/query.cpp:153
 msgid "R&B"
 msgstr "R&B"
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/query.cpp:153
 msgid "Rap"
 msgstr "Rap"
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/query.cpp:154
 msgid "Reggae"
 msgstr "Reggae"
 
-#: ../src/scope/query.cpp:99
+#: ../src/scope/query.cpp:135
 msgid "Religion & Spirituality"
 msgstr "Religion & Spirituality"
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/preview.cpp:229
+msgid "Remove 'Like'"
+msgstr ""
+
+#: ../src/scope/query.cpp:154
 msgid "Rock"
 msgstr "Rock"
 
-#: ../src/scope/query.cpp:99
+#: ../src/scope/query.cpp:135
 msgid "Science"
 msgstr "Science"
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/query.cpp:154
 msgid "Singer-Songwriter"
 msgstr "Singer-Songwriter"
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/query.cpp:154
 msgid "Soul"
 msgstr "Soul"
 
-#: ../data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in.h:1
-msgid "SoundCloud"
-msgstr "SoundCloud"
-
-#: ../data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in.h:2
-msgid "SoundCloud scope for Unity8"
-msgstr "SoundCloud scope for Unity8"
-
-#: ../src/scope/query.cpp:100
+#: ../src/scope/query.cpp:136
 msgid "Sports"
 msgstr "Sports"
 
-#: ../src/scope/query.cpp:100
+#: ../src/scope/query.cpp:136
 msgid "Storytelling"
 msgstr "Storytelling"
 
-#: ../src/scope/query.cpp:208
+#: ../src/scope/query.cpp:260
 msgid "Stream"
 msgstr "Stream"
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Tech House"
 msgstr "Tech House"
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Techno"
 msgstr "Techno"
 
-#: ../src/scope/query.cpp:100
+#: ../src/scope/query.cpp:136
 msgid "Technology"
 msgstr "Technology"
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Trance"
 msgstr "Trance"
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Trap"
 msgstr "Trap"
 
-#: ../src/scope/query.cpp:120
+#: ../src/scope/query.cpp:156
 msgid "Trip Hop"
 msgstr "Trip Hop"
 
-#: ../src/scope/preview.cpp:94
+#: ../src/scope/preview.cpp:244
+msgid "Unfollow"
+msgstr ""
+
+#: ../src/scope/preview.cpp:100
+#, fuzzy
+msgid "View in browser"
+msgstr "Play in browser"
+
+#: ../src/scope/preview.cpp:206
 msgid "Watch video"
 msgstr "Watch video"
 
-#: ../src/scope/query.cpp:120
+#: ../src/scope/query.cpp:156
 msgid "World"
 msgstr "World"
+
+#: ../src/scope/query.cpp:380
+msgid "create time"
+msgstr ""
+
+#: ../src/scope/query.cpp:381
+msgid "genre"
+msgstr ""
+
+#: ../src/scope/query.cpp:382
+msgid "license"
+msgstr ""
+
+#: ../src/scope/preview.cpp:162
+msgid "open"
+msgstr ""
+
+#: ../src/scope/query.cpp:399
+msgid "track"
+msgstr ""
+
+#: ../src/scope/preview.cpp:68 ../src/scope/query.cpp:431
+msgid "user"
+msgstr ""
+
+#~ msgid "SoundCloud"
+#~ msgstr "SoundCloud"
+
+#~ msgid "SoundCloud scope for Unity8"
+#~ msgstr "SoundCloud scope for Unity8"
 
=== modified file 'po/unity-scope-soundcloud.pot'
--- po/unity-scope-soundcloud.pot	2014-11-18 15:08:53 +0000
+++ po/unity-scope-soundcloud.pot	2016-02-02 11:41:52 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: unity-scope-soundcloud\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 15:06+0000\n"
+"POT-Creation-Date: 2016-01-26 16:59+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,226 +17,302 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in.h:1
-msgid "SoundCloud"
-msgstr ""
-
-#: ../data/com.ubuntu.scopes.soundcloud_soundcloud.ini.in.h:2
-msgid "SoundCloud scope for Unity8"
-msgstr ""
-
-#: ../src/scope/query.cpp:97
+#: ../src/scope/preview.cpp:68 ../src/scope/query.cpp:431
+msgid "user"
+msgstr ""
+
+#: ../src/scope/preview.cpp:100
+msgid "View in browser"
+msgstr ""
+
+#: ../src/scope/preview.cpp:105
+msgid "Get my tracks"
+msgstr ""
+
+#: ../src/scope/preview.cpp:155
+msgid "Please login to post a comment  "
+msgstr ""
+
+#: ../src/scope/preview.cpp:162
+msgid "open"
+msgstr ""
+
+#: ../src/scope/preview.cpp:163
+msgid "Login to soundcloud"
+msgstr ""
+
+#: ../src/scope/preview.cpp:187
+msgid "Post"
+msgstr ""
+
+#: ../src/scope/preview.cpp:198
+msgid "Buy"
+msgstr ""
+
+#: ../src/scope/preview.cpp:206
+msgid "Watch video"
+msgstr ""
+
+#: ../src/scope/preview.cpp:213
+msgid "Play in browser"
+msgstr ""
+
+#: ../src/scope/preview.cpp:219
+msgid "Get user tracks"
+msgstr ""
+
+#: ../src/scope/preview.cpp:229
+msgid "Remove 'Like'"
+msgstr ""
+
+#: ../src/scope/preview.cpp:234
+msgid "Like"
+msgstr ""
+
+#: ../src/scope/preview.cpp:244
+msgid "Unfollow"
+msgstr ""
+
+#: ../src/scope/preview.cpp:249
+msgid "Follow"
+msgstr ""
+
+#: ../src/scope/query.cpp:133
 msgid "Audiobooks"
 msgstr ""
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Business"
 msgstr ""
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Comedy"
 msgstr ""
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Entertainment"
 msgstr ""
 
-#: ../src/scope/query.cpp:98
+#: ../src/scope/query.cpp:134
 msgid "Learning"
 msgstr ""
 
-#: ../src/scope/query.cpp:99
+#: ../src/scope/query.cpp:135
 msgid "News & Politics"
 msgstr ""
 
-#: ../src/scope/query.cpp:99
+#: ../src/scope/query.cpp:135
 msgid "Religion & Spirituality"
 msgstr ""
 
-#: ../src/scope/query.cpp:99
+#: ../src/scope/query.cpp:135
 msgid "Science"
 msgstr ""
 
-#: ../src/scope/query.cpp:100
+#: ../src/scope/query.cpp:136
 msgid "Sports"
 msgstr ""
 
-#: ../src/scope/query.cpp:100
+#: ../src/scope/query.cpp:136
 msgid "Storytelling"
 msgstr ""
 
-#: ../src/scope/query.cpp:100
+#: ../src/scope/query.cpp:136
 msgid "Technology"
 msgstr ""
 
-#: ../src/scope/query.cpp:111
+#: ../src/scope/query.cpp:147
 msgid "Home"
 msgstr ""
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:148
 msgid "Alternative Rock"
 msgstr ""
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:148
 msgid "Ambient"
 msgstr ""
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:148
 msgid "Classical"
 msgstr ""
 
-#: ../src/scope/query.cpp:112
+#: ../src/scope/query.cpp:148
 msgid "Country"
 msgstr ""
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Dance"
 msgstr ""
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Deep House"
 msgstr ""
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Disco"
 msgstr ""
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Drum & Bass"
 msgstr ""
 
-#: ../src/scope/query.cpp:113
+#: ../src/scope/query.cpp:149
 msgid "Dubstep"
 msgstr ""
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/query.cpp:150
 msgid "Electro"
 msgstr ""
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/query.cpp:150
 msgid "Electronic"
 msgstr ""
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/query.cpp:150
 msgid "Folk"
 msgstr ""
 
-#: ../src/scope/query.cpp:114
+#: ../src/scope/query.cpp:150
 msgid "Hardcore Techno"
 msgstr ""
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Hip Hop"
 msgstr ""
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "House"
 msgstr ""
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Indie Rock"
 msgstr ""
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Jazz"
 msgstr ""
 
-#: ../src/scope/query.cpp:115
+#: ../src/scope/query.cpp:151
 msgid "Latin"
 msgstr ""
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/query.cpp:152
 msgid "Metal"
 msgstr ""
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/query.cpp:152
 msgid "Minimal Techno"
 msgstr ""
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/query.cpp:152
 msgid "Piano"
 msgstr ""
 
-#: ../src/scope/query.cpp:116
+#: ../src/scope/query.cpp:152
 msgid "Pop"
 msgstr ""
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/query.cpp:153
 msgid "Progressive House"
 msgstr ""
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/query.cpp:153
 msgid "Punk"
 msgstr ""
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/query.cpp:153
 msgid "R&B"
 msgstr ""
 
-#: ../src/scope/query.cpp:117
+#: ../src/scope/query.cpp:153
 msgid "Rap"
 msgstr ""
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/query.cpp:154
 msgid "Reggae"
 msgstr ""
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/query.cpp:154
 msgid "Rock"
 msgstr ""
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/query.cpp:154
 msgid "Singer-Songwriter"
 msgstr ""
 
-#: ../src/scope/query.cpp:118
+#: ../src/scope/query.cpp:154
 msgid "Soul"
 msgstr ""
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Tech House"
 msgstr ""
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Techno"
 msgstr ""
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Trance"
 msgstr ""
 
-#: ../src/scope/query.cpp:119
+#: ../src/scope/query.cpp:155
 msgid "Trap"
 msgstr ""
 
-#: ../src/scope/query.cpp:120
+#: ../src/scope/query.cpp:156
 msgid "Trip Hop"
 msgstr ""
 
-#: ../src/scope/query.cpp:120
+#: ../src/scope/query.cpp:156
 msgid "World"
 msgstr ""
 
-#: ../src/scope/query.cpp:208
+#: ../src/scope/query.cpp:172
+msgid "My favorites"
+msgstr ""
+
+#: ../src/scope/query.cpp:260
 msgid "Stream"
 msgstr ""
 
-#: ../src/scope/query.cpp:220
+#: ../src/scope/query.cpp:273
 msgid "Explore"
 msgstr ""
 
-#: ../src/scope/query.cpp:306
+#: ../src/scope/query.cpp:380
+msgid "create time"
+msgstr ""
+
+#: ../src/scope/query.cpp:381
+msgid "genre"
+msgstr ""
+
+#: ../src/scope/query.cpp:382
+msgid "license"
+msgstr ""
+
+#: ../src/scope/query.cpp:399
+msgid "track"
+msgstr ""
+
+#: ../src/scope/query.cpp:415
+msgid "</b> tracks"
+msgstr ""
+
+#: ../src/scope/query.cpp:416
+msgid "</b> followers"
+msgstr ""
+
+#: ../src/scope/query.cpp:417
+msgid "</b> followings"
+msgstr ""
+
+#: ../src/scope/query.cpp:445
+msgid "No tracks can be found"
+msgstr ""
+
+#: ../src/scope/query.cpp:459
 msgid "Log-in to SoundCloud"
 msgstr ""
-
-#: ../src/scope/preview.cpp:84
-msgid "Buy"
-msgstr ""
-
-#: ../src/scope/preview.cpp:94
-msgid "Watch video"
-msgstr ""
-
-#: ../src/scope/preview.cpp:103
-msgid "Play in browser"
-msgstr ""
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-11-18 15:08:53 +0000
+++ src/CMakeLists.txt	2016-02-02 11:41:52 +0000
@@ -32,9 +32,11 @@
   api/client.cpp
   api/track.cpp
   api/user.cpp
+  api/comment.cpp
   scope/preview.cpp
   scope/query.cpp
   scope/scope.cpp
+  scope/activation.cpp
 )
 
 # Find all the headers
 
=== modified file 'src/api/client.cpp'
--- src/api/client.cpp	2014-12-04 14:09:22 +0000
+++ src/api/client.cpp	2016-02-02 11:41:52 +0000
@@ -14,13 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
 #include <api/client.h>
 #include <api/track.h>
+#include <api/comment.h>
 
 #include <boost/iostreams/filtering_stream.hpp>
 #include <boost/iostreams/filter/gzip.hpp>
+#include <boost/algorithm/string.hpp>
 #include <core/net/error.h>
 #include <core/net/http/client.h>
 #include <core/net/http/content_type.h>
@@ -70,6 +73,26 @@
     return results;
 }
 
+template<typename T>
+static T get_typed_authuser_info(const string &filter, const json::Value &root) {
+    T results((json::Value()));
+
+    string kind = root["kind"].asString();
+
+    if (kind == filter) {
+        return T(root);
+    }
+    return results;
+}
+
+template<typename T>
+static T is_successful(const json::Value &root) {
+    T results = (boost::algorithm::contains(root["status"].asString(), "201")
+                  || boost::algorithm::contains(root["status"].asString(), "200")
+                  || root["id"].asUInt() > 0);
+    return results;
+}
+
 }
 
 class Client::Priv {
@@ -101,6 +124,55 @@
             const net::Uri::QueryParameters &parameters,
             http::Request::Handler &handler) {
         std::lock_guard<std::mutex> lock(config_mutex_);
+        http::Request::Configuration configuration = net_config(path, parameters);
+        configuration.header.add("User-Agent", config_.user_agent + " (gzip)");
+        configuration.header.add("Accept-Encoding", "gzip");
+
+        auto request = client_->head(configuration);
+        request->async_execute(handler);
+    }
+
+    void post(const net::Uri::Path &path,
+            const net::Uri::QueryParameters &parameters,
+            const std::string &postmsg,
+            const std::string &content_type,
+            http::Request::Handler &handler) {
+        std::lock_guard<std::mutex> lock(config_mutex_);
+        http::Request::Configuration configuration = net_config(path, parameters);
+        configuration.header.add("User-Agent", config_.user_agent);
+        configuration.header.add("Content-Type", content_type);
+      
+        auto request = client_->post(configuration, postmsg, content_type);
+        request->async_execute(handler);
+    }
+    
+    void put(const net::Uri::Path &path,
+            const net::Uri::QueryParameters &parameters,
+            const std::string &postmsg,
+            http::Request::Handler &handler) {
+        std::lock_guard<std::mutex> lock(config_mutex_);
+        http::Request::Configuration configuration = net_config(path, parameters);
+        configuration.header.add("User-Agent", config_.user_agent);
+        std::istringstream is(postmsg);
+
+        auto request = client_->put(configuration, is, postmsg.length());
+        request->async_execute(handler);
+    }
+
+    void del(const net::Uri::Path &path,
+            const net::Uri::QueryParameters &parameters,
+            http::Request::Handler &handler) {
+        std::lock_guard<std::mutex> lock(config_mutex_);
+        http::Request::Configuration configuration = net_config(path, parameters);
+        configuration.header.add("User-Agent", config_.user_agent);
+        configuration.header.add("X-HTTP-Method-Override", "DELETE");
+
+        auto request = client_->post(configuration, "", "");
+        request->async_execute(handler);
+    }
+
+    http::Request::Configuration net_config(const net::Uri::Path &path,
+                                            const net::Uri::QueryParameters &parameters) {
         update_config();
 
         http::Request::Configuration configuration;
@@ -115,12 +187,9 @@
         net::Uri uri = net::make_uri(config_.apiroot, path,
                 complete_parameters);
         configuration.uri = client_->uri_to_string(uri);
-        configuration.header.add("User-Agent", config_.user_agent + " (gzip)");
-        configuration.header.add("Accept-Encoding", "gzip");
 
-        auto request = client_->head(configuration);
-        request->async_execute(handler);
-    }
+		return configuration;
+	}
 
     http::Request::Progress::Next progress_report(
             const http::Request::Progress&) {
@@ -164,11 +233,13 @@
                     json::Reader reader;
                     reader.parse(decompressed, root);
 
-                    if (response.status != http::Status::ok) {
-                        prom->set_exception(make_exception_ptr(domain_error(root["error"].asString())));
-                    } else {
+                    //Soundcloud api return 404 if track is not in auth user's favorite list
+                    //or auth user is not following one certain user.
+//                    if (response.status != http::Status::ok) {
+//                        prom->set_exception(make_exception_ptr(domain_error(root["error"].asString())));
+//                    } else {
                         prom->set_value(func(root));
-                    }
+//                    }
                 });
 
         get(path, parameters, handler);
@@ -176,6 +247,108 @@
         return prom->get_future();
     }
 
+    template<typename T>
+    future<T> async_post(const net::Uri::Path &path,
+            const net::Uri::QueryParameters &parameters,
+            const std::string &postmsg,
+            const std::string &content_type,
+            const function<T(const json::Value &root)> &func) {
+        auto prom = make_shared<promise<T>>();
+
+        http::Request::Handler handler;
+        handler.on_progress(
+                bind(&Client::Priv::progress_report, this, placeholders::_1));
+        handler.on_error([prom](const net::Error& e)
+        {
+            prom->set_exception(make_exception_ptr(e));
+        });
+        handler.on_response(
+                [prom,func](const http::Response& response)
+                {
+                    json::Value root;
+                    json::Reader reader;
+                    reader.parse(response.body, root);
+
+                    if (response.status != http::Status::ok && 
+						response.status != http::Status::created) {
+                        prom->set_exception(make_exception_ptr(domain_error(root["error"].asString())));
+                    } else {
+                        prom->set_value(func(root));
+                    }
+                });
+
+        post(path, parameters, postmsg, content_type, handler);
+
+        return prom->get_future();
+    }
+    
+    template<typename T>
+    future<T> async_put(const net::Uri::Path &path,
+            const net::Uri::QueryParameters &parameters,
+            const std::string &msg,
+            const function<T(const json::Value &root)> &func) {
+        auto prom = make_shared<promise<T>>();
+
+        http::Request::Handler handler;
+        handler.on_progress(
+                bind(&Client::Priv::progress_report, this, placeholders::_1));
+        handler.on_error([prom](const net::Error& e)
+        {
+            prom->set_exception(make_exception_ptr(e));
+        });
+        handler.on_response(
+                [prom,func](const http::Response& response)
+                {		  
+                    json::Value root;
+                    json::Reader reader;
+                    reader.parse(response.body, root);
+
+                    if (response.status != http::Status::created &&
+                        response.status != http::Status::ok) {
+                        prom->set_exception(make_exception_ptr(domain_error(root["error"].asString())));
+                    } else {
+                        prom->set_value(func(root));
+                    }
+                });
+
+        put(path, parameters, msg, handler);
+
+        return prom->get_future();
+    }
+
+    template<typename T>
+    future<T> async_del(const net::Uri::Path &path,
+            const net::Uri::QueryParameters &parameters,
+            const function<T(const json::Value &root)> &func) {
+        auto prom = make_shared<promise<T>>();
+
+        http::Request::Handler handler;
+        handler.on_progress(
+                bind(&Client::Priv::progress_report, this, placeholders::_1));
+        handler.on_error([prom](const net::Error& e)
+        {
+            prom->set_exception(make_exception_ptr(e));
+        });
+        handler.on_response(
+                [prom,func](const http::Response& response)
+                {
+                    json::Value root;
+                    json::Reader reader;
+                    reader.parse(response.body, root);
+
+                    if (response.status != http::Status::created &&
+                            response.status != http::Status::ok) {
+                        prom->set_exception(make_exception_ptr(domain_error(root["error"].asString())));
+                    } else {
+                        prom->set_value(func(root));
+                    }
+                });
+
+        del(path, parameters, handler);
+
+        return prom->get_future();
+    }
+
     std::string client_id() {
         std::lock_guard<std::mutex> lock(config_mutex_);
         update_config();
@@ -277,6 +450,147 @@
         });
 }
 
+future<deque<Comment>> Client::track_comments(const std::string &trackid) {
+    net::Uri::QueryParameters params;
+
+    return p->async_get<deque<Comment>>( 
+        { "tracks", trackid, "comments.json"}, params,
+        [](const json::Value &root) {
+            auto results = get_typed_list<Comment>("comment", root);
+            return results;
+        });
+}
+
+future<bool> Client::post_comment(const std::string &trackid,
+                                  const std::string &postmsg) {
+    net::Uri::QueryParameters params;
+
+    string postbody = "<comment><body>"+ postmsg + "</body></comment>";
+    std::string content_type = "application/xml";
+    return p->async_post<bool>(
+        { "tracks", trackid, "comments.json"}, params, postbody, content_type,
+        [](const json::Value &root) {
+            auto results = is_successful<bool>(root);
+            return results;
+    });
+}
+
+std::future<std::deque<Track> > Client::favorite_tracks()
+{
+    net::Uri::QueryParameters params;
+
+    return p->async_get<deque<Track>>(
+        { "me", "favorites.json"}, params,
+        [](const json::Value &root) {
+            return get_typed_list<Track>("track", root);
+    });
+}
+
+std::future<std::deque<Track> > Client::get_user_tracks(const string &userid,
+                                                        int limit)
+{
+    net::Uri::QueryParameters params;
+    if (limit > 0) {
+        params.emplace_back("limit", std::to_string(limit));
+    }
+    return p->async_get<deque<Track>>(
+        { "users", userid, "tracks.json"}, params,
+        [](const json::Value &root) {
+            return get_typed_list<Track>("track", root);
+        });
+}
+
+future<bool> Client::is_fav_track(const std::string &trackid) {
+    net::Uri::QueryParameters params;
+
+    return p->async_get<bool>(
+        { "me", "favorites", trackid}, params,
+        [](const json::Value &root) {
+            auto results = is_successful<bool>(root);
+            return results;
+        });
+}
+
+future<bool> Client::like_track(const std::string &trackid) {
+    net::Uri::QueryParameters params;
+
+    return p->async_put<bool>(
+        { "me", "favorites", trackid}, params, "",
+        [](const json::Value &root) {
+            auto results = is_successful<bool>(root);
+            return results;
+    });
+}
+
+future<bool> Client::delete_like_track(const std::string &trackid) {
+    net::Uri::QueryParameters params;
+
+    return p->async_del<bool>(
+        { "me", "favorites", trackid}, params,
+        [](const json::Value &root) {
+            auto results = is_successful<bool>(root);
+            return results;
+    });
+}
+
+std::future<bool> Client::is_user_follower(const string &userid) {
+    net::Uri::QueryParameters params;
+
+    return p->async_get<bool>(
+        { "me", "followings", userid}, params,
+        [](const json::Value &root) {
+            auto results = is_successful<bool>(root);
+            return results;
+    });
+}
+
+future<bool> Client::follow_user(const std::string &userid) {
+    net::Uri::QueryParameters params;
+
+    return p->async_put<bool>(
+        { "me", "followings", userid}, params, "",
+        [](const json::Value &root) {
+            auto results = is_successful<bool>(root);
+            return results;
+    });
+}
+
+std::future<bool> Client::unfollow_user(const string &userid)
+{
+    net::Uri::QueryParameters params;
+
+    return p->async_del<bool>(
+        { "me", "followings", userid}, params,
+        [](const json::Value &root) {
+            auto results = is_successful<bool>(root);
+            return results;
+    });
+}
+
+std::future<User> Client::get_authuser_info()
+{
+    net::Uri::QueryParameters params;
+
+    return p->async_get<User>(
+        { "me" }, params,
+        [](const json::Value &root) {
+            auto results = get_typed_authuser_info<User>("user", root);
+            return results;
+    });
+}
+
+std::future<User> Client::get_user_info(const string &userid)
+{
+    net::Uri::QueryParameters params;
+
+    return p->async_get<User>(
+        { "users", userid}, params,
+        [](const json::Value &root) {
+            auto results = get_typed_authuser_info<User>("user", root);
+            return results;
+    });
+}
+
 void Client::cancel() {
     p->cancelled_ = true;
 }
 
=== added file 'src/api/comment.cpp'
--- src/api/comment.cpp	1970-01-01 00:00:00 +0000
+++ src/api/comment.cpp	2016-02-02 11:41:52 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
+ */
+
+#include <boost/algorithm/string.hpp>
+#include <api/comment.h>
+
+#include <json/json.h>
+
+namespace json = Json;
+using namespace api;
+using namespace std;
+
+Comment::Comment(const json::Value &data) :
+        user_(data["user"]) {
+    body_ = data["body"].asString();
+    created_at_ = data["created_at"].asString();
+    
+    std::vector<std::string> created_time;
+    boost::split(created_time, created_at_, boost::is_any_of(" "));
+    created_at_ = created_time[0];
+
+    id_ = data["id"].asUInt();
+}
+
+const unsigned int & Comment::id() const {
+    return id_; 
+}
+
+const string & Comment::body() const {
+    return body_;
+}
+
+const string & Comment::title() const {
+    return user_.title();
+}
+
+const string & Comment::artwork() const {
+    return user_.artwork();
+}
+
+const string & Comment::created_at() const {
+    return created_at_;
+}
+
+const User & Comment::user() const {
+    return user_;
+}
+
+Resource::Kind Comment::kind() const {
+    return Resource::Kind::comment;
+}
+
+std::string Comment::kind_str() const {
+    return "comment";
+}
 
=== modified file 'src/api/track.cpp'
--- src/api/track.cpp	2014-11-06 11:40:45 +0000
+++ src/api/track.cpp	2016-02-02 11:41:52 +0000
@@ -14,8 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
+#include <boost/algorithm/string.hpp>
 #include <api/track.h>
 
 #include <json/json.h>
@@ -33,13 +35,26 @@
     duration_ = data["duration"].asUInt();
     license_ = data["license"].asString();
     created_at_ = data["created_at"].asString();
+    
+    std::vector<std::string> created_time;
+    boost::split(created_time, created_at_, boost::is_any_of(" "));
+    created_at_ = created_time[0];
 
     playback_count_ = data["playback_count"].asUInt();
     favoritings_count_ = data["favoritings_count"].asUInt();
+    comment_count_ = data["comment_count"].asUInt();
+    repost_count_ = data["reposts_count"].asUInt();
+    likes_count_ = data["likes_count"].asUInt();
 
     artwork_ = data["artwork_url"].asString();
     waveform_ = data["waveform_url"].asString();
-
+    //when loading login user stream, server gives waveform 
+    //sample json file instread of image
+    if (boost::algorithm::ends_with(waveform_, "json")) {
+        boost::replace_all(waveform_, "json", "png");
+	boost::replace_all(waveform_, "is.", "1.");
+    }    
+    
     streamable_ = data["streamable"].asBool();
     downloadable_ = data["downloadable"].asBool();
 
@@ -48,6 +63,9 @@
     stream_url_ = data["stream_url"].asString();
     download_url_ = data["download_url"].asString();
     video_url_ = data["video_url"].asString();
+
+    genre_ = data["genre"].asString();
+    original_format_ = data["original_format"].asString();
 }
 
 const string & Track::title() const {
@@ -126,6 +144,26 @@
     return favoritings_count_;
 }
 
+unsigned int Track::comment_count() const {
+    return comment_count_;
+}
+
+unsigned int Track::repost_count() const {
+    return repost_count_;
+}
+
+unsigned int Track::likes_count() const {
+    return likes_count_;
+}
+
+const string & Track::genre() const {
+    return genre_;
+}
+
+const string & Track::original_format() const {
+    return original_format_;
+}
+
 const User & Track::user() const {
     return user_;
 }
 
=== modified file 'src/api/user.cpp'
--- src/api/user.cpp	2014-11-05 16:17:51 +0000
+++ src/api/user.cpp	2016-02-02 11:41:52 +0000
@@ -28,6 +28,11 @@
     title_ = data["username"].asString();
     id_ = data["id"].asUInt();
     artwork_ = data["avatar_url"].asString();
+    permalink_ = data["permalink_url"].asString();
+    track_count_ = data["track_count"].asUInt();
+    followers_count_ = data["followers_count"].asUInt();
+    followings_count_ = data["followings_count"].asUInt();
+    bio_ = data["description"].asString();
 }
 
 const string & User::title() const {
@@ -38,6 +43,31 @@
     return id_;
 }
 
+const string &User::permalink_url() const
+{
+    return permalink_;
+}
+
+const unsigned int &User::track_count() const
+{
+    return track_count_;
+}
+
+const unsigned int &User::followers_count() const
+{
+    return followers_count_;
+}
+
+const unsigned int &User::followings_count() const
+{
+    return followings_count_;
+}
+
+const string &User::bio() const
+{
+    return bio_;
+}
+
 const string & User::artwork() const {
     return artwork_;
 }
 
=== added file 'src/scope/activation.cpp'
--- src/scope/activation.cpp	1970-01-01 00:00:00 +0000
+++ src/scope/activation.cpp	2016-02-02 11:41:52 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
+ */
+
+#include <scope/activation.h>
+#include <unity/scopes/ActivationResponse.h>
+#include <unity/scopes/ActionMetadata.h>
+
+#include <iostream>
+
+namespace sc = unity::scopes;
+
+using namespace std;
+using namespace scope;
+using namespace api;
+
+template<typename T>
+static T get_or_throw(future<T> &f) {
+    if (f.wait_for(std::chrono::seconds(10)) != future_status::ready) {
+        throw domain_error("HTTP request timeout");
+    }
+    return f.get();
+}
+
+Activation::Activation(const sc::Result &result,
+               const sc::ActionMetadata &metadata,
+               std::string const& action_id,
+               std::shared_ptr<sc::OnlineAccountClient> oa_client) : 
+    sc::ActivationQueryBase(result, metadata), 
+    action_id_(action_id),
+    client_(oa_client) {
+}
+
+sc::ActivationResponse Activation::activate() {
+    try {
+        string trackid = result()["id"].get_string();
+        string userid = result()["userid"].get_string();
+
+        if (action_id_ == "commented") {
+            string comments = action_metadata().scope_data().get_dict()["comment"].get_string();
+            future<bool> post_future = client_.post_comment(trackid, comments);
+            auto status = get_or_throw(post_future);
+            cout<< "auth user post a comment: " << status << endl;
+
+            return sc::ActivationResponse(sc::ActivationResponse::Status::ShowPreview);
+        } else if (action_id_ == "like") {
+            future<bool> like_future = client_.like_track(trackid);
+            auto status = get_or_throw(like_future);
+            cout<< "auth user likes track: " << status << endl;
+
+            return sc::ActivationResponse(sc::ActivationResponse::Status::ShowPreview);
+        } else if (action_id_ == "deletelike") {
+            future<bool> ret_future = client_.delete_like_track(trackid);
+            auto status = get_or_throw(ret_future);
+            cout<< "auth user delete a like track: " << status << endl;
+
+            return sc::ActivationResponse(sc::ActivationResponse::Status::ShowPreview);
+        } else if (action_id_ == "follow") {
+            future<bool> follow_future = client_.follow_user(userid);
+            auto status = get_or_throw(follow_future);
+            cout<< "auth user follow user: " << status << endl;
+
+            return sc::ActivationResponse(sc::ActivationResponse::Status::ShowPreview);
+        } else if (action_id_ == "unfollow") {
+            future<bool> unfollow_future = client_.unfollow_user(userid);
+            auto status = get_or_throw(unfollow_future);
+            cout<< "auth user unfollow user: " << status << endl;
+
+            return sc::ActivationResponse(sc::ActivationResponse::Status::ShowPreview);
+        }
+    }catch (domain_error &e) {
+        cerr << e.what() << endl;
+        return sc::ActivationResponse(sc::ActivationResponse::Status::ShowPreview);
+    }
+    return sc::ActivationResponse(sc::ActivationResponse::Status::NotHandled);
+}
 
=== modified file 'src/scope/preview.cpp'
--- src/scope/preview.cpp	2014-11-10 11:54:32 +0000
+++ src/scope/preview.cpp	2016-02-02 11:41:52 +0000
@@ -14,10 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
+#include <boost/algorithm/string.hpp>
+
 #include <scope/localization.h>
 #include <scope/preview.h>
+#include <api/client.h>
+#include <api/comment.h>
 
 #include <unity/scopes/ColumnLayout.h>
 #include <unity/scopes/PreviewWidget.h>
@@ -31,83 +36,250 @@
 
 using namespace std;
 using namespace scope;
-
-Preview::Preview(const sc::Result &result, const sc::ActionMetadata &metadata) :
-    sc::PreviewQueryBase(result, metadata) {
+using namespace api;
+
+template<typename T>
+static T get_or_throw(future<T> &f) {
+    if (f.wait_for(std::chrono::seconds(10)) != future_status::ready) {
+        throw domain_error("HTTP request timeout");
+    }
+    return f.get();
+}
+
+Preview::Preview(const sc::Result &result, const sc::ActionMetadata &metadata,
+                std::shared_ptr<sc::OnlineAccountClient> oa_client) :
+    sc::PreviewQueryBase(result, metadata),
+    client_(oa_client) {
 }
 
 void Preview::cancelled() {
 }
 
 void Preview::run(sc::PreviewReplyProxy const& reply) {
-    auto const res = result();
-
-    // Support three different column layouts
-    sc::ColumnLayout layout1col(1), layout2col(2), layout3col(3);
-
-    // Single column layout
-    layout1col.add_column( { "header", "art", "statistics", "tracks", "actions", "description" });
-
-    // Register the layouts we just created
-    reply->register_layout( { layout1col }); //, layout2col, layout3col
-
-    sc::PreviewWidget header("header", "header");
-    header.add_attribute_mapping("title", "title");
-    header.add_attribute_mapping("subtitle", "username");
-
-    sc::PreviewWidget art("art", "image");
-    art.add_attribute_mapping("source", "art");
-
-    sc::PreviewWidget statistics("statistics", "header");
-    statistics.add_attribute_value("title", sc::Variant(res["playback-count"].get_string() + "   " + res["favoritings-count"].get_string()));
-
-    sc::PreviewWidget tracks("tracks", "audio");
-    {
-        if (res["streamable"].get_bool()) {
-            sc::VariantBuilder builder;
-            builder.add_tuple({
-                    {"title", sc::Variant(res.title())},
-                    {"source", sc::Variant(res["stream-url"])},
-                    {"length", res["duration"]}
-                });
-            tracks.add_attribute_value("tracks", builder.end());
-        }
-    }
-
-    sc::PreviewWidget actions("actions", "actions");
-    {
-        string purchase_url = res["purchase-url"].get_string();
-        if (!purchase_url.empty()) {
-            sc::VariantBuilder builder;
-            builder.add_tuple({
-                    {"id", sc::Variant("buy")},
-                    {"label", sc::Variant(_("Buy"))},
-                    {"uri", sc::Variant(purchase_url)}
-                });
-            actions.add_attribute_value("actions", builder.end());
-        }
-        string video_url = res["video-url"].get_string();
-        if (!video_url.empty()) {
-            sc::VariantBuilder builder;
-            builder.add_tuple({
-                    {"id", sc::Variant("video")},
-                    {"label", sc::Variant(_("Watch video"))},
-                    {"uri", sc::Variant(video_url)}
-                });
-            actions.add_attribute_value("actions", builder.end());
-        }
-        {
-            sc::VariantBuilder builder;
-            builder.add_tuple({
-                    {"id", sc::Variant("play")},
-                    {"label", sc::Variant(_("Play in browser"))}
-                });
-            actions.add_attribute_value("actions", builder.end());
-        }
-    }
-
-    sc::PreviewWidget description("description", "text");
-    description.add_attribute_mapping("text", "description");
-
-    reply->push( { header, art, statistics, tracks, actions, description });
+    try {
+        auto const res = result();
+
+        sc::PreviewWidgetList widgets;
+        std::vector<std::string> ids;
+        // Support three different column layouts
+        sc::ColumnLayout layout1col(1), layout2col(2), layout3col(3);
+
+        string mode = res["mode"].get_string();
+        if (mode == _("user")) {
+            ids = std::vector<std::string>{ "header", "art", "statistics", "description", "actions"};
+            sc::PreviewWidget header("header", "header");
+            header.add_attribute_mapping("title", "title");
+            widgets.emplace_back(header);
+
+            string artwork_url= res["art"].get_string();
+            boost::replace_all(artwork_url, "large", "t500x500");
+            sc::PreviewWidget art("art", "image");
+            art.add_attribute_value("source", sc::Variant(artwork_url));
+            widgets.emplace_back(art);
+
+            sc::PreviewWidget statistics("statistics", "header");
+            statistics.add_attribute_value("title", sc::Variant(
+                    res["track-count"].get_string() + "  " +
+                    res["followers-count"].get_string() + "  " +
+                    res["followings-count"].get_string()));
+            widgets.emplace_back(statistics);
+
+            sc::PreviewWidget description("description", "text");
+            description.add_attribute_value("text", sc::Variant(
+                    res["permalink-url"].get_string() + "<br>" +
+                    res["bio"].get_string()));
+            widgets.emplace_back(description);
+
+            std::string userid  = res["id"].get_string();
+            sc::VariantBuilder builder;
+            sc::PreviewWidget actions("actions", "actions");
+            {
+                string permalink_url = res["permalink-url"].get_string();
+                builder.add_tuple({
+                      {"id", sc::Variant("view")},
+                      {"label", sc::Variant(_("View in browser"))},
+                      {"uri", sc::Variant(permalink_url)}
+                  });
+                sc::CannedQuery new_query(SCOPE_NAME);
+                new_query.set_department_id("userid:" + userid);
+                builder.add_tuple({
+                      {"id", sc::Variant("usertracks")},
+                      {"label", sc::Variant(_("Get user tracks"))},
+                      {"uri", sc::Variant(new_query.to_uri())}
+                  });
+            }
+            actions.add_attribute_value("actions", builder.end());
+            widgets.emplace_back(actions);
+        } else {
+            ids = std::vector<std::string> { "header", "art", "statistics", "trackinfo", "tracks", "description", "actions"};
+
+            sc::PreviewWidget header("header", "header");
+            header.add_attribute_mapping("title", "title");
+            header.add_attribute_mapping("subtitle", "username");
+            widgets.emplace_back(header);
+
+            //load big track thubmail
+            string artwork_url= res["art"].get_string();
+            boost::replace_all(artwork_url, "large", "t500x500");
+            sc::PreviewWidget art("art", "image");
+            art.add_attribute_value("source", sc::Variant(artwork_url));
+            widgets.emplace_back(art);
+
+            sc::PreviewWidget statistics("statistics", "header");
+            statistics.add_attribute_value("title", sc::Variant(
+                    res["playback-count"].get_string() + "  " +
+                    res["likes-count"].get_string() + "  " +
+                    res["repost-count"].get_string() + "  " +
+                    res["favoritings-count"].get_string() + "  " +
+                    res["comment-count"].get_string()));
+            widgets.emplace_back(statistics);
+
+            std::string trackid = res["id"].get_string();
+            std::string userid  = res["userid"].get_string();
+
+            sc::PreviewWidget tracks("tracks", "audio");
+            {
+                if (res["streamable"].get_bool()) {
+                    sc::VariantBuilder builder;
+                    builder.add_tuple({
+                          {"title", sc::Variant(res.title())},
+                          {"source", sc::Variant(res["stream-url"])},
+                          {"length", res["duration"]}
+                      });
+                    tracks.add_attribute_value("tracks", builder.end());
+                    widgets.emplace_back(tracks);
+                }
+            }
+
+            if (!client_.authenticated()) {
+                ids.emplace_back("tips-headerid");
+                sc::PreviewWidget w_tips(ids.at(ids.size() - 1), "text");
+                w_tips.add_attribute_value("text", sc::Variant(_("Please login to post a comment  ")));
+                widgets.emplace_back(w_tips);
+
+                ids.emplace_back("login-actionId");
+                sc::PreviewWidget w_action(ids.at(ids.size() - 1), "actions");
+                sc::VariantBuilder builder;
+                builder.add_tuple({
+                      {"id", sc::Variant(_("open"))},
+                      {"label", sc::Variant(_("Login to soundcloud"))},
+                  });
+
+                sc::OnlineAccountClient oa_client(SCOPE_NAME, "sharing", SCOPE_ACCOUNTS_NAME);
+
+                oa_client.register_account_login_item(w_action,
+                                                      sc::OnlineAccountClient::InvalidateResults,
+                                                      sc::OnlineAccountClient::DoNothing);
+
+                w_action.add_attribute_value("actions", builder.end());
+                widgets.emplace_back(w_action);
+            }
+
+            sc::PreviewWidget trackinfo("trackinfo", "table");
+            trackinfo.add_attribute_mapping("values", "trackinfo");
+            widgets.emplace_back(trackinfo);
+
+            sc::PreviewWidget description("description", "text");
+            description.add_attribute_mapping("text", "description");
+            widgets.emplace_back(description);
+
+            if (client_.authenticated()) {
+                ids.emplace_back("comment-inputid");
+                sc::PreviewWidget w_commentInput(ids.at(ids.size() - 1), "comment-input");
+                w_commentInput.add_attribute_value("submit-label", sc::Variant(_("Post")));
+                widgets.emplace_back(w_commentInput);
+            }
+
+            sc::VariantBuilder builder;
+            sc::PreviewWidget actions("actions", "actions");
+            {
+                string purchase_url = res["purchase-url"].get_string();
+                if (!purchase_url.empty()) {
+                    builder.add_tuple({
+                          {"id", sc::Variant("buy")},
+                          {"label", sc::Variant(_("Buy"))},
+                          {"uri", sc::Variant(purchase_url)}
+                      });
+                }
+                string video_url = res["video-url"].get_string();
+                if (!video_url.empty()) {
+                    builder.add_tuple({
+                          {"id", sc::Variant("video")},
+                          {"label", sc::Variant(_("Watch video"))},
+                          {"uri", sc::Variant(video_url)}
+                      });
+                }
+                {
+                    builder.add_tuple({
+                          {"id", sc::Variant("play")},
+                          {"label", sc::Variant(_("Play in browser"))}
+                      });
+                }
+                if (client_.authenticated()) {
+                    sc::CannedQuery new_query(SCOPE_NAME);
+                    new_query.set_department_id("userid:" + userid);
+                    builder.add_tuple({
+                          {"id", sc::Variant("usertracks")},
+                          {"label", sc::Variant(_("Get user tracks"))},
+                          {"uri", sc::Variant(new_query.to_uri())}
+                      });
+
+                    future<bool> like_future = client_.is_fav_track(trackid);
+                    auto status = get_or_throw(like_future);
+                    cout << "is fav stats: " << status << endl;
+                    if (status == true) {
+                        builder.add_tuple({
+                              {"id", sc::Variant("deletelike")},
+                              {"label", sc::Variant(_("Remove 'Like'"))}
+                          });
+                    } else {
+                        builder.add_tuple({
+                              {"id", sc::Variant("like")},
+                              {"label", sc::Variant(_("Like"))}
+                          });
+                    }
+
+                    future<bool> follow_future = client_.is_user_follower(userid);
+                    status = get_or_throw(follow_future);
+                    cout << "is users follower: " << status << endl;
+                    if (status == true) {
+                        builder.add_tuple({
+                              {"id", sc::Variant("unfollow")},
+                              {"label", sc::Variant(_("Unfollow"))}
+                          });
+                    } else {
+                        builder.add_tuple({
+                              {"id", sc::Variant("follow")},
+                              {"label", sc::Variant(_("Follow"))}
+                          });
+                    }
+                }
+            }
+            actions.add_attribute_value("actions", builder.end());
+            widgets.emplace_back(actions);
+
+            future<deque<Comment>> comment_future;
+            comment_future = client_.track_comments(trackid);
+
+            int index = 0;
+            for (const auto &comment : get_or_throw(comment_future)) {
+                std::string id = "commentId_"+ std::to_string(index++);
+                ids.emplace_back(id);
+
+                sc::PreviewWidget w_comment(id, "comment");
+                w_comment.add_attribute_value("comment", sc::Variant(comment.body()));
+                w_comment.add_attribute_value("author", sc::Variant(comment.title()));
+                w_comment.add_attribute_value("source", sc::Variant(comment.artwork()));
+                w_comment.add_attribute_value("subtitle", sc::Variant(comment.created_at()));
+                widgets.emplace_back(w_comment);
+            }
+        }
+
+        layout1col.add_column(ids);
+        reply->register_layout( { layout1col }); //, layout2col, layout3col
+        reply->push(widgets);
+    }catch (domain_error &e) {
+        cerr << e.what() << endl;
+        reply->error(current_exception());
+    }
 }
 
=== modified file 'src/scope/query.cpp'
--- src/scope/query.cpp	2014-12-04 13:39:07 +0000
+++ src/scope/query.cpp	2016-02-02 11:41:52 +0000
@@ -14,8 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
 
 #include <scope/localization.h>
@@ -74,19 +76,53 @@
 {
   "schema-version": 1,
   "template": {
-    "category-layout": "grid",
-    "card-size": "large",
-    "card-background": "color:///#ff4200"
+    "category-layout": "vertical-journal",
+    "card-size": "large",
+    "card-background": "color:///#ff5500"
+  },
+  "components": {
+    "title": "title"
+  }
+}
+)";
+
+const static string SHOW_EMPTY_TRACK_TIPS = R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "large",
+    "card-layout": "horizontal"
+  },
+  "components": {
+    "title": "title"
+  }
+}
+)";
+
+const static string USER_INFO_TEMPLATE = R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-background": "color:///#FFFFFF",
+    "card-size": "medium",
+    "card-layout": "horizontal"
   },
   "components": {
     "title": "title",
-    "background": "background",
     "art" : {
-      "aspect-ratio": 100.0
+       "field": "art"
+     },
+     "subtitle": "subtitle",
+     "attributes": {
+       "field": "attributes",
+       "max-count": 3
     }
   }
 }
 )";
+
 // unconfuse emacs: "
 
 static const vector<string> AUDIO_DEPARTMENT_IDS { "Audiobooks", "Business",
@@ -127,9 +163,15 @@
     return f.get();
 }
 
-static sc::Department::SPtr create_departments(const sc::CannedQuery &query) {
+static sc::Department::SPtr create_departments(const sc::CannedQuery &query,
+                                               bool contains_fav) {
     sc::Department::SPtr root_department = sc::Department::create("", query,
             MUSIC_DEPARTMENT_NAMES.front());
+    if (contains_fav) {
+        sc::Department::SPtr dept = sc::Department::create(
+                "my_fav", query, _("My favorites"));
+        root_department->add_subdepartment(dept);
+    }
     for (size_t i = 1; i < MUSIC_DEPARTMENT_IDS.size(); ++i) {
         sc::Department::SPtr dept = sc::Department::create(
                 MUSIC_DEPARTMENT_IDS[i], query, MUSIC_DEPARTMENT_NAMES[i]);
@@ -195,21 +237,40 @@
     try {
         const sc::CannedQuery &query(sc::SearchQueryBase::query());
         string query_string = alg::trim_copy(query.query_string());
-
-        reply->register_departments(create_departments(query));
+        string department_id = query.department_id();
+
+        bool authenticated = client_.authenticated();
+        sc::Department::SPtr root_depts = create_departments(query, authenticated);
+
+        bool is_dummy_depts = alg::starts_with(department_id, "userid:");
+        if (is_dummy_depts) {
+            sc::Department::SPtr dummy = sc::Department::create(
+                            department_id, query, " ");
+            root_depts->add_subdepartment(dummy);
+        }
+
+        reply->register_departments(root_depts);
 
         // Avoid blocking on HTTP requests at this point
 
         sc::Category::SCPtr first_cat;
+        sc::Category::SCPtr user_cat;
         future<deque<Track>> stream_future;
+        future<User> user_future;
         bool reading_stream = false;
-        if (query_string.empty() && query.department_id().empty()) {
-            if (client_.authenticated()) {
+        bool reading_user_info = false;
+        if (query_string.empty() && department_id.empty()) {
+            if (authenticated) {
+                user_cat = reply->register_category("user", "", "",
+                        sc::CategoryRenderer(USER_INFO_TEMPLATE));
+                user_future = client_.get_authuser_info();
+
                 first_cat = reply->register_category(
                     "stream", _("Stream"), "",
                     sc::CategoryRenderer(SEARCH_CATEGORY_TEMPLATE));
                 stream_future = client_.stream_tracks(30);
                 reading_stream = true;
+                reading_user_info = true;
             } else {
                 add_login_nag(reply);
             }
@@ -220,22 +281,42 @@
         if (query_string.empty()) {
             second_cat = reply->register_category("explore", _("Explore"), "",
                     sc::CategoryRenderer(SEARCH_CATEGORY_TEMPLATE));
-            tracks_future = client_.search_tracks({
-                { SP::query, query_string },
-                { SP::limit, "15" },
-                { SP::genre, department_to_category(query.department_id()) },
-                { SP::order, "hotness" }
-            });
+            if (department_id == "my_fav") {
+                tracks_future = client_.favorite_tracks();
+            } else if (is_dummy_depts) {
+                //create dummy department to pass the validation check
+                user_cat = reply->register_category("user", "", "",
+                        sc::CategoryRenderer(USER_INFO_TEMPLATE));
+
+                string userId = department_id.substr(department_id.find(':') + 1);
+                user_future = client_.get_user_info(userId);
+                tracks_future = client_.get_user_tracks(userId, 15);
+                reading_user_info = true;
+            } else {
+                tracks_future = client_.search_tracks({
+                    { SP::query, query_string },
+                    { SP::limit, "15" },
+                    { SP::genre, department_to_category(department_id) },
+                    { SP::order, "hotness" }
+                });
+            }
         } else {
             second_cat = reply->register_category("search", "", "",
                     sc::CategoryRenderer(SEARCH_CATEGORY_TEMPLATE));
+
             tracks_future = client_.search_tracks( {
-                { SP::query, query_string },
-                { SP::limit, "30" }
+                 { SP::query, query_string },
+                 { SP::limit, "30" }
             });
         }
 
         // Now we come to wait for the results
+        if (reading_user_info) {
+            User user = get_or_throw(user_future);
+            if (!push_user_info(reply, user_cat, user)) {
+                return;
+            }
+        }
 
         if (reading_stream) {
             for (const auto &track : get_or_throw(stream_future)) {
@@ -245,12 +326,19 @@
             }
         }
 
-        for (const auto &track : get_or_throw(tracks_future)) {
+        deque<Track> tracklist = get_or_throw(tracks_future);
+        for (const auto &track : tracklist) {
             if (!push_track(reply, second_cat, track)) {
                 return;
             }
         }
 
+        if (tracklist.size() == 0) {
+            if (!show_empty_tip(reply)) {
+                return;
+            }
+        }
+
     } catch (domain_error &e) {
         cerr << e.what() << endl;
         reply->error(current_exception());
@@ -269,7 +357,8 @@
     } else {
         res.set_art(track.user().artwork());
     }
-
+     
+    res["id"] = std::to_string(track.id()); 
     res["label"] = track.label_name();
     res["streamable"] = track.streamable();
     res["stream-url"] = track.stream_url() + "?client_id=" + client_.client_id();
@@ -277,20 +366,89 @@
     res["video-url"] = track.video_url();
     res["waveform"] = track.waveform();
     res["username"] = track.user().title();
+    res["userid"] = std::to_string(track.user().id());
     res["description"] = track.description();
 
     string duration = format_time(track.duration());
     string playback_count = u8"\u25B6 " + format_fixed(track.playback_count());
-    string favoritings_count = u8"\u2665 " + format_fixed(track.favoritings_count());
+    string favoritings_count = u8"\u263B " + format_fixed(track.favoritings_count());
+    string likes_count = u8"\u2665 " + format_fixed(track.likes_count());
+    string repost_count = u8"\u2B94 " + format_fixed(track.repost_count());
+    string comment_count = u8"\u270E " + format_fixed(track.comment_count());
     res["duration"] = (int) (track.duration() / 1000);
     res["playback-count"] = playback_count;
     res["favoritings-count"] = favoritings_count;
+    res["likes-count"] = likes_count;
+    res["repost-count"] = repost_count;
+    res["comment-count"] = comment_count;
+
+    sc::VariantArray trackinfo {
+        sc::Variant(sc::VariantArray{sc::Variant(_("create time")), sc::Variant(track.created_at())}),
+        sc::Variant(sc::VariantArray{sc::Variant(_("genre")), sc::Variant(track.genre())}),
+        sc::Variant(sc::VariantArray{sc::Variant(_("license")), sc::Variant(track.license())})
+    };
+    res["trackinfo"] = sc::Variant(trackinfo);
 
     sc::VariantBuilder builder;
     builder.add_tuple({{"value", sc::Variant(duration)}});
     builder.add_tuple({{"value", sc::Variant(playback_count)}});
-    builder.add_tuple({{"value", sc::Variant(favoritings_count)}});
-    res["attributes"] = builder.end();
+
+    //favorite api doesn't contains likes_count field when retrieving auth user favorites list
+    //activity api doesn't contains favoritings_count field when retrieving stream list
+    if (track.likes_count() > 0)
+        builder.add_tuple({{"value", sc::Variant(likes_count)}});
+    else
+        builder.add_tuple({{"value", sc::Variant(favoritings_count)}});
+
+    res["attributes"] = builder.end();
+
+    res["mode"] = _("track");
+
+    return reply->push(res);
+}
+
+bool Query::push_user_info(const sc::SearchReplyProxy &reply,
+                       const sc::Category::SCPtr &category,
+                       const User &user) {
+
+    sc::CategorisedResult res(category);
+
+    res.set_uri(user.permalink_url());
+    res.set_title(user.title());
+    res.set_art(user.artwork());
+    res["subtitle"] = user.permalink_url() + " "+ user.bio();
+
+    string track_count = "<b> "+ format_fixed(user.track_count()) + _("</b> tracks");
+    string followers_count = "<b> "+ format_fixed(user.followers_count()) + _("</b> followers");
+    string followings_count = "<b> "+ format_fixed(user.followings_count()) + _("</b> followings");
+    res["track-count"] = track_count;
+    res["followers-count"] = followers_count;
+    res["followings-count"] = followings_count;
+    res["permalink-url"] = user.permalink_url();
+    res["bio"] = user.bio();
+    res["id"] = std::to_string(user.id());
+
+    sc::VariantBuilder builder;
+    builder.add_tuple({{"value", sc::Variant(track_count)}});
+    builder.add_tuple({{"value", sc::Variant(followers_count)}});
+    builder.add_tuple({{"value", sc::Variant(followings_count)}});
+
+    res["attributes"] = builder.end();
+    res["mode"] = _("user");
+
+    return reply->push(res);
+}
+
+bool Query::show_empty_tip(const unity::scopes::SearchReplyProxy &reply)
+{
+    //Stay on surface and avoid user to enter card view if no tracks are found
+    const sc::CannedQuery &query(sc::SearchQueryBase::query());
+    sc::CategoryRenderer rdr(SHOW_EMPTY_TRACK_TIPS);
+    auto cat = reply->register_category("show_empty_tips", "", "", rdr);
+
+    sc::CategorisedResult res(cat);
+    res.set_uri(query.to_uri());
+    res.set_title(_("No tracks can be found"));
 
     return reply->push(res);
 }
 
=== modified file 'src/scope/scope.cpp'
--- src/scope/scope.cpp	2014-12-04 13:39:07 +0000
+++ src/scope/scope.cpp	2016-02-02 11:41:52 +0000
@@ -14,12 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Pete Woods <[e-mail]>
+ *         Gary Wang  <[e-mail]>
  */
 
 #include <scope/localization.h>
 #include <scope/preview.h>
 #include <scope/query.h>
 #include <scope/scope.h>
+#include <scope/activation.h>
 
 namespace sc = unity::scopes;
 using namespace std;
@@ -48,7 +50,14 @@
 
 sc::PreviewQueryBase::UPtr Scope::preview(sc::Result const& result,
                                           sc::ActionMetadata const& metadata) {
-    return sc::PreviewQueryBase::UPtr(new Preview(result, metadata));
+    return sc::PreviewQueryBase::UPtr(new Preview(result, metadata, oa_client_));
+}
+
+sc::ActivationQueryBase::UPtr Scope::perform_action(const sc::Result &result,
+                                                 const sc::ActionMetadata &metadata,
+                                                 const std::string &widget_id,
+                                                 const std::string &action_id) {
+    return sc::ActivationQueryBase::UPtr(new Activation(result, metadata, action_id, oa_client_));
 }
 
 #define EXPORT __attribute__ ((visibility ("default")))