mirror of
https://github.com/jech/galene.git
synced 2024-11-08 17:55:59 +01:00
Only send chat history when joining.
When we moved the chat history to the client goroutine back in 0.6, we started sending the history whenever the group configuration changed. Only send it when first joining the group. Thanks to Rémi Nollet.
This commit is contained in:
parent
62517844a5
commit
8a2357de21
2 changed files with 22 additions and 13 deletions
1
CHANGES
1
CHANGES
|
@ -2,6 +2,7 @@ Galene 0.6.1 (unreleased):
|
|||
|
||||
* Ensure that autolocked groups are locked on creation. Thanks to
|
||||
Michael Ströder.
|
||||
* Don't send chat history multiple times. Thanks to Rémy Nollet.
|
||||
* Add a camera/microphone indicator in the users list.
|
||||
* Hide audio-only peers by default.
|
||||
|
||||
|
|
|
@ -1168,8 +1168,9 @@ func handleAction(c *webClient, a interface{}) error {
|
|||
case joinedAction:
|
||||
var status *group.Status
|
||||
var data map[string]interface{}
|
||||
var g *group.Group
|
||||
if a.group != "" {
|
||||
g := group.Get(a.group)
|
||||
g = group.Get(a.group)
|
||||
if g != nil {
|
||||
s := g.Status(true, "")
|
||||
status = &s
|
||||
|
@ -1190,18 +1191,25 @@ func handleAction(c *webClient, a interface{}) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
h := c.group.GetChatHistory()
|
||||
for _, m := range h {
|
||||
err := c.write(clientMessage{
|
||||
Type: "chathistory",
|
||||
Source: m.Id,
|
||||
Username: m.User,
|
||||
Time: m.Time,
|
||||
Value: m.Value,
|
||||
Kind: m.Kind,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
if a.kind == "join" {
|
||||
if g == nil {
|
||||
log.Println("g is null when joining" +
|
||||
"this shouldn't happen")
|
||||
return nil
|
||||
}
|
||||
h := g.GetChatHistory()
|
||||
for _, m := range h {
|
||||
err := c.write(clientMessage{
|
||||
Type: "chathistory",
|
||||
Source: m.Id,
|
||||
Username: m.User,
|
||||
Time: m.Time,
|
||||
Value: m.Value,
|
||||
Kind: m.Kind,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
case permissionsChangedAction:
|
||||
|
|
Loading…
Reference in a new issue