Unverified Commit 3f4360d2 authored by Andrei Mihu's avatar Andrei Mihu Committed by GitHub
Browse files

Improve user online status lookups. (#844)

parent c2cf74dd

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 
- Adjust console path for delete all data operation.

- Check HTTP key before Authorization header in RPC function invocations.

- Surface error message from Apple authentication JWT verification failures.

- Improve user online status lookups.



### Fixed

- Fix data returned by StreamUserList in JS runtime.

main.go

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ func main() { 
	tracker.SetMatchJoinListener(matchRegistry.Join)

	tracker.SetMatchLeaveListener(matchRegistry.Leave)

	streamManager := server.NewLocalStreamManager(config, sessionRegistry, tracker)

	runtime, runtimeInfo, err := server.NewRuntime(ctx, logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, socialClient, leaderboardCache, leaderboardRankCache, leaderboardScheduler, sessionRegistry, sessionCache, matchRegistry, tracker, metrics, streamManager, router)

	runtime, runtimeInfo, err := server.NewRuntime(ctx, logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, socialClient, leaderboardCache, leaderboardRankCache, leaderboardScheduler, sessionRegistry, sessionCache, statusRegistry, matchRegistry, tracker, metrics, streamManager, router)

	if err != nil {

		startupLogger.Fatal("Failed initializing runtime modules", zap.Error(err))

	}
@@ -164,7 +164,7 @@ func main() { 
	statusHandler := server.NewLocalStatusHandler(logger, sessionRegistry, matchRegistry, tracker, metrics, config.GetName())



	apiServer := server.StartApiServer(logger, startupLogger, db, jsonpbMarshaler, jsonpbUnmarshaler, config, socialClient, leaderboardCache, leaderboardRankCache, sessionRegistry, sessionCache, statusRegistry, matchRegistry, matchmaker, tracker, router, metrics, pipeline, runtime)

	consoleServer := server.StartConsoleServer(logger, startupLogger, db, config, tracker, router, sessionCache, statusHandler, runtimeInfo, matchRegistry, configWarnings, semver, leaderboardCache, leaderboardRankCache, apiServer, cookie)

	consoleServer := server.StartConsoleServer(logger, startupLogger, db, config, tracker, router, sessionCache, statusRegistry, statusHandler, runtimeInfo, matchRegistry, configWarnings, semver, leaderboardCache, leaderboardRankCache, apiServer, cookie)



	gaenabled := len(os.Getenv("NAKAMA_TELEMETRY")) < 1

	const gacode = "UA-89792135-1"

server/api.go

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ type ApiServer struct { 
	leaderboardCache     LeaderboardCache

	leaderboardRankCache LeaderboardRankCache

	sessionCache         SessionCache

	statusRegistry       *StatusRegistry

	matchRegistry        MatchRegistry

	tracker              Tracker

	router               MessageRouter
@@ -114,6 +115,7 @@ func StartApiServer(logger *zap.Logger, startupLogger *zap.Logger, db *sql.DB, p 
		leaderboardCache:     leaderboardCache,

		leaderboardRankCache: leaderboardRankCache,

		sessionCache:         sessionCache,

		statusRegistry:       statusRegistry,

		matchRegistry:        matchRegistry,

		tracker:              tracker,

		router:               router,

server/api_account.go

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ func (s *ApiServer) GetAccount(ctx context.Context, in *emptypb.Empty) (*api.Acc 
		}

	}



	account, err := GetAccount(ctx, s.logger, s.db, s.tracker, userID)

	account, err := GetAccount(ctx, s.logger, s.db, s.statusRegistry, userID)

	if err != nil {

		if err == ErrAccountNotFound {

			return nil, status.Error(codes.NotFound, "Account not found.")

server/api_friend.go

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ func (s *ApiServer) ListFriends(ctx context.Context, in *api.ListFriendsRequest) 
		}

	}



	friends, err := ListFriends(ctx, s.logger, s.db, s.tracker, userID, limit, state, in.GetCursor())

	friends, err := ListFriends(ctx, s.logger, s.db, s.statusRegistry, userID, limit, state, in.GetCursor())

	if err != nil {

		if err == runtime.ErrFriendInvalidCursor {

			return nil, status.Error(codes.InvalidArgument, "Cursor is invalid.")