Misc tidying and clean ups (#3445)

* Remove trailing whitespace in i18n mailers

* Use query methods instead of #present? on AR attributes

* Delegate Status#account_domain method

* Delegate Mention #account_username and #account_acct methods

diff --git a/app/lib/atom_serializer.rb b/app/lib/atom_serializer.rb
index 561bf7b59b28c41c6cd5cdf2b2cd79d406735d83..21ee7deba5be247d0466cf1e6e993e4f3283fbbe 100644 (file)
--- 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 a8d243259cb1ac76db55d825c20544f3ff7c3485..7450b1b852d03b2e920e2c36e25e05389a85f648 100644 (file)
--- 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 a371083d05692e0493bfce9191af9142a9502b5d..e75ac7070f6b5cd0c640715fcb57731a1b94a924 100644 (file)
--- 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 b665391e3f1bf41668b6045d25aa04865c1f55cc..2e6fbb5c382fb8cf9a7dbb5674629c37aaa5f31a 100644 (file)
--- 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 87ed68f704272a633e4159bd4f7f41d2dbd1205e..9402baf180adc9d3b341a9042f8bebdae689afd7 100644 (file)
--- 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 498cca27571fc46799e2462007f12eaf184f90cd..8c95fc9bde7c06eaacad31518de2a6b6cdf4bbb2 100644 (file)
--- 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 1b7b445a1ae5a2fd9b33402b1d940979c5c2cf51..087c6a9ae4a28c09fdf218c1245857a6e85fe9e2 100644 (file)
--- 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 cbabed06d4ebd5ec7fe3c85cd1d1b00a8c6a43e5..904bd5bfe799f6eef33487f349683bb2f61cf99a 100644 (file)
--- 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 %>