Refactor accounts and users. Add notification proto definition. (#159) (159b0251) · Commits · public-projects / Nakama

api/api.pb.go

+413 −178

File changed.

Preview size limit exceeded, changes collapsed.

api/api.pb.gw.go

+100 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,23 @@ func request_Nakama_DeleteFriends_0(ctx context.Context, marshaler runtime.Marsh

		}

		var (
		filter_Nakama_DeleteNotifications_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
		)

		func request_Nakama_DeleteNotifications_0(ctx context.Context, marshaler runtime.Marshaler, client NakamaClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
		var protoReq DeleteNotificationsRequest
		var metadata runtime.ServerMetadata

		if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_Nakama_DeleteNotifications_0); err != nil {
		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
		}

		msg, err := client.DeleteNotifications(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
		return msg, metadata, err

		}

		func request_Nakama_GetAccount_0(ctx context.Context, marshaler runtime.Marshaler, client NakamaClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
		var protoReq empty.Empty
		var metadata runtime.ServerMetadata
		@@ -436,6 +453,23 @@ func request_Nakama_ListFriends_0(ctx context.Context, marshaler runtime.Marshal

		}

		var (
		filter_Nakama_ListNotifications_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
		)

		func request_Nakama_ListNotifications_0(ctx context.Context, marshaler runtime.Marshaler, client NakamaClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
		var protoReq ListNotificationsRequest
		var metadata runtime.ServerMetadata

		if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_Nakama_ListNotifications_0); err != nil {
		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
		}

		msg, err := client.ListNotifications(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
		return msg, metadata, err

		}

		var (
		filter_Nakama_RpcFunc_0 = &utilities.DoubleArray{Encoding: map[string]int{"payload": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
		)
		@@ -989,6 +1023,35 @@ func RegisterNakamaHandlerClient(ctx context.Context, mux *runtime.ServeMux, cli

		})

		mux.Handle("DELETE", pattern_Nakama_DeleteNotifications_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		if cn, ok := w.(http.CloseNotifier); ok {
		go func(done <-chan struct{}, closed <-chan bool) {
		select {
		case <-done:
		case <-closed:
		cancel()
		}
		}(ctx.Done(), cn.CloseNotify())
		}
		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
		rctx, err := runtime.AnnotateContext(ctx, mux, req)
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}
		resp, md, err := request_Nakama_DeleteNotifications_0(rctx, inboundMarshaler, client, req, pathParams)
		ctx = runtime.NewServerMetadataContext(ctx, md)
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}

		forward_Nakama_DeleteNotifications_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)

		})

		mux.Handle("GET", pattern_Nakama_GetAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		@@ -1337,6 +1400,35 @@ func RegisterNakamaHandlerClient(ctx context.Context, mux *runtime.ServeMux, cli

		})

		mux.Handle("GET", pattern_Nakama_ListNotifications_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		if cn, ok := w.(http.CloseNotifier); ok {
		go func(done <-chan struct{}, closed <-chan bool) {
		select {
		case <-done:
		case <-closed:
		cancel()
		}
		}(ctx.Done(), cn.CloseNotify())
		}
		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
		rctx, err := runtime.AnnotateContext(ctx, mux, req)
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}
		resp, md, err := request_Nakama_ListNotifications_0(rctx, inboundMarshaler, client, req, pathParams)
		ctx = runtime.NewServerMetadataContext(ctx, md)
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}

		forward_Nakama_ListNotifications_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)

		})

		mux.Handle("POST", pattern_Nakama_RpcFunc_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		@@ -1653,6 +1745,8 @@ var (

		pattern_Nakama_DeleteFriends_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "friend"}, ""))

		pattern_Nakama_DeleteNotifications_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "notification"}, ""))

		pattern_Nakama_GetAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "account"}, ""))

		pattern_Nakama_GetUsers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "user"}, ""))
		@@ -1677,6 +1771,8 @@ var (

		pattern_Nakama_ListFriends_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "friend"}, ""))

		pattern_Nakama_ListNotifications_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "notification"}, ""))

		pattern_Nakama_RpcFunc_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v2", "rpc", "id"}, ""))

		pattern_Nakama_RpcFunc_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v2", "rpc", "id"}, ""))
		@@ -1721,6 +1817,8 @@ var (

		forward_Nakama_DeleteFriends_0 = runtime.ForwardResponseMessage

		forward_Nakama_DeleteNotifications_0 = runtime.ForwardResponseMessage

		forward_Nakama_GetAccount_0 = runtime.ForwardResponseMessage

		forward_Nakama_GetUsers_0 = runtime.ForwardResponseMessage
		@@ -1745,6 +1843,8 @@ var (

		forward_Nakama_ListFriends_0 = runtime.ForwardResponseMessage

		forward_Nakama_ListNotifications_0 = runtime.ForwardResponseMessage

		forward_Nakama_RpcFunc_0 = runtime.ForwardResponseMessage

		forward_Nakama_RpcFunc_1 = runtime.ForwardResponseMessage

api/api.proto

+54 −4

Original line number	Diff line number	Diff line
		@@ -166,6 +166,11 @@ service Nakama {
		option (google.api.http).delete = "/v2/friend";
		}

		// Delete one or more users by ID or username.
		rpc DeleteNotifications (DeleteNotificationsRequest) returns (google.protobuf.Empty) {
		option (google.api.http).delete = "/v2/notification";
		}

		// Fetch the current user's account.
		rpc GetAccount (google.protobuf.Empty) returns (Account) {
		option (google.api.http).get = "/v2/account";
		@@ -250,6 +255,11 @@ service Nakama {
		option (google.api.http).get = "/v2/friend";
		}

		// Fetch list of notifications.
		rpc ListNotifications (ListNotificationsRequest) returns (NotificationList) {
		option (google.api.http).get = "/v2/notification";
		}

		// Execute a Lua function on the server.
		rpc RpcFunc (Rpc) returns (Rpc) {
		option (google.api.http) = {
		@@ -535,6 +545,12 @@ message DeleteFriendsRequest {
		repeated string usernames = 2;
		}

		// Delete one or more notifications for the current user.
		message DeleteNotificationsRequest {
		// The id of notifications.
		repeated string ids = 1;
		}

		// A friend of a user.
		message Friend {
		// The friendship status.
		@@ -557,6 +573,12 @@ message Friend {
		int32 state = 2; // one of "Friend.State".
		}

		// A collection of zero or more friends of the user.
		message Friends {
		// The Friend objects.
		repeated Friend friends = 1;
		}

		// Fetch a batch of zero or more users from the server.
		message GetUsersRequest {
		// The account id of a user.
		@@ -617,10 +639,38 @@ message LinkFacebookRequest {
		google.protobuf.BoolValue import = 4;
		}

		// A collection of zero or more friends of the user.
		message Friends {
		// The Friend objects.
		repeated Friend friends = 1;
		// Fetch a list of unexpired notifications.
		message ListNotificationsRequest {
		// Max number of notifications to list. Between 1 and 100.
		int64 limit = 1;
		// Use this cursor to paginate notifications. Cache this to catch up to new notifications. The value of this comes from NotificationList.cacheable_cursor.
		string cacheable_cursor = 2;
		}

		// A notification in the server.
		message Notification {
		// ID of the Notification.
		string id = 1;
		// Subject of the notification.
		string subject = 2;
		// Content of the notification in JSON.
		string content = 3;
		// Category code for this notification.
		int64 code = 4;
		// ID of the sender, if a user. Otherwise 'null'.
		string sender_id = 5;
		// The UNIX time when the notification was created.
		google.protobuf.Timestamp create_time = 6;
		// True if this notification was persisted to the database.
		bool persistent = 7;
		}

		// A collection of zero or more notifications.
		message NotificationList {
		// Collection of notifications.
		repeated Notification notifications = 1;
		// Use this cursor to paginate notifications. Cache this to catch up to new notifications.
		string cacheable_cursor = 2;
		}

		// Execute an Lua function on the server.

api/api.swagger.json

+103 −0

Original line number	Diff line number	Diff line
		@@ -763,6 +763,55 @@
		]
		}
		},
		"/v2/notification": {
		"get": {
		"summary": "Fetch list of notifications.",
		"operationId": "ListNotifications",
		"responses": {
		"200": {
		"description": "",
		"schema": {
		"$ref": "#/definitions/apiNotificationList"
		}
		}
		},
		"parameters": [
		{
		"name": "limit",
		"description": "Max number of notifications to list. Between 1 and 100.",
		"in": "query",
		"required": false,
		"type": "string",
		"format": "int64"
		},
		{
		"name": "cacheable_cursor",
		"description": "Use this cursor to paginate notifications. Cache this to catch up to new notifications. The value of this comes from NotificationList.cacheable_cursor.",
		"in": "query",
		"required": false,
		"type": "string"
		}
		],
		"tags": [
		"Nakama"
		]
		},
		"delete": {
		"summary": "Delete one or more users by ID or username.",
		"operationId": "DeleteNotifications",
		"responses": {
		"200": {
		"description": "",
		"schema": {
		"$ref": "#/definitions/protobufEmpty"
		}
		}
		},
		"tags": [
		"Nakama"
		]
		}
		},
		"/v2/rpc/{id}": {
		"get": {
		"summary": "Execute a Lua function on the server.",
		@@ -1153,6 +1202,60 @@
		},
		"description": "A collection of zero or more groups."
		},
		"apiNotification": {
		"type": "object",
		"properties": {
		"id": {
		"type": "string",
		"description": "ID of the Notification."
		},
		"subject": {
		"type": "string",
		"description": "Subject of the notification."
		},
		"content": {
		"type": "string",
		"description": "Content of the notification in JSON."
		},
		"code": {
		"type": "string",
		"format": "int64",
		"description": "Category code for this notification."
		},
		"sender_id": {
		"type": "string",
		"description": "ID of the sender, if a user. Otherwise 'null'."
		},
		"create_time": {
		"type": "string",
		"format": "date-time",
		"description": "The UNIX time when the notification was created."
		},
		"persistent": {
		"type": "boolean",
		"format": "boolean",
		"description": "True if this notification was persisted to the database."
		}
		},
		"description": "A notification in the server."
		},
		"apiNotificationList": {
		"type": "object",
		"properties": {
		"notifications": {
		"type": "array",
		"items": {
		"$ref": "#/definitions/apiNotification"
		},
		"description": "Collection of notifications."
		},
		"cacheable_cursor": {
		"type": "string",
		"description": "Use this cursor to paginate notifications. Cache this to catch up to new notifications."
		}
		},
		"description": "A collection of zero or more notifications."
		},
		"apiRpc": {
		"type": "object",
		"properties": {

migrations/migrations-packr.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,5 +9,5 @@ import "github.com/gobuffalo/packr"
		// Go binary. You can use the "packr clean" command to clean up this,
		// and any other packr generated files.
		func init() {
		packr.PackJSONBytes("./sql", "20180103142001_initial_schema.sql", "\"H4sIAAAAAAAA/6RWXZObNhR996+4sw8NpKztOMk0k20zQzBOmDg4BZx0nzwyXINmQaKSsON2+t87Amzjj/X2Y5/W0tG59x6de8XgeQ+eg8PLraBppmA0fPEGogzBJw+kIGBXKuNC9qDGTWmMTGICFUtQgMoQ7JLEGe52LPiKQlLOYNQfgqEBN+3WjXmnKba8goJsgXEFlURQGZWwojkCfo+xVEAZxLwoc0pYjLChKqvjtCx9zXHfcvClIpQBgZiXW+CrLhCIapPOlCrfDgabzaZP6mT7XKSDvIHJwdRzXD90b0f9YXtgznKUEgT+XlGBCSy3QMoypzFZ5gg52QAXQFKBmIDiOuGNoIqy1ALJV2pDBGqahEol6LJSR3rt0qPyCMAZEAY3dgheeAPv7dALLU3yzYs+zuYRfLODwPYjzw1hFoAz88de5M38EGYTsP17+OT5YwuQqgwF4PdS6Aq4AKqVxKSWLUQ8SmHFm5RkiTFd0RhywtKKpAgpX6NglKVQoiio1DcqgbBE0+S0oIqoeumsLh1o0Ovd3sKPBU0FUQjzsucErh25ENnvpy54E/BnEbi/eWEUag8ICUYPAOBL4H22g3v45N6DQRPT6tXLNIHO33zujQ+/NJM/n06tGqnJGCmw2ftqB85HOzBejN6YoDULo8D2/KiJudiBFw+4hbnv/Tp3T+gSKsucbBcN5Y5u9Pq12eyTNVFELCqRd8Md9m9va/PJt4OB4jyXfYpqVbsvU0U+WMblq59qoBZ+oUh6krdOG8buxJ5PI3iG7FlDm/O4lv8YXYfVIbGf9uEmJAwmgrCYyphb4Ng39VlFC/yDM7x69gtp/BDRAsGYh/ADOISRhJgNSYGKJESRhuT9feTa+wvZp/vnX8/A+eg6n8DIkaUqM3bHTPgZXo6Gw6F5ojcWhOZ7pm5y0F5QgyuJlBsukkvxj0PukIeQDcOKxLjk/GFRe+vYKN1IKedpjovWgVdwpMAYmUKhsY/jpEJS7Oiu4OJKKl48HReTFBcxr5jSv7S34ewmhjtNOuB3v8CZ+rFAonChHaJV9T506FqGLuTdOUNVJk8xdCEXGNYo6Gp7laELaco4FHrWvnpit2wXyY4gj7H1zLveUyNskeCaxvjoINOrk1ngeh/8ZrU+RBMTAnfiBq7vuO0srPG6F6PZePYWZj6M3akbueDYoWOP3ZOheOSN82moLXQ0Mf9VUdoxl0qSvBKxbgsLpCIKLSi5pHomXSp1j/4vxZ6xJSgVZfUA/D/67ZM6eVWOJdyV1Yq399AepQPN9ReRfkwlFwq40E8iZyD4Rl5oiwPJP2uJ43ofS7S+hkPvh5/t6VRHudAbOuWVoMgSY2haQNmaKjRe7P9NjJFpwTLn8QMmxkvTggRz1OuvTAuIiDO6xsR4bTZCti9n1xMnV1RbrftFMOYb1hsHsy8H55267u7KftNqVxDyrvd3AAAA//9n5IHF2AoAAA==\"")
		packr.PackJSONBytes("./sql", "20180103142001_initial_schema.sql", "\"H4sIAAAAAAAA/6RXXZPaNhR951fc2YcGp+ZjSdJmsm1mHPAmnhCTYpNknxghX4y6tuRKMizt9L93ZBuwgWXTlslDLB2d+6Gje+/2nrfgOQxFtpUsXmkY9K9fQ7hC8Mk9SQk4uV4JqVpQ4MaMIlcYQc4jlKBXCE5G6Ap3OzZ8QamY4DDo9qFtAFfV1pV1Yyi2IoeUbIELDblC0CumYMkSBHygmGlgHKhIs4QRThE2TK8KOxVL13DcVRxioQnjQICKbAtiWQcC0ZXTK62zN73eZrPpksLZrpBxLylhqjf2hq4fuJ1Bt18dmPEElQKJf+RMYgSLLZAsSxgliwQhIRsQEkgsESPQwji8kUwzHtugxFJviERDEzGlJVvkupGvnXtMNQCCA+Fw5QTgBVfwzgm8wDYkX73ww2QWwldnOnX80HMDmExhOPFHXuhN/AAmt+D4d/DR80c2INMrlIAPmTQRCAnMZBKjIm0BYsOFpShdUhlStmQUEsLjnMQIsVij5IzHkKFMmTI3qoDwyNAkLGWa6GLpJC5jqNdqdTrwY8piSTTCLGsNp64TuhA678YueLfgT0Jwv3lBGBgNSAXtFgDA56n3yZnewUf3DtossuxWscwiqP1mM290+DJM/mw8tgukIeMkxXLvizMdfnCm7evBawtMzoJw6nh+WNqc78Dze9zCzPd+m7lHdBFTWUK285JyRzd49coq98maaCLnuUzq5g77nU4hPvWm19NCJKrLUC8L9a10mvQWNHv5cwE0iZ9rEh/5bdyGkXvrzMYhPEP+rKRNBC3S30QXZo1J7MZduAoIh1tJOGWKChuGzlVxVrMU/xQcL579TEo9hCxFaM8C+AGGhJOIWCVJippERJOS5N1d6Dr7C9m7+9ffz2D4wR1+hHaCPNar9u6YBb/Ai0G/37eO8o0pYcmeqe4cVBdU4jKi1EbI6Jz9pskd8mCyZFgSigsh7ueFtppCqVuKhYgTnFcKvIAjKVLkGqXBPo5TGkm6o7uAo7nSIn3aLkYxzqnIuTZfRttwchP9XU5q4Le/wkn2qUSicW4UYrLqva/RVQx1yNtThjyLnmKoQ84wrFGy5fYiQx1ShnEI9OT5mopdsZ0la0AeY2tZN62nStg8wjWj+GghM6u3k6nrvffL1eIQiyyYurfu1PWHblULC7x5i+FkNHkDEx9G7tgNXRg6wdAZuUdFsaGN02poJNSomP8qKKOYcyEpkUtqnoUNShONNmRCMVOTzoW6R/+XYE/YIlSa8aIA/p/87Z066irNFO7CqpK319AeZQzNzERkmqkSUoOQpiUKDlJs1JlncSD5vifRjPcxR4trOLz94JMzHhsrZ96GcXkpGfKo3bdsYHzNNLav9/+N2gPLhkUi6D1G7ReWDREmaNZfWjYQSVdsjVH7lVUmsuqcdU0cXdFTUuNCm3ZT9rRLD6g5CByPAueGgXntyGW0yhe/I9X73Wb3OUZTwTXyA7rZgy52weqo6UjXP51pglREWHdzf5XHbpefnQ74GBPN1ghrkuSogEiEYKs0piBRoVwX85+JEc24dsiJyYgNj/4M9Ww8LqRd8aWoFIlRnWkYxxX2e5qGEUanAwlTuqECVdgkxRWCXhFdxGT+ZKikaEZbfMjMeF6UIGnGb1hKkQKBmK2RgzeCNs2lEtLq7tTn+SP32wX1zSvNlP8eTPFoirPat4FFle/7MXckNrw1mk4+HzR+xsLNeci+2l7aL1vMBYS6af0TAAD//0vLM27QDQAA\"")
		}