diff options
| -rw-r--r-- | app/lib/atom_serializer.rb | 2 | ||||
| -rw-r--r-- | app/models/mention.rb | 7 | ||||
| -rw-r--r-- | app/models/status.rb | 4 | ||||
| -rw-r--r-- | app/services/post_status_service.rb | 2 | ||||
| -rw-r--r-- | app/services/process_feed_service.rb | 2 | ||||
| -rw-r--r-- | app/views/api/v1/statuses/_mention.rabl | 4 | ||||
| -rw-r--r-- | app/views/user_mailer/confirmation_instructions.ar.text.erb | 2 | ||||
| -rw-r--r-- | app/views/user_mailer/confirmation_instructions.fa.text.erb | 4 |
8 files changed, 18 insertions, 9 deletions
diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb index 561bf7b59..21ee7deba 100644 --- a/app/lib/atom_serializer.rb +++ b/app/lib/atom_serializer.rb @@ -328,7 +328,7 @@ class AtomSerializer end def conversation_uri(conversation) - return conversation.uri if conversation.uri.present? + return conversation.uri if conversation.uri? TagManager.instance.unique_tag(conversation.created_at, conversation.id, 'Conversation') end diff --git a/app/models/mention.rb b/app/models/mention.rb index a8d243259..7450b1b85 100644 --- a/app/models/mention.rb +++ b/app/models/mention.rb @@ -17,4 +17,11 @@ class Mention < ApplicationRecord has_one :notification, as: :activity, dependent: :destroy validates :account, uniqueness: { scope: :status } + + delegate( + :username, + :acct, + to: :account, + prefix: true + ) end diff --git a/app/models/status.rb b/app/models/status.rb index a371083d0..e75ac7070 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -73,6 +73,8 @@ class Status < ApplicationRecord cache_associated :account, :application, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :application, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account + delegate :domain, to: :account, prefix: true + def reply? !in_reply_to_id.nil? || attributes['reply'] end @@ -288,7 +290,7 @@ class Status < ApplicationRecord def filter_from_context?(status, account) should_filter = account&.blocking?(status.account_id) - should_filter ||= account&.domain_blocking?(status.account.domain) + should_filter ||= account&.domain_blocking?(status.account_domain) should_filter ||= account&.muting?(status.account_id) should_filter ||= (status.account.silenced? && !account&.following?(status.account_id)) should_filter ||= !StatusPolicy.new(account, status).show? diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index b665391e3..2e6fbb5c3 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -34,7 +34,7 @@ class PostStatusService < BaseService process_mentions_service.call(status) process_hashtags_service.call(status) - LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text.present? + LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? DistributionWorker.perform_async(status.id) Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id) diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 87ed68f70..9402baf18 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -77,7 +77,7 @@ class ProcessFeedService < BaseService Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution" - LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text.present? + LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? DistributionWorker.perform_async(status.id) status diff --git a/app/views/api/v1/statuses/_mention.rabl b/app/views/api/v1/statuses/_mention.rabl index 498cca275..8c95fc9bd 100644 --- a/app/views/api/v1/statuses/_mention.rabl +++ b/app/views/api/v1/statuses/_mention.rabl @@ -1,4 +1,4 @@ node(:url) { |mention| TagManager.instance.url_for(mention.account) } -node(:acct) { |mention| mention.account.acct } +node(:acct) { |mention| mention.account_acct } node(:id) { |mention| mention.account_id } -node(:username) { |mention| mention.account.username } +node(:username) { |mention| mention.account_username } diff --git a/app/views/user_mailer/confirmation_instructions.ar.text.erb b/app/views/user_mailer/confirmation_instructions.ar.text.erb index 1b7b445a1..087c6a9ae 100644 --- a/app/views/user_mailer/confirmation_instructions.ar.text.erb +++ b/app/views/user_mailer/confirmation_instructions.ar.text.erb @@ -9,4 +9,4 @@ مع أجمل التحيات، -فريق <%= @instance %> +فريق <%= @instance %> diff --git a/app/views/user_mailer/confirmation_instructions.fa.text.erb b/app/views/user_mailer/confirmation_instructions.fa.text.erb index cbabed06d..904bd5bfe 100644 --- a/app/views/user_mailer/confirmation_instructions.fa.text.erb +++ b/app/views/user_mailer/confirmation_instructions.fa.text.erb @@ -2,11 +2,11 @@ شما الان در <%= @instance %> حساب باز کردید. -برای تأیید عضویت، لطفاً روی پیوند زیر کلیک کنید: +برای تأیید عضویت، لطفاً روی پیوند زیر کلیک کنید: <%= confirmation_url(@resource, confirmation_token: @token) %> لطفاً همچنین شرایط و مقررات استفادهٔ ما را هم بخوانید <%= terms_url %> با احترام، -گردانندگان سرور <%= @instance %> +گردانندگان سرور <%= @instance %> |