diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-08 01:47:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 01:47:36 +0100 |
| commit | 29a09858f6700c0a6eb17797836589ed0839dec9 (patch) | |
| tree | 96ac7fbac23d6ca32704c143342b5606523c8cab /app/lib | |
| parent | 38e9c66f34d7054357a3de63834f182734d43d75 (diff) | |
| parent | ca45198ccbbdde88731f074fcab2b5c9310775c2 (diff) | |
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 87179030c..7e4e57ead 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -241,6 +241,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def poll_vote? return false if replied_to_status.nil? || replied_to_status.poll.nil? || !replied_to_status.local? || !replied_to_status.poll.options.include?(@object['name']) + return true if replied_to_status.poll.expired? replied_to_status.poll.votes.create!(account: @account, choice: replied_to_status.poll.options.index(@object['name']), uri: @object['id']) end |