Merge commit 'dee69e4f83
' into kb_migration
This commit is contained in:
commit
f010acbde2
18 changed files with 286 additions and 59 deletions
|
@ -532,8 +532,8 @@ class Status < ApplicationRecord
|
|||
elsif visibility == 'limited'
|
||||
self.searchability = Status.searchabilities['limited']
|
||||
else
|
||||
s = [Status.searchabilities[searchability], Status.visibilities[visibility]].max
|
||||
s = [s, 3].max
|
||||
s = [Status.searchabilities[searchability], Status.visibilities[visibility] - 1].max
|
||||
s = [s, 3].min
|
||||
self.searchability = s
|
||||
end
|
||||
end
|
||||
|
|
|
@ -65,6 +65,8 @@ class User < ApplicationRecord
|
|||
# to check their feed
|
||||
ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days.freeze
|
||||
|
||||
REACTION_DECK_MAX = 256
|
||||
|
||||
devise :two_factor_authenticatable,
|
||||
otp_secret_encryption_key: Rails.configuration.x.otp_secret
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue