diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-06 00:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 00:33:55 +0100 |
| commit | a25839340e93b1e93b7b99b0f65fa7da7d62bad2 (patch) | |
| tree | a329d65c115e752c3be5c262ebf96f69cd13861a /app/models | |
| parent | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (diff) | |
| parent | 4bb6b1a1e788abac7d1745e0f4eb72ad4d4ec110 (diff) | |
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account_note.rb | 1 | ||||
| -rw-r--r-- | app/models/status.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/models/account_note.rb b/app/models/account_note.rb index bf61df923..b338bc92f 100644 --- a/app/models/account_note.rb +++ b/app/models/account_note.rb @@ -17,4 +17,5 @@ class AccountNote < ApplicationRecord belongs_to :target_account, class_name: 'Account' validates :account_id, uniqueness: { scope: :target_account_id } + validates :comment, length: { maximum: 2_000 } end diff --git a/app/models/status.rb b/app/models/status.rb index 7b11709fa..3a1323849 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -391,7 +391,7 @@ class Status < ApplicationRecord def from_text(text) return [] if text.blank? - text.scan(FetchLinkCardService::URL_PATTERN).map(&:first).uniq.filter_map do |url| + text.scan(FetchLinkCardService::URL_PATTERN).map(&:second).uniq.filter_map do |url| status = begin if TagManager.instance.local_url?(url) ActivityPub::TagManager.instance.uri_to_resource(url, Status) diff --git a/app/models/user.rb b/app/models/user.rb index a1a278004..ec39ea50d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -64,7 +64,7 @@ class User < ApplicationRecord devise :two_factor_backupable, otp_number_of_backup_codes: 10 - devise :registerable, :recoverable, :rememberable, :validatable, + devise :registerable, :recoverable, :validatable, :confirmable include Omniauthable |