github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 03:18:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add rubocop to our build. (#5004)

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-07-28 10:20:09 +09:00
committed by GitHub
parent ff4e295c4f
commit 5012d46cbd
871 changed files with 5480 additions and 6056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/serializers/user_serializer.rb
View File

@ -125,12 +125,12 @@ class UserSerializer < BasicUserSerializer
def mailing_list_posts_per_day
val = Post.estimate_posts_per_day
[val,SiteSetting.max_emails_per_day_per_user].min
[val, SiteSetting.max_emails_per_day_per_user].min
end
def groups
object.groups.order(:id)
.visible_groups(scope.user)
.visible_groups(scope.user)
end
def group_users
@ -145,13 +145,12 @@ class UserSerializer < BasicUserSerializer
!(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
end
def user_api_keys
keys = object.user_api_keys.where(revoked_at: nil).map do |k|
{
id: k.id,
application_name: k.application_name,
scopes: k.scopes.map{|s| I18n.t("user_api_key.scopes.#{s}")},
scopes: k.scopes.map { |s| I18n.t("user_api_key.scopes.#{s}") },
created_at: k.created_at
}
end
@ -178,7 +177,7 @@ class UserSerializer < BasicUserSerializer
def website_name
uri = URI(website.to_s) rescue nil
return if uri.nil? || uri.host.nil?
uri.host.sub(/^www\./,'') + uri.path
uri.host.sub(/^www\./, '') + uri.path
end
def include_website_name
@ -248,7 +247,7 @@ class UserSerializer < BasicUserSerializer
end
def bio_excerpt
object.user_profile.bio_excerpt(350 , { keep_newlines: true, keep_emoji_images: true })
object.user_profile.bio_excerpt(350 , keep_newlines: true, keep_emoji_images: true)
end
def include_suspend_reason?