remove activity_streams, because it was always false ...
This commit is contained in:
parent
ecd13fc713
commit
83db0a8f3e
5 changed files with 3 additions and 15 deletions
|
|
@ -129,10 +129,6 @@ class Post < ActiveRecord::Base
|
||||||
new(params.to_hash.stringify_keys.slice(*column_names, "author"))
|
new(params.to_hash.stringify_keys.slice(*column_names, "author"))
|
||||||
end
|
end
|
||||||
|
|
||||||
def activity_streams?
|
|
||||||
false
|
|
||||||
end
|
|
||||||
|
|
||||||
def comment_email_subject
|
def comment_email_subject
|
||||||
I18n.t('notifier.a_post_you_shared')
|
I18n.t('notifier.a_post_you_shared')
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@
|
||||||
- unless post.is_a?(Reshare)
|
- unless post.is_a?(Reshare)
|
||||||
= render "shared/nsfw_shield", post: post
|
= render "shared/nsfw_shield", post: post
|
||||||
|
|
||||||
- if !post.activity_streams?
|
|
||||||
.nsfw-hidden
|
.nsfw-hidden
|
||||||
= render "status_messages/status_message", post: post, photos: post.photos
|
= render "status_messages/status_message", post: post, photos: post.photos
|
||||||
- else
|
- else
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,3 @@
|
||||||
.additional_photo_count
|
.additional_photo_count
|
||||||
= "+ #{post.photos.size-1}"
|
= "+ #{post.photos.size-1}"
|
||||||
= image_tag post.photos.first.url(:thumb_large), class: "stream-photo big-stream-photo"
|
= image_tag post.photos.first.url(:thumb_large), class: "stream-photo big-stream-photo"
|
||||||
- elsif post.activity_streams?
|
|
||||||
= image_tag post.image_url
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,9 +20,7 @@
|
||||||
= link_to(post_path(post)) do
|
= link_to(post_path(post)) do
|
||||||
= timeago(post.created_at)
|
= timeago(post.created_at)
|
||||||
%span.via
|
%span.via
|
||||||
- if post.activity_streams?
|
- if post.provider_display_name == "mobile"
|
||||||
= t('shared.stream_element.via', link: link_to("#{post.provider_display_name}", post.actor_url)).html_safe
|
|
||||||
- elsif post.provider_display_name == 'mobile'
|
|
||||||
= t('shared.stream_element.via_mobile', link: nil)
|
= t('shared.stream_element.via_mobile', link: nil)
|
||||||
–
|
–
|
||||||
%span.scope_scope
|
%span.scope_scope
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,6 @@
|
||||||
.additional_photo_count
|
.additional_photo_count
|
||||||
= "+ #{post.photos.size-1}"
|
= "+ #{post.photos.size-1}"
|
||||||
= image_tag post.first_photo_url(:thumb_large), :class => "stream-photo big-stream-photo"
|
= image_tag post.first_photo_url(:thumb_large), :class => "stream-photo big-stream-photo"
|
||||||
- elsif post.activity_streams?
|
|
||||||
= image_tag post.image_url
|
|
||||||
|
|
||||||
%div{:class => direction_for(post.text)}
|
%div{:class => direction_for(post.text)}
|
||||||
!= post.message.markdownified
|
!= post.message.markdownified
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue