forked from cwtch.im/ui
Merge branch 'bugfix' of erinn/bounce into master
This commit is contained in:
commit
fe5f83c3f7
6
main.go
6
main.go
|
@ -168,9 +168,13 @@ func loadCwtchData(gcd *gothings.GrandCentralDispatcher) {
|
||||||
group.NewMessage = make(chan model.Message)
|
group.NewMessage = make(chan model.Message)
|
||||||
go characters.CwtchListener(gcd.UIState.AddMessage, groups[i], group.NewMessage)
|
go characters.CwtchListener(gcd.UIState.AddMessage, groups[i], group.NewMessage)
|
||||||
the.Peer.JoinServer(group.GroupServer)
|
the.Peer.JoinServer(group.GroupServer)
|
||||||
|
nick, exists := group.GetAttribute("nick")
|
||||||
|
if !exists {
|
||||||
|
nick = group.GroupID[:12]
|
||||||
|
}
|
||||||
gcd.UIState.AddContact(&gobjects.Contact{
|
gcd.UIState.AddContact(&gobjects.Contact{
|
||||||
group.GroupID,
|
group.GroupID,
|
||||||
group.GroupID[:12],
|
nick,
|
||||||
cwutil.RandomGroupImage(group.GroupID),
|
cwutil.RandomGroupImage(group.GroupID),
|
||||||
group.GroupServer,
|
group.GroupServer,
|
||||||
0,
|
0,
|
||||||
|
|
Loading…
Reference in New Issue