From 4862aee9a111c843138472c8b47cd5edb133b1ff Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Fri, 8 Apr 2022 20:02:53 -0700
Subject: [PATCH] Add hidden user title (Full Name) column to users table

---
 data/interfaces/default/js/tables/users.js | 26 ++++++++++++++++------
 data/interfaces/default/users.html         |  1 +
 plexpy/users.py                            |  2 ++
 plexpy/webserve.py                         |  4 ++++
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index 67230361..1b0793c8 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -102,7 +102,7 @@ users_list_table_options = {
         },
         {
             "targets": [4],
-            "data": "email",
+            "data": "title",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
                     $(td).html(cellData);
@@ -114,6 +114,18 @@ users_list_table_options = {
         },
         {
             "targets": [5],
+            "data": "email",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== null && cellData !== '') {
+                    $(td).html(cellData);
+                }
+            },
+            "visible": false,
+            "width": "10%",
+            "className": "no-wrap"
+        },
+        {
+            "targets": [6],
             "data": "last_seen",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
@@ -127,7 +139,7 @@ users_list_table_options = {
             "className": "no-wrap"
         },
         {
-            "targets": [6],
+            "targets": [7],
             "data": "ip_address",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData) {
@@ -145,7 +157,7 @@ users_list_table_options = {
             "className": "no-wrap modal-control-ip"
         },
         {
-            "targets": [7],
+            "targets": [8],
             "data": "platform",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
@@ -158,7 +170,7 @@ users_list_table_options = {
             "className": "no-wrap modal-control"
         },
         {
-            "targets": [8],
+            "targets": [9],
             "data":"player",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
@@ -179,7 +191,7 @@ users_list_table_options = {
             "className": "no-wrap modal-control"
         },
         {
-            "targets": [9],
+            "targets": [10],
             "data":"last_played",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
@@ -220,7 +232,7 @@ users_list_table_options = {
             "className": "datatable-wrap"
         },
         {
-            "targets": [10],
+            "targets": [11],
             "data": "plays",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
@@ -232,7 +244,7 @@ users_list_table_options = {
             "className": "no-wrap"
         },
         {
-            "targets": [11],
+            "targets": [12],
             "data": "duration",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== null && cellData !== '') {
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index 37a0faa0..d7dd84e8 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -34,6 +34,7 @@
                 <th align="right" id="avatar"></th>
                 <th align="left" id="friendly_name">User</th>
                 <th align="left" id="username">Username</th>
+                <th align="left" id="title">Full Name</th>
                 <th align="left" id="email">Email</th>
                 <th align="left" id="last_seen">Last Streamed</th>
                 <th align="left" id="last_known_ip">Last Known IP</th>
diff --git a/plexpy/users.py b/plexpy/users.py
index 81276e08..f434ae6f 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -131,6 +131,7 @@ class Users(object):
                    'users.username',
                    '(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = "" \
                     THEN users.username ELSE users.friendly_name END) AS friendly_name',
+                   'users.title',
                    'users.email',
                    'users.thumb AS user_thumb',
                    'users.custom_avatar_url AS custom_thumb',
@@ -207,6 +208,7 @@ class Users(object):
                    'user_id': item['user_id'],
                    'username': item['username'],
                    'friendly_name': item['friendly_name'],
+                   'title': item['title'],
                    'email': item['email'],
                    'user_thumb': user_thumb,
                    'plays': item['plays'],
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index a7358ec7..6c8a1ad6 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1268,6 +1268,9 @@ class WebInterface(object):
                           "do_notify": "Checked",
                           "duration": 2998290,
                           "friendly_name": "Jon Snow",
+                          "username": "LordCommanderSnow",
+                          "title": "Jon Snow",
+                          "email": "Jon.Snow.1337@CastleBlack.com",
                           "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
                           "history_row_id": 1121,
                           "ip_address": "xxx.xxx.xxx.xxx",
@@ -1306,6 +1309,7 @@ class WebInterface(object):
             dt_columns = [("user_thumb", False, False),
                           ("friendly_name", True, True),
                           ("username", True, True),
+                          ("title", True, True),
                           ("email", True, True),
                           ("last_seen", True, False),
                           ("ip_address", True, True),