nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nsfw's users posts are now nsfw

Browse source
This commit is contained in:
Dennis Collinson 2012-02-07 19:14:44 -08:00
parent 558ceec92a
commit 8ae18bb393
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/post.rb
View file

@ -36,6 +36,7 @@ class Post < ActiveRecord::Base
t.add :user_like t.add :user_like
t.add :mentioned_people t.add :mentioned_people
t.add :photos t.add :photos
t.add :nsfw
end end
xml_attr :provider_display_name xml_attr :provider_display_name
@ -125,4 +126,8 @@ class Post < ActiveRecord::Base
def comment_email_subject def comment_email_subject
I18n.t('notifier.a_post_you_shared') I18n.t('notifier.a_post_you_shared')
end end
def nsfw
self.author.profile.nsfw?
end
end end

5
app/models/status_message.rb
View file

@ -63,9 +63,8 @@ class StatusMessage < Post
self.photos << Photo.where(:id => photo_ids, :author_id => self.author_id).all self.photos << Photo.where(:id => photo_ids, :author_id => self.author_id).all
end end
def nsfw
def nsfw? self.raw_message.match(/#nsfw/i) || super
self.raw_message.match(/#nsfw/i)
end end
def formatted_message(opts={}) def formatted_message(opts={})

1
features/step_definitions/posts_steps.rb
View file

@ -1,5 +1,4 @@
Then /^the post "([^"]*)" should be marked nsfw$/ do |text| Then /^the post "([^"]*)" should be marked nsfw$/ do |text|
pending
assert_nsfw(text) assert_nsfw(text)
end end

7
public/javascripts/app/views/post_view.js
View file

@ -49,8 +49,7 @@ app.views.Post = app.views.StreamObject.extend({
presenter : function() { presenter : function() {
return _.extend(this.defaultPresenter(), { return _.extend(this.defaultPresenter(), {
authorIsCurrentUser : this.authorIsCurrentUser(), authorIsCurrentUser : this.authorIsCurrentUser()
nsfw : this.nsfw()
}) })
}, },
@ -107,9 +106,5 @@ app.views.Post = app.views.StreamObject.extend({
authorIsCurrentUser : function() { authorIsCurrentUser : function() {
return this.model.get("author").id != (!!app.user() && app.user().id) return this.model.get("author").id != (!!app.user() && app.user().id)
},
nsfw : function() {
return this.model.get("text") !== null && this.model.get("text").match(/#nsfw/i)
} }
}); });