diff --git a/README.md b/README.md index 1fa84ba..1c72ab1 100644 --- a/README.md +++ b/README.md @@ -813,6 +813,7 @@ function main() { request.setAlert(alert); request.setThreadid("threadID"); request.setContentavailable(false); + request.setMutablecontent(false); client.send(request, function (err, response) { if(err) { console.log(err); diff --git a/rpc/example/node/client.js b/rpc/example/node/client.js index f6f16e8..e487b2d 100644 --- a/rpc/example/node/client.js +++ b/rpc/example/node/client.js @@ -19,6 +19,7 @@ function main() { request.setAlert(alert); request.setThreadid("threadID"); request.setContentavailable(false); + request.setMutablecontent(false); client.send(request, function (err, response) { if(err) { console.log(err); diff --git a/rpc/example/node/gorush_pb.js b/rpc/example/node/gorush_pb.js index 7a05ae2..a29e726 100644 --- a/rpc/example/node/gorush_pb.js +++ b/rpc/example/node/gorush_pb.js @@ -501,7 +501,8 @@ proto.proto.NotificationRequest.toObject = function(includeInstance, msg) { alert: (f = msg.getAlert()) && proto.proto.Alert.toObject(includeInstance, f), sound: jspb.Message.getFieldWithDefault(msg, 10, ""), contentavailable: jspb.Message.getFieldWithDefault(msg, 11, false), - threadid: jspb.Message.getFieldWithDefault(msg, 12, "") + threadid: jspb.Message.getFieldWithDefault(msg, 12, ""), + mutablecontent: jspb.Message.getFieldWithDefault(msg, 13, false) }; if (includeInstance) { @@ -587,6 +588,10 @@ proto.proto.NotificationRequest.deserializeBinaryFromReader = function(msg, read var value = /** @type {string} */ (reader.readString()); msg.setThreadid(value); break; + case 13: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setMutablecontent(value); + break; default: reader.skipField(); break; @@ -700,6 +705,13 @@ proto.proto.NotificationRequest.serializeBinaryToWriter = function(message, writ f ); } + f = message.getMutablecontent(); + if (f) { + writer.writeBool( + 13, + f + ); + } }; @@ -916,6 +928,23 @@ proto.proto.NotificationRequest.prototype.setThreadid = function(value) { }; +/** + * optional bool mutableContent = 13; + * Note that Boolean fields may be set to 0/1 when serialized from a Java server. + * You should avoid comparisons like {@code val === true/false} in those cases. + * @return {boolean} + */ +proto.proto.NotificationRequest.prototype.getMutablecontent = function() { + return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 13, false)); +}; + + +/** @param {boolean} value */ +proto.proto.NotificationRequest.prototype.setMutablecontent = function(value) { + jspb.Message.setField(this, 13, value); +}; + + /** * Generated by JsPbCodeGenerator. diff --git a/rpc/proto/gorush.pb.go b/rpc/proto/gorush.pb.go index e052e4a..9eec24a 100644 --- a/rpc/proto/gorush.pb.go +++ b/rpc/proto/gorush.pb.go @@ -163,6 +163,7 @@ type NotificationRequest struct { Sound string `protobuf:"bytes,10,opt,name=sound" json:"sound,omitempty"` ContentAvailable bool `protobuf:"varint,11,opt,name=contentAvailable" json:"contentAvailable,omitempty"` ThreadID string `protobuf:"bytes,12,opt,name=threadID" json:"threadID,omitempty"` + MutableContent bool `protobuf:"varint,13,opt,name=mutableContent" json:"mutableContent,omitempty"` } func (m *NotificationRequest) Reset() { *m = NotificationRequest{} } @@ -254,6 +255,13 @@ func (m *NotificationRequest) GetThreadID() string { return "" } +func (m *NotificationRequest) GetMutableContent() bool { + if m != nil { + return m.MutableContent + } + return false +} + type NotificationReply struct { Success bool `protobuf:"varint,1,opt,name=success" json:"success,omitempty"` Counts int32 `protobuf:"varint,2,opt,name=counts" json:"counts,omitempty"` @@ -458,40 +466,41 @@ var _Health_serviceDesc = grpc.ServiceDesc{ func init() { proto1.RegisterFile("gorush.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 546 bytes of a gzipped FileDescriptorProto + // 562 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xcb, 0x8e, 0xda, 0x30, - 0x14, 0x9d, 0x00, 0xe1, 0x71, 0xa1, 0x2d, 0xf5, 0x54, 0x95, 0xcb, 0x0a, 0x65, 0x85, 0xba, 0x60, - 0x41, 0x77, 0x5d, 0x8c, 0x8a, 0xda, 0xd1, 0x0c, 0x9a, 0x2a, 0x23, 0x85, 0x3e, 0x96, 0x95, 0x31, - 0x9e, 0x10, 0x61, 0xe2, 0x34, 0x76, 0x46, 0xe2, 0x3b, 0xfa, 0x09, 0xfd, 0xa6, 0xfe, 0x4f, 0xe5, - 0xeb, 0x98, 0x82, 0xca, 0xac, 0xe2, 0x73, 0xee, 0xc3, 0xc7, 0xe7, 0xde, 0xc0, 0x20, 0x55, 0x65, - 0xa5, 0x37, 0xd3, 0xa2, 0x54, 0x46, 0x91, 0x10, 0x3f, 0xd1, 0xef, 0x06, 0x84, 0x73, 0x29, 0x4a, - 0x43, 0x5e, 0x41, 0x68, 0x32, 0x23, 0x05, 0x0d, 0xc6, 0xc1, 0xa4, 0x97, 0x38, 0x40, 0x08, 0xb4, - 0x56, 0x6a, 0xbd, 0xa7, 0x0d, 0x24, 0xf1, 0x4c, 0x46, 0xd0, 0xd5, 0xd5, 0xca, 0x25, 0x37, 0x91, - 0x3f, 0x60, 0xf2, 0x1a, 0xda, 0x8c, 0x9b, 0x4c, 0xe5, 0xb4, 0x85, 0x91, 0x1a, 0x91, 0x08, 0x06, - 0xee, 0xf4, 0x59, 0xf1, 0x3b, 0xb1, 0xa7, 0x21, 0x46, 0x4f, 0x38, 0x32, 0x86, 0xbe, 0x64, 0x55, - 0xce, 0x37, 0x8b, 0x1d, 0x4b, 0x05, 0x6d, 0x63, 0xca, 0x31, 0x65, 0xbb, 0x4b, 0x57, 0xdf, 0x71, - 0xdd, 0xe5, 0xa1, 0x12, 0xaf, 0xaf, 0x9b, 0x77, 0x5d, 0xe5, 0x11, 0x45, 0x28, 0x74, 0xa4, 0xe2, - 0xf3, 0x32, 0xd5, 0xb4, 0x37, 0x6e, 0x4e, 0x7a, 0x89, 0x87, 0x56, 0x99, 0x4f, 0xc4, 0x30, 0x60, - 0xf8, 0x84, 0x8b, 0xfe, 0x34, 0xe0, 0x32, 0x56, 0x26, 0x7b, 0xc8, 0x38, 0xb3, 0x82, 0x13, 0xf1, - 0xb3, 0x12, 0xda, 0x58, 0x3d, 0x46, 0x6d, 0x45, 0xae, 0x69, 0x80, 0x55, 0x35, 0xb2, 0x0e, 0x15, - 0x92, 0x99, 0x07, 0x55, 0xee, 0xd0, 0xb9, 0x30, 0x39, 0x60, 0xab, 0x64, 0x27, 0xb4, 0xb6, 0x2f, - 0x74, 0xe6, 0x79, 0xf8, 0x6f, 0x02, 0xad, 0xe3, 0x09, 0x58, 0x56, 0x15, 0x19, 0xaf, 0x2d, 0x73, - 0x80, 0x0c, 0xa1, 0xb9, 0x15, 0xfb, 0xda, 0x23, 0x7b, 0xb4, 0x79, 0x2b, 0xb6, 0x4e, 0x05, 0x5a, - 0x13, 0x26, 0x0e, 0x58, 0x25, 0x9c, 0x19, 0x91, 0xaa, 0xd2, 0xdb, 0x72, 0xc0, 0x24, 0x82, 0x90, - 0xd9, 0xd1, 0xd3, 0xde, 0x38, 0x98, 0xf4, 0x67, 0x03, 0xb7, 0x19, 0x53, 0x5c, 0x87, 0xc4, 0x85, - 0x6c, 0x57, 0xad, 0xaa, 0x7c, 0x4d, 0xc1, 0xdd, 0x8e, 0x80, 0xbc, 0x85, 0x21, 0x57, 0xb9, 0x11, - 0xb9, 0x99, 0x3f, 0xb2, 0x4c, 0xb2, 0x95, 0x14, 0xb4, 0x3f, 0x0e, 0x26, 0xdd, 0xe4, 0x3f, 0xde, - 0x2a, 0x30, 0x9b, 0x52, 0xb0, 0xf5, 0xe2, 0x13, 0x1d, 0x38, 0x05, 0x1e, 0x47, 0xd7, 0xf0, 0xf2, - 0xd4, 0xd6, 0x42, 0xe2, 0xa8, 0x74, 0xc5, 0xb9, 0xd0, 0x1a, 0x57, 0xb1, 0x9b, 0x78, 0x68, 0xed, - 0xe6, 0xaa, 0xca, 0x8d, 0xae, 0x4d, 0xad, 0x51, 0x34, 0x05, 0x72, 0x2b, 0x98, 0x34, 0x9b, 0x8f, - 0x1b, 0xc1, 0xb7, 0x7e, 0x38, 0xb6, 0x8f, 0x28, 0x1f, 0x33, 0xee, 0x57, 0xda, 0xc3, 0xe8, 0x57, - 0x00, 0x97, 0x27, 0x05, 0xba, 0x50, 0xb9, 0x16, 0xe4, 0x03, 0xb4, 0xb5, 0x61, 0xa6, 0x72, 0x17, - 0x3f, 0x9f, 0x4d, 0x6a, 0x47, 0xce, 0xe4, 0x4e, 0x97, 0xb6, 0x57, 0x9e, 0x2e, 0x31, 0x3f, 0xa9, - 0xeb, 0xa2, 0xf7, 0xf0, 0xec, 0x24, 0x40, 0xfa, 0xd0, 0xf9, 0x1a, 0xdf, 0xc5, 0xf7, 0xdf, 0xe3, - 0xe1, 0x85, 0x05, 0xcb, 0xeb, 0xe4, 0xdb, 0x22, 0xbe, 0x19, 0x06, 0xe4, 0x05, 0xf4, 0xe3, 0xfb, - 0x2f, 0x3f, 0x3c, 0xd1, 0x98, 0xdd, 0x42, 0xfb, 0x06, 0xff, 0x50, 0x72, 0x05, 0xad, 0xa5, 0xc8, - 0xd7, 0x64, 0x54, 0xdf, 0x7f, 0x66, 0xf5, 0x46, 0xf4, 0x6c, 0xac, 0x90, 0xfb, 0xe8, 0xc2, 0x76, - 0x72, 0x92, 0xc9, 0x15, 0x84, 0x28, 0x9b, 0xbc, 0x39, 0xf7, 0x14, 0xd7, 0x69, 0xf4, 0xf4, 0x2b, - 0x57, 0x6d, 0x0c, 0xbd, 0xfb, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xce, 0xb3, 0x89, 0xca, 0x3c, 0x04, + 0x14, 0x9d, 0x00, 0xe1, 0x71, 0x61, 0xa6, 0xd4, 0x53, 0x55, 0x2e, 0x2b, 0x94, 0x45, 0x85, 0xba, + 0x60, 0x41, 0x77, 0x5d, 0x8c, 0x8a, 0xa6, 0xa3, 0x19, 0x34, 0x55, 0x46, 0x0a, 0x7d, 0x2c, 0x2b, + 0x63, 0x3c, 0x21, 0xc2, 0xc4, 0x69, 0xec, 0x8c, 0xc4, 0x77, 0xf4, 0x13, 0xfa, 0x9d, 0x95, 0x2a, + 0x5f, 0x27, 0x94, 0xb4, 0x74, 0x15, 0x9f, 0x73, 0x1f, 0x3e, 0x3e, 0xf7, 0x06, 0x06, 0xb1, 0xca, + 0x0b, 0xbd, 0x99, 0x66, 0xb9, 0x32, 0x8a, 0xf8, 0xf8, 0x09, 0x7e, 0x36, 0xc0, 0x9f, 0x4b, 0x91, + 0x1b, 0xf2, 0x02, 0x7c, 0x93, 0x18, 0x29, 0xa8, 0x37, 0xf6, 0x26, 0xbd, 0xc8, 0x01, 0x42, 0xa0, + 0xb5, 0x52, 0xeb, 0x3d, 0x6d, 0x20, 0x89, 0x67, 0x32, 0x82, 0xae, 0x2e, 0x56, 0x2e, 0xb9, 0x89, + 0xfc, 0x01, 0x93, 0x97, 0xd0, 0x66, 0xdc, 0x24, 0x2a, 0xa5, 0x2d, 0x8c, 0x94, 0x88, 0x04, 0x30, + 0x70, 0xa7, 0x8f, 0x8a, 0xdf, 0x8b, 0x3d, 0xf5, 0x31, 0x5a, 0xe3, 0xc8, 0x18, 0xfa, 0x92, 0x15, + 0x29, 0xdf, 0x2c, 0x76, 0x2c, 0x16, 0xb4, 0x8d, 0x29, 0xc7, 0x94, 0xed, 0x2e, 0x5d, 0x7d, 0xc7, + 0x75, 0x97, 0x87, 0x4a, 0xbc, 0xbe, 0x6c, 0xde, 0x75, 0x95, 0x47, 0x14, 0xa1, 0xd0, 0x91, 0x8a, + 0xcf, 0xf3, 0x58, 0xd3, 0xde, 0xb8, 0x39, 0xe9, 0x45, 0x15, 0xb4, 0xca, 0xaa, 0x44, 0x0c, 0x03, + 0x86, 0x6b, 0x5c, 0xf0, 0xab, 0x01, 0x97, 0xa1, 0x32, 0xc9, 0x63, 0xc2, 0x99, 0x15, 0x1c, 0x89, + 0xef, 0x85, 0xd0, 0xc6, 0xea, 0x31, 0x6a, 0x2b, 0x52, 0x4d, 0x3d, 0xac, 0x2a, 0x91, 0x75, 0x28, + 0x93, 0xcc, 0x3c, 0xaa, 0x7c, 0x87, 0xce, 0xf9, 0xd1, 0x01, 0x5b, 0x25, 0x3b, 0xa1, 0xb5, 0x7d, + 0xa1, 0x33, 0xaf, 0x82, 0x7f, 0x26, 0xd0, 0x3a, 0x9e, 0x80, 0x65, 0x55, 0x96, 0xf0, 0xd2, 0x32, + 0x07, 0xc8, 0x10, 0x9a, 0x5b, 0xb1, 0x2f, 0x3d, 0xb2, 0x47, 0x9b, 0xb7, 0x62, 0xeb, 0x58, 0xa0, + 0x35, 0x7e, 0xe4, 0x80, 0x55, 0xc2, 0x99, 0x11, 0xb1, 0xca, 0x2b, 0x5b, 0x0e, 0x98, 0x04, 0xe0, + 0x33, 0x3b, 0x7a, 0xda, 0x1b, 0x7b, 0x93, 0xfe, 0x6c, 0xe0, 0x36, 0x63, 0x8a, 0xeb, 0x10, 0xb9, + 0x90, 0xed, 0xaa, 0x55, 0x91, 0xae, 0x29, 0xb8, 0xdb, 0x11, 0x90, 0x37, 0x30, 0xe4, 0x2a, 0x35, + 0x22, 0x35, 0xf3, 0x27, 0x96, 0x48, 0xb6, 0x92, 0x82, 0xf6, 0xc7, 0xde, 0xa4, 0x1b, 0xfd, 0xc3, + 0x5b, 0x05, 0x66, 0x93, 0x0b, 0xb6, 0x5e, 0x7c, 0xa0, 0x03, 0xa7, 0xa0, 0xc2, 0xe4, 0x35, 0x5c, + 0xec, 0x0a, 0x63, 0xd3, 0xae, 0x5d, 0x19, 0x3d, 0xc7, 0x2e, 0x7f, 0xb1, 0xc1, 0x0d, 0x3c, 0xaf, + 0xdb, 0x9f, 0x49, 0x1c, 0xa9, 0x2e, 0x38, 0x17, 0x5a, 0xe3, 0xca, 0x76, 0xa3, 0x0a, 0xda, 0xb1, + 0x70, 0x55, 0xa4, 0x46, 0x97, 0xe6, 0x97, 0x28, 0x98, 0x02, 0xb9, 0x13, 0x4c, 0x9a, 0xcd, 0xf5, + 0x46, 0xf0, 0x6d, 0x35, 0x44, 0xdb, 0x47, 0xe4, 0x4f, 0x09, 0xaf, 0x56, 0xbf, 0x82, 0xc1, 0x0f, + 0x0f, 0x2e, 0x6b, 0x05, 0x3a, 0x53, 0xa9, 0x16, 0xe4, 0x3d, 0xb4, 0xb5, 0x61, 0xa6, 0x70, 0x17, + 0x5f, 0xcc, 0x26, 0xa5, 0x73, 0x27, 0x72, 0xa7, 0x4b, 0xdb, 0x2b, 0x8d, 0x97, 0x98, 0x1f, 0x95, + 0x75, 0xc1, 0x3b, 0x38, 0xaf, 0x05, 0x48, 0x1f, 0x3a, 0x9f, 0xc3, 0xfb, 0xf0, 0xe1, 0x6b, 0x38, + 0x3c, 0xb3, 0x60, 0x79, 0x13, 0x7d, 0x59, 0x84, 0xb7, 0x43, 0x8f, 0x3c, 0x83, 0x7e, 0xf8, 0xf0, + 0xe9, 0x5b, 0x45, 0x34, 0x66, 0x77, 0xd0, 0xbe, 0xc5, 0x3f, 0x99, 0x5c, 0x41, 0x6b, 0x29, 0xd2, + 0x35, 0x19, 0x95, 0xf7, 0x9f, 0x58, 0xd1, 0x11, 0x3d, 0x19, 0xcb, 0xe4, 0x3e, 0x38, 0xb3, 0x9d, + 0x9c, 0x64, 0x72, 0x05, 0x3e, 0xca, 0x26, 0xaf, 0x4e, 0x3d, 0xc5, 0x75, 0x1a, 0xfd, 0xff, 0x95, + 0xab, 0x36, 0x86, 0xde, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xb1, 0x58, 0xde, 0x64, 0x04, 0x00, 0x00, } diff --git a/rpc/proto/gorush.proto b/rpc/proto/gorush.proto index 0847f49..a85dce0 100644 --- a/rpc/proto/gorush.proto +++ b/rpc/proto/gorush.proto @@ -28,6 +28,7 @@ message NotificationRequest { string sound = 10; bool contentAvailable = 11; string threadID = 12; + bool mutableContent = 13; } message NotificationReply { diff --git a/rpc/server.go b/rpc/server.go index a43b876..b958de6 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -60,6 +60,7 @@ func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*prot Sound: in.Sound, ContentAvailable: in.ContentAvailable, ThreadID: in.ThreadID, + MutableContent: in.MutableContent, } if badge > 0 {