diff options
author | ThibG <thib@sitedethib.com> | 2018-07-17 21:54:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 21:54:12 +0200 |
commit | 012ca4c68d785dcf13e4cabd16b09a844e622f6b (patch) | |
tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /app/lib | |
parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
parent | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (diff) |
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/language_detector.rb | 15 | ||||
-rw-r--r-- | app/lib/potential_friendship_tracker.rb | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb index c6f52f0c7..688d21fd8 100644 --- a/app/lib/language_detector.rb +++ b/app/lib/language_detector.rb @@ -3,12 +3,16 @@ class LanguageDetector include Singleton + CHARACTER_THRESHOLD = 140 + def initialize @identifier = CLD3::NNetLanguageIdentifier.new(1, 2048) end def detect(text, account) - detect_language_code(text) || default_locale(account) + input_text = prepare_text(text) + return if input_text.blank? + detect_language_code(input_text) || default_locale(account) end def language_names @@ -23,8 +27,13 @@ class LanguageDetector simplify_text(text).strip end + def unreliable_input?(text) + text.size < CHARACTER_THRESHOLD + end + def detect_language_code(text) - result = @identifier.find_language(prepare_text(text)) + return if unreliable_input?(text) + result = @identifier.find_language(text) iso6391(result.language.to_s).to_sym if result.reliable? end @@ -66,6 +75,6 @@ class LanguageDetector end def default_locale(account) - account.user_locale&.to_sym + account.user_locale&.to_sym || I18n.default_locale end end diff --git a/app/lib/potential_friendship_tracker.rb b/app/lib/potential_friendship_tracker.rb index 362482669..017a9748d 100644 --- a/app/lib/potential_friendship_tracker.rb +++ b/app/lib/potential_friendship_tracker.rb @@ -12,6 +12,8 @@ class PotentialFriendshipTracker class << self def record(account_id, target_account_id, action) + return if account_id == target_account_id + key = "interactions:#{account_id}" weight = WEIGHTS[action] |