Merged
Conversation
sampaiodiego
requested review from
engelgabriel,
ggazzo,
tassoevan and
thiagosanchz
tassoevan
reviewed
Apr 12, 2019
Member
|
@sampaiodiego will this fix the issue #14110 ? |
Member
Author
|
@rodrigok I don't think so.. but I'll check |
server/routes/avatar/utils.js
Outdated
|
|
||
| export const getCacheTime = (req) => req.query.cacheTime || settings.get('Accounts_AvatarCacheTime'); | ||
|
|
||
| export const serveAvatar = (avatar, req, res) => { |
Contributor
There was a problem hiding this comment.
I don't think these functions should receive the express objects (req, res), I think that the express objects, should only be at the level they are received, and not be passed to levels below. 🤔
Member
There was a problem hiding this comment.
Maybe the function should only be moved to another place instead? Because by the name serverAvatar I guess it is theoretically in the same layer as the route handlers 🤔
Member
Author
There was a problem hiding this comment.
yep, I guess so.. fixed all other comments btw =)
tassoevan
previously approved these changes
Apr 17, 2019
Co-authored-by: wreiske
rodrigok
previously approved these changes
Apr 17, 2019
rodrigok
approved these changes
Apr 18, 2019
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Along with the changes below, this PR also removes the suggestion of the channel as name of the discussion.
Closes #14110
Before
Shows the discussion icon instead of an avatar.
After
Shows the avatar of the room where the discussion started and shows the icon in same place as other icons.