jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pundit: convert favorite groups to pundit.

Browse Source
This commit is contained in:
evazion
2020-03-19 18:12:16 -05:00
parent 50fa674a3e
commit 2c4c29b81a
9 changed files with 80 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/favorite_group.rb
View File

@@ -160,14 +160,6 @@ class FavoriteGroup < ApplicationRecord
post_ids.include?(post_id)
end
def editable_by?(user)
creator_id == user.id
end
def viewable_by?(user)
creator_id == user.id || is_public
end
def self.available_includes
[:creator]
end

4
app/models/post.rb
View File

@@ -827,12 +827,12 @@ class Post < ApplicationRecord
when /^-favgroup:(.+)$/i
favgroup = FavoriteGroup.find_by_name_or_id!($1, CurrentUser.user)
raise User::PrivilegeError unless favgroup.editable_by?(CurrentUser.user)
raise User::PrivilegeError unless Pundit.policy!([CurrentUser.user, nil], favgroup).update?
favgroup&.remove!(self)
when /^favgroup:(.+)$/i
favgroup = FavoriteGroup.find_by_name_or_id!($1, CurrentUser.user)
raise User::PrivilegeError unless favgroup.editable_by?(CurrentUser.user)
raise User::PrivilegeError unless Pundit.policy!([CurrentUser.user, nil], favgroup).update?
favgroup&.add!(self)
end