about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-12-29 19:52:04 +0100
committerGitHub <noreply@github.com>2017-12-29 19:52:04 +0100
commit38fc1b498d971f7b33532c583b12e5dd3469af3c (patch)
tree622690ead8b672b115718b8d027cfef1acac9902 /app/models
parent511c6f96251a4492f7c5bea1f13018d61cfb9ce0 (diff)
Add more instance stats APIs (#6125)
* Add GET /api/v1/instance/peers API to reveal known domains

* Add GET /api/v1/instance/activity API

* Make new APIs disableable, exclude private statuses from activity stats

* Fix code style issue

* Fix week timestamps
Diffstat (limited to 'app/models')
-rw-r--r--app/models/form/admin_settings.rb4
-rw-r--r--app/models/status.rb6
-rw-r--r--app/models/user.rb15
3 files changed, 25 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index c1d2cf420..dd629279c 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -30,6 +30,10 @@ class Form::AdminSettings
     :bootstrap_timeline_accounts=,
     :min_invite_role,
     :min_invite_role=,
+    :activity_api_enabled,
+    :activity_api_enabled=,
+    :peers_api_enabled,
+    :peers_api_enabled=,
     to: Setting
   )
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index 8579ff9e4..00dcec624 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -135,6 +135,7 @@ class Status < ApplicationRecord
   end
 
   after_create_commit :store_uri, if: :local?
+  after_create_commit :update_statistics, if: :local?
 
   around_create Mastodon::Snowflake::Callbacks
 
@@ -308,4 +309,9 @@ class Status < ApplicationRecord
   def set_local
     self.local = account.local?
   end
+
+  def update_statistics
+    return unless public_visibility? || unlisted_visibility?
+    ActivityTracker.increment('activity:statuses:local')
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 578622fdf..3ce6517a6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -122,9 +122,19 @@ class User < ApplicationRecord
     update!(disabled: false)
   end
 
+  def confirm
+    return if confirmed?
+
+    super
+    update_statistics!
+  end
+
   def confirm!
+    return if confirmed?
+
     skip_confirmation!
     save!
+    update_statistics!
   end
 
   def promote!
@@ -202,4 +212,9 @@ class User < ApplicationRecord
   def sanitize_languages
     filtered_languages.reject!(&:blank?)
   end
+
+  def update_statistics!
+    BootstrapTimelineWorker.perform_async(account_id)
+    ActivityTracker.increment('activity:accounts:local')
+  end
 end