From 0010cbe21f3f4d437755e93c7a6662fe15cd112c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 12 Feb 2018 11:35:34 -0800
Subject: [PATCH] Update masked info for guest access

---
 .../default/current_activity_instance.html    | 65 +++++++++----------
 data/interfaces/default/home_stats.html       | 44 ++++++++-----
 plexpy/datafactory.py                         |  1 -
 plexpy/session.py                             |  3 -
 4 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index 2099b38e..1c6c32ab 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -67,8 +67,15 @@ DOCUMENTATION :: END
     from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES
     import plexpy
 %>
-<% data = defaultdict(lambda: 'Unknown', **session) %>
-<% sk = data['session_key'] %>
+<%
+    data = defaultdict(lambda: 'Unknown', **session)
+    sk = data['session_key']
+
+    href = 'info?rating_key={}'.format(data['rating_key']) if data['rating_key'] else '#'
+    parent_href = 'info?rating_key={}'.format(data['parent_rating_key']) if data['parent_rating_key'] else '#'
+    grandparent_href = 'info?rating_key={}'.format(data['grandparent_rating_key']) if data['grandparent_rating_key'] else '#'
+    user_href = 'user?user_id={}'.format(data['user_id']) if data['user_id'] else '#'
+%>
 <div class="dashboard-activity-instance" id="activity-instance-${sk}" data-key="${sk}" data-id="${data['session_id']}"
      data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
     <div class="dashboard-activity-container">
@@ -89,15 +96,15 @@ DOCUMENTATION :: END
                 % endif
                 % if data['channel_stream'] == 0:
                     % if data['media_type'] == 'movie':
-                    <a id="poster-url-${sk}" href="info?rating_key=${data['rating_key']}" title="${data['title']}">
+                    <a id="poster-url-${sk}" href="${href}" title="${data['title']}">
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
                     </a>
                     % elif data['media_type'] == 'episode':
-                    <a id="poster-url-${sk}" href="info?rating_key=${data['grandparent_rating_key']}" title="${data['grandparent_title']}">
+                    <a id="poster-url-${sk}" href="${grandparent_href}" title="${data['grandparent_title']}">
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['grandparent_thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
                     </a>
                     % elif data['media_type'] == 'track':
-                    <a id="poster-url-${sk}" href="info?rating_key=${data['parent_rating_key']}" title="${data['parent_title']}">
+                    <a id="poster-url-${sk}" href="${parent_href}" title="${data['parent_title']}">
                         <div id="poster-${sk}" class="dashboard-activity-cover" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=300&fallback=cover&refresh=true);"></div>
                     </a>
                     % elif data['media_type'] in ('photo', 'clip'):
@@ -352,13 +359,9 @@ DOCUMENTATION :: END
         </div>
     </div>
     <div class="dashboard-activity-metadata-wrapper">
-        % if data['user_id']:
-        <a href="user?user_id=${data['user_id']}" title="${data['friendly_name']}">
+        <a href="${user_href}" title="${data['friendly_name']}">
             <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${data['user_thumb']});"></div>
         </a>
-        % else:
-        <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${data['user_thumb']});"></div>
-        % endif
         <div class="dashboard-activity-metadata-title-container">
             <div id="play-state-${sk}" class="dashboard-activity-metadata-play_state-icon" title="${data['state'].capitalize()}">
                 % if data['state'] == 'playing':
@@ -371,21 +374,21 @@ DOCUMENTATION :: END
             </div>
             <div class="dashboard-activity-metadata-title">
                 % if data['channel_stream'] == 0:
-                % if data['media_type'] == 'movie':
-                <a href="info?rating_key=${data['rating_key']}" title="${data['title']}">${data['title']}</a>
-                % elif data['media_type'] == 'episode':
-                <a href="info?rating_key=${data['grandparent_rating_key']}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
-                - <a href="info?rating_key=${data['rating_key']}" title="${data['title']}">${data['title']}</a>
-                % elif data['media_type'] == 'track':
-                <a id="metadata-grandparent_title-${sk}" href="info?rating_key=${data['grandparent_rating_key']}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
-                - <a id="metadata-title-${sk}" href="info?rating_key=${data['rating_key']}" title="${data['title']}">${data['title']}</a>
-                % elif data['media_type'] == 'photo':
-                <span title="${data['parent_title']}">${data['parent_title']}</span>
-                % elif data['media_type'] == 'clip':
-                <span title="${data['title']}">${data['title']}</span>
-                % else:
-                <span title="${data['title']}">${data['title']}</span>
-                % endif
+                    % if data['media_type'] == 'movie':
+                    <a href="${href}" title="${data['title']}">${data['title']}</a>
+                    % elif data['media_type'] == 'episode':
+                    <a href="${grandparent_href}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
+                    - <a href="${href}" title="${data['title']}">${data['title']}</a>
+                    % elif data['media_type'] == 'track':
+                    <a id="metadata-grandparent_title-${sk}" href="${grandparent_href}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
+                    - <a id="metadata-title-${sk}" href="${href}" title="${data['title']}">${data['title']}</a>
+                    % elif data['media_type'] == 'photo':
+                    <span title="${data['parent_title']}">${data['parent_title']}</span>
+                    % elif data['media_type'] == 'clip':
+                    <span title="${data['title']}">${data['title']}</span>
+                    % else:
+                    <span title="${data['title']}">${data['title']}</span>
+                    % endif
                 % elif data['media_type'] == 'episode' and data['grandparent_title']:
                 <span title="${data['grandparent_title']}">${data['grandparent_title']}</span>
                 - <span title="${data['title']}">${data['title']}</span>
@@ -425,10 +428,10 @@ DOCUMENTATION :: END
                     % if data['media_type'] == 'movie':
                     <span title="${data['year']}" class="sub-heading">${data['year']}</span>
                     % elif data['media_type'] == 'episode':
-                    <a href="info?rating_key=${data['parent_rating_key']}" title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</a>
-                    &middot; <a href="info?rating_key=${data['rating_key']}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a>
+                    <a href="${parent_href}" title="Season ${data['parent_media_index']}" class="sub-heading">S${data['parent_media_index']}</a>
+                    &middot; <a href="${href}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a>
                     % elif data['media_type'] == 'track':
-                    <a id="metadata-parent_title-${sk}" href="info?rating_key=${data['parent_rating_key']}" title="${data['parent_title']}" class="sub-heading">${data['parent_title']}</a>
+                    <a id="metadata-parent_title-${sk}" href="${parent_href}" title="${data['parent_title']}" class="sub-heading">${data['parent_title']}</a>
                     % elif data['media_type'] == 'photo':
                     <span title="${data['title']}" class="sub-heading">${data['title']}</span>
                     % else:
@@ -453,11 +456,7 @@ DOCUMENTATION :: END
                 % endif
             </div>
             <div class="dashboard-activity-metadata-user">
-                % if data['user_id']:
-                <a href="user?user_id=${data['user_id']}" title="${data['friendly_name']}">${data['friendly_name']}</a>
-                % else:
-                ${data['friendly_name']}
-                % endif
+                <a href="${user_href}" title="${data['friendly_name']}">${data['friendly_name']}</a>
             </div>
         </div>
     </div>
diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html
index 66ec6681..1cc8a463 100644
--- a/data/interfaces/default/home_stats.html
+++ b/data/interfaces/default/home_stats.html
@@ -88,8 +88,9 @@ DOCUMENTATION :: END
                 % if stat_id in ('top_music', 'popular_music'):
                 <div id="stats-thumb-${stat_id}-bg" class="dashboard-stats-poster-blur" style="background-image: url(pms_image_proxy?img=${row0['thumb']}&width=300&height=300&fallback=cover);"></div>
                 % endif
-                <a id="stats-thumb-url-${stat_id}" href="info?rating_key=${row0['rating_key']}" title="${row0['title']}">
-                    <% type = 'cover' if stat_id in ('top_music', 'popular_music') else 'poster' %>
+                <% type = 'cover' if stat_id in ('top_music', 'popular_music') else 'poster' %>
+                <% href = 'info?rating_key={}'.format(row0['rating_key']) if row0['rating_key'] else '#' %>
+                <a id="stats-thumb-url-${stat_id}" href="${href}" title="${row0['title']}">
                     % if row0['thumb']:
                     <div id="stats-thumb-${stat_id}" class="dashboard-stats-${type}" style="background-image: url(pms_image_proxy?img=${row0['thumb']}&width=300&height=300&fallback=${type});"></div>
                     % else:
@@ -98,7 +99,8 @@ DOCUMENTATION :: END
                 </a>
             </div>
             % elif stat_id == 'top_users':
-            <a id="stats-thumb-url-${stat_id}" href="user?user_id=${row0['user_id']}" title="${row0['friendly_name']}" class="hidden-xs">
+            <% user_href = 'user?user_id={}'.format(row0['user_id']) if row0['user_id'] else '#' %>
+            <a id="stats-thumb-url-${stat_id}" href="${user_href}" title="${row0['friendly_name']}" class="hidden-xs">
                 <div id="stats-thumb-${stat_id}" class="dashboard-stats-circle" style="background-image: url(${row0['user_thumb'] or 'images/gravatar-default.png'})"></div>
             </a>
             % elif stat_id == 'top_platforms':
@@ -127,26 +129,20 @@ DOCUMENTATION :: END
                             % for row in top_stat['rows']:
                             <li class="dashboard-stats-info-item ${'expanded' if loop.index == 0 else ''}" data-stat_id="${stat_id}" data-rating_key="${row.get('rating_key')}" data-title="${row.get('title')}"
                                 data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_name')}"
-                                data-user_id="${row.get('user_id')}" data-friendly_name="${row.get('friendly_name')}"
+                                data-user_id="${row.get('user_id')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
                                 data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}">
                                 <div class="sub-list">${loop.index + 1}</div>
                                 <div class="sub-value">
                                     % if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'):
-                                    % if top_stat['rows'][loop.index]['rating_key']:
-                                    <a href="info?rating_key=${row['rating_key']}" title="${row['title']}">
+                                    <% href = 'info?rating_key={}'.format(row['rating_key']) if row['rating_key'] else '#' %>
+                                    <a href="${href}" title="${row['title']}">
                                         ${row['title']}
                                     </a>
-                                    % else:
-                                    ${row['title']}
-                                    % endif
                                     % elif stat_id == 'top_users':
-                                    % if top_stat['rows'][loop.index]['user_id']:
-                                    <a href="user?user_id=${row['user_id']}" title="${row['friendly_name']}">
+                                    <% user_href = 'user?user_id={}'.format(row['user_id']) if row['user_id'] else '#' %>
+                                    <a href="${user_href}" title="${row['friendly_name']}">
                                         ${row['friendly_name']}
                                     </a>
-                                    % else:
-                                    ${row['friendly_name']}
-                                    % endif
                                     % elif stat_id == 'top_platforms':
                                     ${row['platform']}
                                     % elif stat_id == 'most_concurrent':
@@ -182,13 +178,22 @@ DOCUMENTATION :: END
         var stat_id = $(elem).data('stat_id');
         var art = $(elem).data('art');
         var thumb = $(elem).data('thumb');
+        var user_id = $(elem).data('user_id');
+        var user_thumb = $(elem).data('user_thumb');
+        var rating_key = $(elem).data('rating_key');
         var [height, fallback] = ($.inArray(stat_id, ['top_music', 'popular_music']) > -1) ? [300, 'cover'] : [450, 'poster'];
+        var href;
 
         if (stat_id == 'most_concurrent') {
             return
         } else if (stat_id == 'top_users') {
-            $('#stats-thumb-' + stat_id).css('background-image', 'url(' + (thumb || 'images/gravatar-default.png') + ')');
-            $('#stats-thumb-url-' + stat_id).attr('href', 'user?user_id=' + $(elem).data('user_id')).prop('title', $(elem).data('friendly_name'));
+            $('#stats-thumb-' + stat_id).css('background-image', 'url(' + (user_thumb || 'images/gravatar-default.png') + ')');
+            if (user_id) {
+                href = 'user?user_id=' + user_id;
+            } else {
+                href = '#';
+            }
+            $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('friendly_name'));
         } else if (stat_id == 'top_platforms') {
             $('#stats-thumb-' + stat_id).removeClass(function (index, className) {
                 return (className.match (/(^|\s)platform-\S+/g) || []).join(' ');
@@ -197,7 +202,12 @@ DOCUMENTATION :: END
                 return (className.match (/(^|\s)platform-\S+/g) || []).join(' ');
             }).addClass('platform-' + $(elem).data('platform'));
         } else {
-            $('#stats-thumb-url-' + stat_id).attr('href', 'info?rating_key=' + $(elem).data('rating_key')).prop('title', $(elem).data('title'));
+            if (rating_key) {
+                href = 'info?rating_key=' + rating_key;
+            } else {
+                href = '#';
+            }
+            $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('title'));
             if (art) {
                 $('#stats-background-' + stat_id).css('background-image', 'url(pms_image_proxy?img=' + art + '&width=500&height=280&fallback=art)');
             } else {
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 1a9a7289..d50d740a 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -612,7 +612,6 @@ class DataFactory(object):
                            'total_plays': item['total_plays'],
                            'total_duration': item['total_duration'],
                            'last_play': item['last_watch'],
-                           'thumb': user_thumb,
                            'user_thumb': user_thumb,
                            'grandparent_thumb': '',
                            'art': '',
diff --git a/plexpy/session.py b/plexpy/session.py
index 360125b6..f885ef48 100644
--- a/plexpy/session.py
+++ b/plexpy/session.py
@@ -191,10 +191,7 @@ def mask_session_info(list_of_dicts, mask_metadata=True):
                     'user_thumb': common.DEFAULT_USER_THUMB,
                     'ip_address': 'N/A',
                     'machine_id': '',
-                    'platform': 'Platform',
                     'player': 'Player',
-                    'quality_profile': 'Unknown',
-                    'bandwidth': '',
                     'location': ''
                     }