Fix case of bot icons are invisible #107
Merged
Conversation
This file contains 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
tennashi
reviewed
May 10, 2020
internal/slacklog/generator.go
Outdated
| @@ -208,19 +208,22 @@ func (g *HTMLGenerator) generateMessageDir(channel Channel, key MessageMonthKey, | |||
| return g.c.escapeSpecialChars(g.s.GetDisplayNameByUserID(msg.User)) | |||
| }, | |||
| "userIconUrl": func(msg *Message) string { | |||
| var user *User | |||
There was a problem hiding this comment.
early return ごり押しだと
!msg.IsVisible()であればreturn "" // TODO show default icon- Bot からのメッセージで
Iconsが存在すればreturn msg.Icons.Image48- 条件式が汚なくなりますが
msg.Subtype == "bot_message" || msg.Subtype == "slackbot_response"をIsBotMessage()とか名付ければ条件式もまだましになる...?
- 条件式が汚なくなりますが
- それ以外の場合は user を取得して存在すれば
return user.Profile.Image48
とできそうです
There was a problem hiding this comment.
// ただの提案(? 思い付いたことをつぶやいただけとも言う...)なので、このままでも問題自体はないと思います
There was a problem hiding this comment.
書いててすっきりしなかったんですよねこれ、early returnで考えてみますか
There was a problem hiding this comment.
テンプレートでの使われかたを見るにIsVisibleの判定は必要なさそう
|
変数の使用をやめて、MessageにisBotMessageというメソッドを生やしてみました |
tennashi
reviewed
May 10, 2020
koron
approved these changes
May 10, 2020
There was a problem hiding this comment.
Slackの僕の発言より引用
要は msg の横に表示すべきアイコンの正しい決定方法がわからんなぁ、と
たぶんAPI叩くと、各発言のアイコンを1個ずつ書き換えられるんですよね。
だから userIconUrl で最優先すべきは msg.Icons なのかなって。また関数名は messageIconURL になる。
- msg.Icons があればそれを使う
- なければ、ボットならmsg.BotIDをIDとして、ボットじゃなければ msg.User を ID として、Userをとってその user.Profile.Image48 を使う
- Userが取れなかったらデフォルトアイコンにフォールバック
このロジックが正しいんじゃないかと思うんですが、確信が持てない。
@kuu ちょっと検討してみてください。
|
|
koron
approved these changes
May 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
botのアイコンが表示されないケースがあったので修正
ついでにGetUserの部分を外に出して変数のokをuserFoundに変更していますが、問題があれば指摘をお願いします。