diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d6c74e2e4..b364b5bd6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -50,7 +50,6 @@ class UsersController < ApplicationController @user.save if @user.errors.empty? session[:user_id] = @user.id - flash[:alias_mixpanel] = true else flash[:notice] = "Sign up failed: #{@user.errors.full_messages.join("; ")}" end @@ -95,7 +94,7 @@ class UsersController < ApplicationController disable_categorized_saved_searches disable_tagged_filenames enable_recent_searches disable_cropped_thumbnails disable_mobile_gestures enable_safe_mode disable_responsive_mode disable_post_tooltips - enable_recommended_posts opt_out_mixpanel + enable_recommended_posts opt_out_tracking ] permitted_params += [dmail_filter_attributes: %i[id words]] diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 51ec8c039..710894dd9 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -43,4 +43,3 @@ export { default as Shortcuts } from '../src/javascripts/shortcuts.js'; export { default as Upload } from '../src/javascripts/uploads.js'; export { default as Utility } from '../src/javascripts/utility.js'; export { default as Ugoira } from '../src/javascripts/ugoira.js'; -export { mixpanelInit, mixpanelEvent, mixpanelAlias } from '../src/javascripts/mixpanel.js'; diff --git a/app/javascript/src/javascripts/mixpanel.js b/app/javascript/src/javascripts/mixpanel.js deleted file mode 100644 index 0e726094e..000000000 --- a/app/javascript/src/javascripts/mixpanel.js +++ /dev/null @@ -1,31 +0,0 @@ -const mixpanelInit = (user_id, opt_out, user_data) => { - if (typeof window.mixpanel !== "object") { - return; - } - - window.mixpanel.identify(user_id); - - if (opt_out) { - window.mixpanel.opt_out_tracking(); - } else { - window.mixpanel.people.set(user_data); - } -} - -const mixpanelEvent = (title, props) => { - if (typeof window.mixpanel !== "object") { - return; - } - - window.mixpanel.track(title, props); -} - -const mixpanelAlias = (user_id) => { - if (typeof window.mixpanel !== "object") { - return; - } - - window.mixpanel.alias(user_id); -} - -export { mixpanelInit, mixpanelEvent, mixpanelAlias }; diff --git a/app/models/user.rb b/app/models/user.rb index dbeb8e09c..71e40959c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -60,7 +60,7 @@ class User < ApplicationRecord disable_responsive_mode disable_post_tooltips enable_recommended_posts - opt_out_mixpanel + opt_out_tracking no_flagging no_feedback ) diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 69b24a8a5..168457d12 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -87,11 +87,11 @@ $(window).trigger("danbooru:error", msg); } window._paq = window._paq || []; - <% if CurrentUser.is_member? && !CurrentUser.opt_out_mixpanel? %> + <% if CurrentUser.is_member? && !CurrentUser.opt_out_tracking? %> window._paq.push(["setUserId", '<%= CurrentUser.id %>']); <% end %> window._paq.push(["setDomains", "*.donmai.us"]); - <% if !CurrentUser.opt_out_mixpanel? %> + <% if !CurrentUser.opt_out_tracking? %> window._paq.push(["setCustomVariable", 1, "level", <%= CurrentUser.level %>, "visit"]); window._paq.push(["setCustomVariable", 2, "age", <%= ((Time.now - CurrentUser.created_at) / 1.year).to_i %>, "visit"]); window._paq.push(["setCustomVariable", 3, "postUpdateCount", <%= CurrentUser.post_update_count.to_i / 100 %>, "visit"]); diff --git a/app/views/user_feedbacks/show.html.erb b/app/views/user_feedbacks/show.html.erb index 54d0c5be4..34efbfb57 100644 --- a/app/views/user_feedbacks/show.html.erb +++ b/app/views/user_feedbacks/show.html.erb @@ -20,13 +20,3 @@ <% content_for(:page_title) do %> Feedback - <%= @user_feedback.user_name %> - <%= Danbooru.config.app_name %> <% end %> - -<% if flash[:alias_mixpanel] %> - <% content_for(:html_header) do %> - - <% end %> -<% end %> \ No newline at end of file diff --git a/app/views/users/_upgrade_notice.html.erb b/app/views/users/_upgrade_notice.html.erb index 199202dd6..4d485e414 100644 --- a/app/views/users/_upgrade_notice.html.erb +++ b/app/views/users/_upgrade_notice.html.erb @@ -2,14 +2,3 @@

<%= link_to "Upgrade your account for only $20!", new_user_upgrade_path, id: "goto-upgrade-account" %>

<%= link_to "No thanks", "#", :id => "hide-upgrade-account-notice" %>

- -<% content_for(:html_header) do %> - -<% end %> \ No newline at end of file diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 17576ac90..c9fad56cc 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -97,7 +97,7 @@ <%= f.input :disable_responsive_mode, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Disable alternative layout for mobile and tablet" %> - <%= f.input :opt_out_mixpanel, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Opt out of tracking" %> + <%= f.input :opt_out_tracking, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Opt out of tracking" %> <%= f.input :custom_style, :label => "Custom CSS style".html_safe, :hint => "Style to apply to the whole site.", :input_html => {:size => "40x5"} %>