Commit c6e3521a authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Improve group count handling. Merge #67

parent 2d71d814

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ The format is based on [keep a changelog](http://keepachangelog.com/) and this p 
### Added

- Node status now also reports a startup timestamp.



### Fixed

- Set correct initial group member count when group is created.

- Do not update group count when join requests are rejected.



## [0.12.2] - 2017-04-22

### Added

- Add `--logtostdout` flag to redirect log output to console.

server/pipeline_group.go

+12 −5
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ func (p *pipeline) groupCreate(logger *zap.Logger, session *session, envelope *E 
	}



	r := tx.QueryRow(`

INSERT INTO groups (id, creator_id, name, state, created_at, updated_at, `+strings.Join(columns, ", ")+")"+`

VALUES ($1, $2, $3, $4, $5, $5, `+strings.Join(params, ",")+")"+`

INSERT INTO groups (id, creator_id, name, state, count, created_at, updated_at, `+strings.Join(columns, ", ")+")"+`

VALUES ($1, $2, $3, $4, 1, $5, $5, `+strings.Join(params, ",")+")"+`

RETURNING id, creator_id, name, description, avatar_url, lang, utc_offset_ms, metadata, state, count, created_at, updated_at

`, values...)
@@ -956,6 +956,10 @@ func (p *pipeline) groupUserKick(l *zap.Logger, session *session, envelope *Enve 
		}

	}()



	// Check the user's group_edge state. If it's a pending join request being rejected then no need to decrement the group count.

	var userState int64

	err = tx.QueryRow("SELECT state FROM group_edge WHERE source_id = $1 AND destination_id = $2", groupID.Bytes(), userID.Bytes()).Scan(&userState)



	res, err := tx.Exec(`

DELETE FROM group_edge

WHERE
@@ -979,10 +983,13 @@ AND 
		return

	}



	// Join requests aren't reflected in group count.

	if userState != 2 {

		_, err = tx.Exec(`UPDATE groups SET count = count - 1, updated_at = $1 WHERE id = $2`, nowMs(), groupID.Bytes())

		if err != nil {

			return

		}

	}



	// Look up the user being kicked. Allow kicking disabled users.

	err = tx.QueryRow("SELECT handle FROM users WHERE id = $1", userID.Bytes()).Scan(&handle)