Commit 92d944ff authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Add group ID to content of in-app notifications relating to groups.

parent fde577eb

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Option for read-only globals in Lua runtime to reduce memory footprint. Enabled by default.

- Independent config flags for socket read and write buffer sizes.

- Expose session fields in authoritative match join attempt contexts.

- Add group ID to content of in-app notifications relating to groups.



### Changed

- Replace metrics implementation.

server/core_group.go

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ WHERE (id = $1) AND (disable_time = '1970-01-01 00:00:00 UTC')` 


		// If it's a private group notify superadmins/admins that someone has requested to join.

		// Prepare notification data.

		notificationContentBytes, err := json.Marshal(map[string]string{"username": username})

		notificationContentBytes, err := json.Marshal(map[string]string{"group_id": groupID.String(), "username": username})

		if err != nil {

			logger.Error("Could not encode notification content.", zap.Error(err))

		} else {
@@ -580,7 +580,7 @@ func AddGroupUsers(ctx context.Context, logger *zap.Logger, db *sql.DB, router M 
	}



	// Prepare notification data.

	notificationContentBytes, err := json.Marshal(map[string]string{"name": groupName.String})

	notificationContentBytes, err := json.Marshal(map[string]string{"group_id": groupID.String(), "name": groupName.String})

	if err != nil {

		logger.Error("Could not encode notification content.", zap.Error(err))

		return err