From c148c991cdeb37e5c4ce952adbf894cf08cc9b3f Mon Sep 17 00:00:00 2001
From: Lewis Crichton <lewistehminerz@outlook.com>
Date: Wed, 15 Jul 2020 13:54:58 +0100
Subject: [PATCH] Relocate and rename option, make option restore after page
 refresh.

---
 templates/useroptions.pug | 5 +----
 www/js/util.js            | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/templates/useroptions.pug b/templates/useroptions.pug
index 47bbc06d..0191146d 100644
--- a/templates/useroptions.pug
+++ b/templates/useroptions.pug
@@ -100,10 +100,6 @@ mixin us-chat
       +rcheckbox("us-sort-rank", "Sort userlist by rank")
       +rcheckbox("us-sort-afk", "Sort AFKers to bottom")
       .col-sm-4
-      .col-sm-8
-        p.text-info The following option only applies if you have permission to see IP addresses in the first place.
-      +rcheckbox("us-no-ip-on-hover", "Disable revealing user IP addresses in profile tooltip")
-      .col-sm-4
       .col-sm-8
         p.text-info The following 3 options apply to how and when you will be notified if a new chat message is received while CyTube is not the active window.
       .form-group
@@ -143,3 +139,4 @@ mixin us-mod
     form.form-horizontal(action="javascript:void(0)")
       +rcheckbox("us-modflair", "Show name color")
       +rcheckbox("us-shadowchat", "Show shadowmuted messages")
+      +rcheckbox("us-show-ip-in-tooltip", "Show IP addresses in profile tooltip")
\ No newline at end of file
diff --git a/www/js/util.js b/www/js/util.js
index 2fe23e91..38a60561 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -144,7 +144,7 @@ function formatUserlistItem(div) {
         $("<strong/>").text(data.name).appendTo(profile);
 
         var meta = div.data("meta") || {};
-        if (meta.ip && !USEROPTS.disable_ip_tooltip) {
+        if (meta.ip && USEROPTS.show_ip_in_tooltip) {
             $("<br/>").appendTo(profile);
             $("<em/>").text(meta.ip).appendTo(profile);
         }
@@ -655,6 +655,7 @@ function showUserOptions() {
 
     $("#us-modflair").prop("checked", USEROPTS.modhat);
     $("#us-shadowchat").prop("checked", USEROPTS.show_shadowchat);
+    $("#us-show-ip-in-tooltip").prop("checked", USEROPTS.show_ip_in_tooltip);
 
     formatScriptAccessPrefs();
 
@@ -668,7 +669,7 @@ function saveUserOptions() {
     USEROPTS.layout               = $("#us-layout").val();
     USEROPTS.ignore_channelcss    = $("#us-no-channelcss").prop("checked");
     USEROPTS.ignore_channeljs     = $("#us-no-channeljs").prop("checked");
-    USEROPTS.disable_ip_tooltip   = $("#us-no-ip-on-hover").prop("checked");
+    USEROPTS.show_ip_in_tooltip   = $("#us-show-ip-in-tooltip").prop("checked");
 
     USEROPTS.synch                = $("#us-synch").prop("checked");
     USEROPTS.sync_accuracy        = parseFloat($("#us-synch-accuracy").val()) || 2;