diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-04 21:47:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 21:47:39 +0200 |
| commit | f1867a73881444dfed9e093425435681ee764922 (patch) | |
| tree | 2f72365b39cbab75346587360540d1688c0f0bd7 /app | |
| parent | 1c1042556d21e4c2eb22b7c5cbc11aa88087ca60 (diff) | |
Adjust privacy policy (#6666)
* Adjust privacy policy to be more specific to Mastodon Fix #6613 * Change data retention of IP addresses from 5 years to 1 year * Add even more information * Remove all (now invalid) translations of the privacy policy * Add information about archive takeout, remove pointless consent section * Emphasis on DM privacy * Improve wording * Add line about data use for moderation purposes
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/styles/mastodon/about.scss | 5 | ||||
| -rw-r--r-- | app/workers/scheduler/ip_cleanup_scheduler.rb | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index 03211036c..034c35e8a 100644 --- a/app/javascript/styles/mastodon/about.scss +++ b/app/javascript/styles/mastodon/about.scss @@ -322,6 +322,11 @@ $small-breakpoint: 960px; border: 0; border-bottom: 1px solid rgba($ui-base-lighter-color, .6); margin: 20px 0; + + &.spacer { + height: 1px; + border: 0; + } } .container-alt { diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb index 9f1593c91..a33ca031e 100644 --- a/app/workers/scheduler/ip_cleanup_scheduler.rb +++ b/app/workers/scheduler/ip_cleanup_scheduler.rb @@ -4,8 +4,10 @@ require 'sidekiq-scheduler' class Scheduler::IpCleanupScheduler include Sidekiq::Worker + RETENTION_PERIOD = 1.year + def perform - time_ago = 5.years.ago + time_ago = RETENTION_PERIOD.ago SessionActivation.where('updated_at < ?', time_ago).destroy_all User.where('last_sign_in_at < ?', time_ago).update_all(last_sign_in_ip: nil) end |