IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

REVERT "FIX: do not show private group flair on user avatars" (#13991)

Browse Source 
This reverts commit fe3e18f981 and 0d8fd9ace6
This commit is contained in:
Arpit Jalan
2021-08-10 17:25:11 +05:30
committed by GitHub
parent 4ca34940d3
commit 3006de39d1
6 changed files with 8 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/group.rb
View File

@@ -803,22 +803,12 @@ class Group < ActiveRecord::Base
end
def flair_url
return if members_visibility_level != Group.visibility_levels[:public]
return if visibility_level != Group.visibility_levels[:public]
return flair_icon if flair_type == :icon
return upload_cdn_path(flair_upload.url) if flair_type == :image
nil
end
def flair_bg_color
return if members_visibility_level != Group.visibility_levels[:public]
return if visibility_level != Group.visibility_levels[:public]
read_attribute(:flair_bg_color)
end
[:muted, :regular, :tracking, :watching, :watching_first_post].each do |level|
define_method("#{level}_category_ids=") do |category_ids|
@category_notifications ||= {}