about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-23 22:10:51 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-26 16:01:59 +0100
commitfcce135d271276aa38576ed36a113ec3f6161e0a (patch)
treef8faef20945cd7f114d8b718c46901fb10fd3c0f /app/services
parent9f56511860493b770c2e535be0f8ce4777c8d373 (diff)
parent9ec98893f4974bb022a722c3163a7e578b1d5ce9 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/vote_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/vote_service.rb b/app/services/vote_service.rb
index 0cace6c00..81af9ef3a 100644
--- a/app/services/vote_service.rb
+++ b/app/services/vote_service.rb
@@ -11,14 +11,14 @@ class VoteService < BaseService
     @choices = choices
     @votes   = []
 
-    return if @poll.expired?
-
     ApplicationRecord.transaction do
       @choices.each do |choice|
         @votes << @poll.votes.create!(account: @account, choice: choice)
       end
     end
 
+    ActivityTracker.increment('activity:interactions')
+
     if @poll.account.local?
       distribute_poll!
     else