rudi/kbtui
1
0
Fork 0
mirror of https://github.com/Rudi9719/kbtui.git synced 2026-03-22 11:07:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/ellipticcurv3/kbtui into ellipticcurv3/kbtui

Browse Source
This commit is contained in:
Gregory Rudolph
2019-12-26 12:41:14 -05:00
parent ae9f71be96 01bb599f56
commit 3056ad9a47
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main.go
View File

@ -42,6 +42,7 @@ func main() {
defer g.Close()
g.SetManagerFunc(layout)
RunCommand("config", "load")
if dev { channel.TopicType = "dev" } else { channel.TopicType = "chat" }
go populateList()
go updateChatWindow()
if len(os.Args) > 1 {
@ -381,6 +382,7 @@ func populateChat() {
if channel.Name == testChan.Name {
channel = testChan
channel.TopicName = "general"
if dev { channel.TopicType = "dev" } else { channel.TopicType = "chat" }
}
}
chat = k.NewChat(channel)
@ -622,7 +624,8 @@ func handleMessage(api keybase.ChatAPI) {
}
}
if api.Msg.Channel.MembersType == channel.MembersType && cleanChannelName(api.Msg.Channel.Name) == channel.Name {
if channel.MembersType == keybase.USER || channel.MembersType == keybase.TEAM && channel.TopicName == api.Msg.Channel.TopicName {
if channel.MembersType == keybase.USER || channel.MembersType == keybase.TEAM && channel.TopicName == api.Msg.Channel.TopicName &&
channel.TopicType == api.Msg.Channel.TopicType {
printToView("Chat", formatOutput(api).string())
chat := k.NewChat(channel)
lastMessage.ID = api.Msg.ID