diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-22 19:13:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-22 19:13:02 +0200 |
| commit | 2ebbfebfe9c7c967e3bcc9da0eec4628f9188233 (patch) | |
| tree | ed3fa3f23d520e99fdd8b19597992b59a47aaa7d /app/models | |
| parent | f30c5e7f15f967019245d2c78f3c2e89800eb838 (diff) | |
| parent | 9ef32ea570fd0db63bd75714cd847abad6833345 (diff) | |
Merge pull request #2192 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account_filter.rb | 2 | ||||
| -rw-r--r-- | app/models/preview_card_provider.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb index 1666ea883..55d34e85c 100644 --- a/app/models/account_filter.rb +++ b/app/models/account_filter.rb @@ -55,7 +55,7 @@ class AccountFilter when 'by_domain' Account.where(domain: value.to_s.strip) when 'username' - Account.matches_username(value.to_s.strip) + Account.matches_username(value.to_s.strip.delete_prefix('@')) when 'display_name' Account.matches_display_name(value.to_s.strip) when 'email' diff --git a/app/models/preview_card_provider.rb b/app/models/preview_card_provider.rb index 1dd95fc91..9f5f6d3cb 100644 --- a/app/models/preview_card_provider.rb +++ b/app/models/preview_card_provider.rb @@ -18,6 +18,7 @@ # class PreviewCardProvider < ApplicationRecord + include Paginable include DomainNormalizable include Attachmentable |