15 files changed, 61 insertions, 41 deletions
diff --git a/app/views/about/terms.no.html.haml b/app/views/about/terms.no.html.haml
index 5506cd863..32ec57ed1 100644
--- a/app/views/about/terms.no.html.haml
+++ b/app/views/about/terms.no.html.haml
@@ -71,6 +71,6 @@
   %p Dette dokumentet er lisensiert under CC-BY-SA. De ble sist oppdatert 12. april 2017.
 
   %p
-    Dokumentet er en adoptert og endret versjon fra 
+    Dokumentet er en adoptert og endret versjon fra
     = succeed '.' do
       = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse'
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index beee96cd8..6538885a0 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -1,34 +1,34 @@
-.card.h-card.p-author{ style: "background-image: url(#{@account.header.url( :original)})" }
-  - if user_signed_in? && current_account.id != @account.id && !current_account.requested?(@account)
+.card.h-card.p-author{ style: "background-image: url(#{account.header.url( :original)})" }
+  - if user_signed_in? && current_account.id != account.id && !current_account.requested?(account)
     .controls
-      - if current_account.following?(@account)
-        = link_to t('accounts.unfollow'), unfollow_account_path(@account), data: { method: :post }, class: 'button'
+      - if current_account.following?(account)
+        = link_to t('accounts.unfollow'), unfollow_account_path(account), data: { method: :post }, class: 'button'
       - else
-        = link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button'
+        = link_to t('accounts.follow'), follow_account_path(account), data: { method: :post }, class: 'button'
   - elsif !user_signed_in?
     .controls
       .remote-follow
-        = link_to t('accounts.remote_follow'), account_remote_follow_path(@account), class: 'button'
-  .avatar= image_tag @account.avatar.url(:original), class: 'u-photo'
+        = link_to t('accounts.remote_follow'), account_remote_follow_path(account), class: 'button'
+  .avatar= image_tag account.avatar.url(:original), class: 'u-photo'
   %h1.name
-    %span.p-name.emojify= display_name(@account)
+    %span.p-name.emojify= display_name(account)
     %small
-      %span= "@#{@account.username}"
-      = fa_icon('lock') if @account.locked?
+      %span= "@#{account.username}"
+      = fa_icon('lock') if account.locked?
   .details
     .bio
-      .account__header__content.p-note.emojify= Formatter.instance.simplified_format(@account)
+      .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account)
 
     .details-counters
-      .counter{ class: active_nav_class(short_account_url(@account)) }
-        = link_to short_account_url(@account), class: 'u-url u-uid' do
+      .counter{ class: active_nav_class(short_account_url(account)) }
+        = link_to short_account_url(account), class: 'u-url u-uid' do
           %span.counter-label= t('accounts.posts')
-          %span.counter-number= number_with_delimiter @account.statuses_count
-      .counter{ class: active_nav_class(following_account_url(@account)) }
-        = link_to following_account_url(@account) do
+          %span.counter-number= number_with_delimiter account.statuses_count
+      .counter{ class: active_nav_class(following_account_url(account)) }
+        = link_to following_account_url(account) do
           %span.counter-label= t('accounts.following')
-          %span.counter-number= number_with_delimiter @account.following_count
-      .counter{ class: active_nav_class(followers_account_url(@account)) }
-        = link_to followers_account_url(@account) do
+          %span.counter-number= number_with_delimiter account.following_count
+      .counter{ class: active_nav_class(followers_account_url(account)) }
+        = link_to followers_account_url(account) do
           %span.counter-label= t('accounts.followers')
-          %span.counter-number= number_with_delimiter @account.followers_count
+          %span.counter-number= number_with_delimiter account.followers_count
diff --git a/app/views/accounts/followers.html.haml b/app/views/accounts/followers.html.haml
index fa5071f38..4b53aef0c 100644
--- a/app/views/accounts/followers.html.haml
+++ b/app/views/accounts/followers.html.haml
@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('accounts.people_who_follow', name: display_name(@account))
 
-= render partial: 'header'
+= render 'header', account: @account
 
 .accounts-grid
   - if @followers.empty?
diff --git a/app/views/accounts/following.html.haml b/app/views/accounts/following.html.haml
index 987dcba1f..4711997d9 100644
--- a/app/views/accounts/following.html.haml
+++ b/app/views/accounts/following.html.haml
@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('accounts.people_followed_by', name: display_name(@account))
 
-= render partial: 'header'
+= render 'header', account: @account
 
 .accounts-grid
   - if @following.empty?
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index fd7ff9653..9a70fd16f 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -20,7 +20,7 @@
 .h-feed
   %data.p-name{ value: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
 
-  = render partial: 'header'
+  = render 'header', account: @account
 
   - if @statuses.empty?
     .accounts-grid
diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml
index 6f4ba9b57..da9a07bbc 100644
--- a/app/views/admin/domain_blocks/index.html.haml
+++ b/app/views/admin/domain_blocks/index.html.haml
@@ -6,12 +6,19 @@
     %tr
       %th= t('admin.domain_block.domain')
       %th= t('admin.domain_block.severity')
+      %th= t('admin.domain_block.reject_media')
+      %th
   %tbody
     - @blocks.each do |block|
       %tr
         %td
           %samp= block.domain
-        %td= block.severity
+        %td= t("admin.domain_block.severities.#{block.severity}")
+        %td
+          - if block.reject_media? || block.suspend?
+            %i.fa.fa-check
+        %td
+          = table_link_to 'undo', t('admin.domain_block.undo'), admin_domain_block_path(block)
 
 = paginate @blocks
 = link_to t('admin.domain_block.add_new'), new_admin_domain_block_path, class: 'button'
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 53aab21ff..603faeb55 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -10,5 +10,8 @@
   = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("admin.domain_block.new.severity.#{type}") }
 
   %p.hint= t('admin.domain_block.new.severity.desc_html')
+
+  = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_block.reject_media'), hint: I18n.t('admin.domain_block.reject_media_hint')
+
   .actions
     = f.button :button, t('admin.domain_block.new.create'), type: :submit
diff --git a/app/views/admin/domain_blocks/show.html.haml b/app/views/admin/domain_blocks/show.html.haml
new file mode 100644
index 000000000..bf9011c52
--- /dev/null
+++ b/app/views/admin/domain_blocks/show.html.haml
@@ -0,0 +1,9 @@
+- content_for :page_title do
+  = t('admin.domain_block.show.title', domain: @domain_block.domain)
+
+= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f|
+
+  = f.input :retroactive, as: :boolean, wrapper: :with_label, label: I18n.t("admin.domain_block.show.retroactive.#{@domain_block.severity}"), hint: I18n.t('admin.domain_block.show.affected_accounts', count: Account.where(domain: @domain_block.domain).count)
+
+  .actions
+    = f.button :button, t('admin.domain_block.show.undo'), type: :submit
diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl
index 2f56c6d07..80d80ea05 100644
--- a/app/views/api/v1/statuses/_media.rabl
+++ b/app/views/api/v1/statuses/_media.rabl
@@ -1,5 +1,5 @@
 attributes :id, :remote_url, :type
 
-node(:url)         { |media| full_asset_url(media.file.url(:original)) }
-node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }
+node(:url)         { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:original)) }
+node(:preview_url) { |media| media.file.blank? ? media.remote_url : full_asset_url(media.file.url(:small)) }
 node(:text_url)    { |media| media.local? ? medium_url(media) : nil }
diff --git a/app/views/settings/two_factor_auths/_recovery_codes.html.haml b/app/views/settings/two_factor_auths/_recovery_codes.html.haml
index 719a1e01b..054588b97 100644
--- a/app/views/settings/two_factor_auths/_recovery_codes.html.haml
+++ b/app/views/settings/two_factor_auths/_recovery_codes.html.haml
@@ -1,6 +1,6 @@
 %p.hint= t('two_factor_auth.recovery_instructions')
 
 %ol.recovery-codes
-  - @codes.each do |code|
+  - recovery_codes.each do |code|
     %li
       %samp= code
diff --git a/app/views/settings/two_factor_auths/create.html.haml b/app/views/settings/two_factor_auths/create.html.haml
index 8710b6e02..138a930fd 100644
--- a/app/views/settings/two_factor_auths/create.html.haml
+++ b/app/views/settings/two_factor_auths/create.html.haml
@@ -1,4 +1,4 @@
 - content_for :page_title do
   = t('settings.two_factor_auth')
 
-= render 'recovery_codes'
+= render partial: 'recovery_codes', object: @codes
diff --git a/app/views/settings/two_factor_auths/recovery_codes.html.haml b/app/views/settings/two_factor_auths/recovery_codes.html.haml
index 8710b6e02..138a930fd 100644
--- a/app/views/settings/two_factor_auths/recovery_codes.html.haml
+++ b/app/views/settings/two_factor_auths/recovery_codes.html.haml
@@ -1,4 +1,4 @@
 - content_for :page_title do
   = t('settings.two_factor_auth')
 
-= render 'recovery_codes'
+= render partial: 'recovery_codes', object: @codes
diff --git a/app/views/stream_entries/_og_description.html.haml b/app/views/stream_entries/_og_description.html.haml
new file mode 100644
index 000000000..5762aca04
--- /dev/null
+++ b/app/views/stream_entries/_og_description.html.haml
@@ -0,0 +1,4 @@
+- if activity.is_a?(Status) && activity.spoiler_text?
+  %meta{ property: 'og:description', content: activity.spoiler_text }/
+- else
+  %meta{ property: 'og:description', content: activity.content }/
diff --git a/app/views/stream_entries/_og_image.html.haml b/app/views/stream_entries/_og_image.html.haml
new file mode 100644
index 000000000..f725209d8
--- /dev/null
+++ b/app/views/stream_entries/_og_image.html.haml
@@ -0,0 +1,6 @@
+- if activity.is_a?(Status) && activity.non_sensitive_with_media?
+  %meta{ property: 'og:image', content: full_asset_url(activity.media_attachments.first.file.url(:small)) }/
+- else
+  %meta{ property: 'og:image', content: full_asset_url(account.avatar.url(:original)) }/
+  %meta{ property: 'og:image:width', content: '120' }/
+  %meta{ property: 'og:image:height', content: '120' }/
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index eb8387ccb..dea5e9d40 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -6,17 +6,8 @@
   %meta{ property: 'og:type', content: 'article' }/
   %meta{ property: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
 
-  - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.spoiler_text.blank?
-    %meta{ property: 'og:description', content: @stream_entry.activity.spoiler_text }/
-  - else
-    %meta{ property: 'og:description', content: @stream_entry.activity.content }/
-
-  - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.sensitive? && @stream_entry.activity.media_attachments.size > 0
-    %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/
-  - else
-    %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/
-    %meta{ property: 'og:image:width', content: '120' }/
-    %meta{ property: 'og:image:height', content: '120' }/
+  = render 'stream_entries/og_description', activity: @stream_entry.activity
+  = render 'stream_entries/og_image', activity: @stream_entry.activity, account: @account
 
   %meta{ property: 'twitter:card', content: 'summary' }/