Use article html elements for diary posts

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index d357dc4f5017d3bc35f298c99bb0a1b1247568a3..c809b619294732038c97558423b349fe2050212c 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -210,6 +210,7 @@ class User < ApplicationRecord
     # Mark the account as deleted and remove personal data
     event :soft_destroy do
       before do
     # Mark the account as deleted and remove personal data
     event :soft_destroy do
       before do

+        revoke_authentication_tokens

         remove_personal_data
       end
 
         remove_personal_data
       end
 


@@ -299,6 +300,13 @@ class User < ApplicationRecord
     blocks.active.detect(&:needs_view?)
   end
 
     blocks.active.detect(&:needs_view?)
   end
 

+  ##
+  # revoke any authentication tokens
+  def revoke_authentication_tokens
+    oauth_tokens.authorized.each(&:invalidate!)
+    access_tokens.not_expired.each(&:revoke)
+  end
+

   ##
   # remove personal data - leave the account but purge most personal data
   def remove_personal_data
   ##
   # remove personal data - leave the account but purge most personal data
   def remove_personal_data


@@ -370,7 +378,7 @@ class User < ApplicationRecord
     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)

-    max_messages = account_age_in_hours.ceil + recent_messages - active_reports * 10
+    max_messages = account_age_in_hours.ceil + recent_messages - (active_reports * 10)

     max_messages.clamp(0, Settings.max_messages_per_hour)
   end
 
     max_messages.clamp(0, Settings.max_messages_per_hour)
   end
 


@@ -379,7 +387,7 @@ class User < ApplicationRecord
     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)

-    max_friends = account_age_in_hours.ceil + recent_friends - active_reports * 10
+    max_friends = account_age_in_hours.ceil + recent_friends - (active_reports * 10)

     max_friends.clamp(0, Settings.max_friends_per_hour)
   end
 
     max_friends.clamp(0, Settings.max_friends_per_hour)
   end