diff --git a/pbx/model.pb.go b/pbx/model.pb.go index 2c475a173..ad6318055 100644 --- a/pbx/model.pb.go +++ b/pbx/model.pb.go @@ -1779,7 +1779,7 @@ type ServerPres struct { What ServerPres_What `protobuf:"varint,3,opt,name=what,enum=pbx.ServerPres_What" json:"what,omitempty"` UserAgent string `protobuf:"bytes,4,opt,name=user_agent,json=userAgent" json:"user_agent,omitempty"` SeqId int32 `protobuf:"varint,5,opt,name=seq_id,json=seqId" json:"seq_id,omitempty"` - SeqList []int32 `protobuf:"varint,6,rep,packed,name=seq_list,json=seqList" json:"seq_list,omitempty"` + DelSeq []*DelQuery `protobuf:"bytes,6,rep,name=del_seq,json=delSeq" json:"del_seq,omitempty"` TargetUserId string `protobuf:"bytes,7,opt,name=target_user_id,json=targetUserId" json:"target_user_id,omitempty"` ActorUserId string `protobuf:"bytes,8,opt,name=actor_user_id,json=actorUserId" json:"actor_user_id,omitempty"` Acs *AccessMode `protobuf:"bytes,9,opt,name=acs" json:"acs,omitempty"` @@ -1825,9 +1825,9 @@ func (m *ServerPres) GetSeqId() int32 { return 0 } -func (m *ServerPres) GetSeqList() []int32 { +func (m *ServerPres) GetDelSeq() []*DelQuery { if m != nil { - return m.SeqList + return m.DelSeq } return nil } @@ -2777,149 +2777,148 @@ var _Plugin_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("model.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2290 bytes of a gzipped FileDescriptorProto + // 2280 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x6f, 0xdb, 0xc8, - 0x15, 0x97, 0x44, 0x91, 0x22, 0x9f, 0x14, 0x9b, 0x99, 0xba, 0x1b, 0xad, 0x17, 0xd9, 0x24, 0xcc, - 0x6e, 0x36, 0x70, 0x76, 0xdd, 0x6d, 0xd2, 0xb4, 0xdb, 0x3f, 0x17, 0xc5, 0x52, 0x6c, 0x21, 0xb6, - 0xa5, 0x52, 0xf6, 0x16, 0x28, 0x0a, 0x08, 0x14, 0x39, 0x96, 0x88, 0xa5, 0x48, 0x89, 0x1c, 0x2a, - 0x09, 0x50, 0xf4, 0xd6, 0xc3, 0xf6, 0x13, 0x14, 0xe8, 0xbd, 0x97, 0xf6, 0xd0, 0xcf, 0xd1, 0x5e, - 0x7b, 0xe9, 0xc7, 0xe8, 0xbd, 0x87, 0xe2, 0xcd, 0x0c, 0x29, 0x8a, 0x8e, 0x77, 0xd5, 0x3f, 0x17, - 0x61, 0xe6, 0xbd, 0xa7, 0x37, 0xef, 0xdf, 0xfc, 0xde, 0x1b, 0x42, 0x73, 0x1e, 0x79, 0x34, 0x38, - 0x5c, 0xc4, 0x11, 0x8b, 0x88, 0xb2, 0x98, 0xbc, 0xb1, 0x74, 0xd0, 0x2e, 0xc3, 0x34, 0xa1, 0x9e, - 0xf5, 0x05, 0xec, 0x74, 0xe9, 0x95, 0x93, 0x06, 0xac, 0xe3, 0x26, 0x67, 0x91, 0x47, 0x09, 0x81, - 0xba, 0x93, 0xb2, 0x59, 0xbb, 0x7a, 0xbf, 0xfa, 0xd8, 0xb0, 0xf9, 0x9a, 0xd3, 0xc2, 0x28, 0x6c, - 0xd7, 0x24, 0x2d, 0x8c, 0x42, 0xeb, 0x87, 0x00, 0x1d, 0xd7, 0xa5, 0x49, 0xfe, 0xaf, 0xd7, 0x4e, - 0xc8, 0xb2, 0x7f, 0xe1, 0x9a, 0xec, 0x81, 0x3a, 0xf5, 0x57, 0x34, 0xfb, 0x9b, 0xd8, 0x58, 0xcf, - 0x41, 0x1b, 0x51, 0x36, 0x4a, 0x27, 0xe4, 0x0e, 0x34, 0xd2, 0x84, 0xc6, 0x63, 0xdf, 0x93, 0x7f, - 0xd3, 0x70, 0xdb, 0xf7, 0x50, 0x19, 0x9a, 0x9c, 0x1d, 0x87, 0x6b, 0x6b, 0x09, 0x8d, 0x11, 0x65, - 0x5d, 0x9a, 0xb8, 0xe4, 0x07, 0xd0, 0xf4, 0x84, 0xcd, 0x63, 0xc7, 0x4d, 0xf8, 0x7f, 0x9b, 0x4f, - 0xbf, 0x73, 0xb8, 0x98, 0xbc, 0x39, 0xdc, 0xf4, 0xc5, 0x06, 0x2f, 0xdf, 0x93, 0xf7, 0x40, 0x5b, - 0xa4, 0x93, 0xc0, 0x77, 0xb9, 0xda, 0x96, 0x2d, 0x77, 0xa4, 0x0d, 0x8d, 0x45, 0xec, 0xaf, 0x1c, - 0x46, 0xdb, 0x0a, 0x67, 0x64, 0x5b, 0xeb, 0x15, 0x34, 0x8e, 0x29, 0x1b, 0x2c, 0x58, 0x42, 0x0e, - 0xe0, 0xb6, 0x7f, 0x35, 0x9e, 0x47, 0x9e, 0x7f, 0xe5, 0x53, 0x6f, 0x9c, 0xf8, 0xa1, 0x4b, 0xf9, - 0xc1, 0x8a, 0xbd, 0xeb, 0x5f, 0x9d, 0x49, 0xfa, 0x08, 0xc9, 0xe8, 0x76, 0xe0, 0xcf, 0x7d, 0xc6, - 0xcf, 0x51, 0x6d, 0xb1, 0xb1, 0x7e, 0x09, 0xf0, 0x22, 0x8e, 0x5e, 0x27, 0x94, 0xeb, 0x7b, 0x1f, - 0x74, 0xae, 0x23, 0xf3, 0x5d, 0xb5, 0x1b, 0x7c, 0xdf, 0xf7, 0xc8, 0x07, 0x60, 0x4c, 0xe8, 0x55, - 0x14, 0x73, 0x9e, 0xc2, 0x79, 0xba, 0x20, 0xf4, 0xbd, 0xb5, 0x6e, 0xb5, 0xa8, 0xfb, 0xb7, 0x55, - 0xd0, 0x8f, 0x29, 0xfb, 0x79, 0x4a, 0xe3, 0xb7, 0x3c, 0x13, 0x33, 0x67, 0x9d, 0x89, 0x99, 0xc3, - 0xc8, 0x7d, 0xa8, 0x7b, 0x34, 0x11, 0x9e, 0x37, 0x9f, 0xb6, 0x78, 0xa8, 0xa4, 0x6b, 0x36, 0xe7, - 0x90, 0x0f, 0x41, 0x49, 0xd2, 0x09, 0x3f, 0xaf, 0x2c, 0x80, 0x0c, 0xf2, 0x10, 0xea, 0x9e, 0xc3, - 0x9c, 0x76, 0x9d, 0x0b, 0xec, 0x72, 0x81, 0xb5, 0x3f, 0x36, 0x67, 0x5a, 0xaf, 0x40, 0x1f, 0x65, - 0x66, 0x64, 0x47, 0x56, 0x0b, 0x1a, 0x65, 0x02, 0xe5, 0x91, 0x77, 0xc5, 0x91, 0xc2, 0xa6, 0x66, - 0x26, 0x30, 0x4a, 0x27, 0xfc, 0x44, 0xeb, 0x53, 0x54, 0xb6, 0xb4, 0x9d, 0x70, 0x4a, 0x89, 0x09, - 0x4a, 0x10, 0xbd, 0x96, 0x91, 0xc2, 0x25, 0xd9, 0x81, 0xda, 0xcc, 0x97, 0x11, 0xae, 0xcd, 0x7c, - 0x6b, 0x04, 0x7a, 0x97, 0x06, 0xe2, 0xe8, 0x3b, 0xa0, 0x25, 0x74, 0x99, 0x87, 0xf6, 0xa4, 0x62, - 0xab, 0x09, 0x5d, 0xf6, 0x3d, 0xf2, 0x31, 0xa8, 0x31, 0xea, 0x93, 0x67, 0xde, 0x92, 0x67, 0x8a, - 0x43, 0x50, 0x8c, 0x73, 0x5f, 0x34, 0x40, 0xed, 0xd2, 0xa0, 0xef, 0x59, 0xbf, 0x06, 0xfd, 0x28, - 0xf0, 0x69, 0xc8, 0x4e, 0x7c, 0x3c, 0x30, 0xaf, 0xd3, 0x9a, 0xef, 0x91, 0xbb, 0x00, 0xbc, 0x78, - 0x9d, 0x29, 0x0d, 0x99, 0xac, 0x54, 0x03, 0x29, 0x1d, 0x24, 0xa0, 0xc5, 0x2b, 0x1a, 0xcb, 0xfc, - 0xe1, 0x12, 0xf3, 0xea, 0xd1, 0x95, 0x2f, 0x72, 0x5e, 0xe7, 0xf2, 0xba, 0x20, 0x88, 0x8a, 0x0f, - 0x9c, 0x70, 0xca, 0xd3, 0x6a, 0xd8, 0x7c, 0x6d, 0xfd, 0xa5, 0x0a, 0x86, 0x38, 0xbe, 0xe3, 0xba, - 0xd7, 0xce, 0x2f, 0x5c, 0x9e, 0xda, 0xc6, 0xe5, 0x79, 0x0f, 0xb4, 0xc4, 0x9d, 0xd1, 0xb9, 0x28, - 0x67, 0xc3, 0x96, 0x3b, 0x4e, 0xa7, 0x6e, 0x4c, 0x19, 0x3f, 0xbc, 0x65, 0xcb, 0x1d, 0x2f, 0xa9, - 0x68, 0xea, 0x87, 0xfc, 0x6c, 0xdd, 0x16, 0x1b, 0x34, 0x88, 0x39, 0xd3, 0xa4, 0xad, 0xdd, 0x57, - 0xd0, 0x20, 0x5c, 0xe7, 0x29, 0x6d, 0xdc, 0x94, 0x52, 0xeb, 0x0c, 0x9a, 0xc2, 0xe2, 0x53, 0xae, - 0xa4, 0x6c, 0xf3, 0xda, 0xb4, 0xda, 0x0d, 0xa6, 0x29, 0x45, 0xd3, 0xac, 0xaf, 0xf3, 0x08, 0x20, - 0x5c, 0x94, 0xb5, 0xed, 0x81, 0xca, 0xa2, 0x85, 0xbc, 0xcf, 0x86, 0x2d, 0x36, 0xe4, 0x00, 0x8c, - 0x84, 0xb2, 0xf1, 0x12, 0x2b, 0x41, 0x96, 0x73, 0x96, 0x67, 0x51, 0x99, 0xb6, 0x9e, 0x64, 0x35, - 0x7a, 0x00, 0xc6, 0x34, 0x97, 0xad, 0x17, 0x64, 0x8f, 0x73, 0xd9, 0xa9, 0x5c, 0x59, 0xfd, 0xdc, - 0x35, 0xea, 0xac, 0xe8, 0x96, 0xc6, 0xec, 0x81, 0x9a, 0x86, 0xd9, 0xbd, 0xd2, 0x6d, 0xb1, 0xb1, - 0xfe, 0x96, 0xbb, 0x35, 0xdc, 0xda, 0xad, 0x3b, 0xd0, 0x08, 0xa3, 0x31, 0x75, 0x67, 0x91, 0xd4, - 0xa5, 0x85, 0x51, 0xcf, 0x9d, 0x45, 0xe4, 0x53, 0xa8, 0xcf, 0xa8, 0x83, 0x15, 0xa5, 0x3c, 0x6e, - 0x3e, 0x6d, 0x73, 0xf3, 0x73, 0xe5, 0x87, 0x27, 0xd4, 0xf1, 0x7a, 0x21, 0x8b, 0xdf, 0xda, 0x5c, - 0x0a, 0xc1, 0xce, 0x8d, 0x42, 0x86, 0x25, 0xab, 0x0a, 0xb0, 0x93, 0xdb, 0xfd, 0x1f, 0x81, 0x91, - 0x0b, 0x63, 0xf5, 0x7e, 0x45, 0xdf, 0x4a, 0xa3, 0x70, 0x89, 0x56, 0xad, 0x9c, 0x20, 0xcd, 0x32, - 0x27, 0x36, 0x3f, 0xa9, 0x7d, 0x51, 0xb5, 0xbe, 0xcc, 0x9c, 0x39, 0xa6, 0x6c, 0x4b, 0x67, 0x1e, - 0x82, 0x7a, 0x3d, 0x3f, 0x79, 0xcc, 0x05, 0x6f, 0xad, 0x77, 0xf4, 0xbf, 0xe9, 0x1d, 0x95, 0xf4, - 0xfe, 0x3d, 0x8f, 0x7e, 0x97, 0x06, 0x5b, 0x2a, 0xfe, 0x44, 0x62, 0x2a, 0xea, 0xdd, 0x91, 0xad, - 0x26, 0xd7, 0x71, 0xf8, 0x8b, 0x99, 0xc3, 0x24, 0xd0, 0x3e, 0x82, 0x86, 0x47, 0x83, 0x71, 0x42, - 0x97, 0x32, 0x21, 0xb7, 0x64, 0x5b, 0x12, 0xd0, 0x64, 0x6b, 0x1e, 0x0d, 0x46, 0x74, 0x59, 0xbc, - 0xbd, 0x6a, 0xb9, 0xf5, 0xcd, 0x9c, 0xd8, 0x6b, 0x6b, 0x3c, 0xc9, 0x7c, 0x6d, 0x3d, 0x84, 0x3a, - 0x1e, 0x41, 0x1a, 0xa0, 0x9c, 0x8d, 0x8e, 0xcd, 0x0a, 0x31, 0x40, 0xbd, 0x18, 0x0c, 0xfb, 0x47, - 0x66, 0x15, 0x69, 0xa3, 0xcb, 0x17, 0x66, 0xcd, 0xfa, 0x15, 0x80, 0xb0, 0xe8, 0x3c, 0x62, 0x74, - 0xed, 0x46, 0xb5, 0xe8, 0xc6, 0x03, 0xe9, 0x46, 0x8d, 0xbb, 0x21, 0x4c, 0xeb, 0x87, 0x57, 0x11, - 0xfe, 0x45, 0x3a, 0xf0, 0xdd, 0x1c, 0x3b, 0x05, 0x74, 0x09, 0xe4, 0xb4, 0x7e, 0xa7, 0x64, 0x41, - 0x3b, 0x4b, 0xa6, 0xe4, 0x1e, 0x07, 0xdf, 0x6a, 0x21, 0xc8, 0x19, 0x4c, 0x9e, 0x54, 0x10, 0x8d, - 0x89, 0x05, 0x8a, 0xe3, 0x66, 0xed, 0x66, 0xa7, 0x20, 0xd1, 0x71, 0xdd, 0x93, 0x8a, 0x8d, 0x4c, - 0xf2, 0x38, 0xc3, 0x1d, 0x91, 0x2c, 0xb3, 0x20, 0xc5, 0xd1, 0x03, 0xf1, 0x58, 0x60, 0x91, 0x25, - 0x1a, 0x45, 0xfd, 0x9a, 0xb6, 0x51, 0x3a, 0x41, 0x6d, 0xd8, 0x9f, 0x50, 0x1b, 0x5e, 0x4c, 0x1e, - 0xce, 0x92, 0x36, 0xa4, 0x73, 0x6d, 0xfc, 0xe6, 0x5a, 0xa0, 0x2c, 0xd2, 0x09, 0x0f, 0xf0, 0xa6, - 0xb6, 0xa1, 0xd0, 0xb6, 0x48, 0x27, 0x28, 0x33, 0xa5, 0x4c, 0x02, 0x5d, 0x51, 0xe6, 0x98, 0x32, - 0x94, 0x99, 0x52, 0xc6, 0xad, 0xa2, 0xac, 0xad, 0x5f, 0xb7, 0x4a, 0xc8, 0x24, 0x42, 0xc6, 0xa3, - 0x41, 0xdb, 0xb8, 0x26, 0xd3, 0xa5, 0x01, 0xca, 0x78, 0x34, 0x20, 0x1f, 0x43, 0x3d, 0x8c, 0x18, - 0x6d, 0x43, 0xa1, 0xb3, 0xae, 0x33, 0x79, 0x52, 0xb1, 0x39, 0xfb, 0x85, 0x01, 0x8d, 0x33, 0x9a, - 0x24, 0xce, 0x94, 0x5a, 0x7f, 0xaa, 0x81, 0x71, 0x81, 0x09, 0xed, 0x8a, 0x36, 0x0a, 0x6e, 0x4c, - 0x1d, 0x46, 0xbd, 0xb1, 0xec, 0xfa, 0x8a, 0x6d, 0x48, 0x4a, 0x87, 0xf1, 0x3e, 0xb5, 0xf0, 0x32, - 0x76, 0x4d, 0xb0, 0x25, 0xa5, 0xc3, 0xc8, 0x13, 0xd0, 0x70, 0x46, 0x72, 0x13, 0x99, 0x86, 0x77, - 0x8e, 0x51, 0x52, 0x84, 0x3c, 0xc0, 0xb4, 0x26, 0x1b, 0x33, 0xc0, 0x7a, 0x04, 0xc4, 0xac, 0x26, - 0x85, 0xfa, 0x51, 0x0b, 0xf5, 0x83, 0xf5, 0x1e, 0x53, 0xc7, 0x43, 0xba, 0xc6, 0xe9, 0x1a, 0x6e, - 0x33, 0x86, 0xbb, 0x42, 0x46, 0x23, 0x63, 0xb8, 0xab, 0xbe, 0x87, 0x8a, 0xf0, 0x26, 0xf9, 0x1e, - 0x8f, 0xb0, 0x6a, 0xab, 0x1e, 0xb6, 0xe4, 0xc2, 0x14, 0x67, 0xdc, 0x34, 0xc5, 0xc1, 0xe6, 0x14, - 0xf7, 0x07, 0x05, 0x74, 0x1e, 0x2d, 0xec, 0x21, 0x9b, 0xd1, 0xa8, 0x96, 0xa3, 0x71, 0x17, 0xc0, - 0xa3, 0x01, 0xdd, 0x0c, 0x96, 0xa4, 0x74, 0x18, 0x1e, 0x1e, 0x85, 0x81, 0x1f, 0xd2, 0x0c, 0x83, - 0xc5, 0x6e, 0x9b, 0xb8, 0x14, 0x02, 0xa0, 0xde, 0x14, 0x00, 0x6d, 0x23, 0x00, 0x6b, 0x4f, 0x1b, - 0x37, 0x79, 0xaa, 0x6f, 0x78, 0x5a, 0x04, 0x15, 0x63, 0x03, 0x54, 0x72, 0x34, 0x80, 0x22, 0x1a, - 0xac, 0x53, 0xd5, 0x2c, 0xa6, 0x6a, 0x1d, 0xf8, 0x56, 0x31, 0xf0, 0x1f, 0xc1, 0x4e, 0xe0, 0x24, - 0x6c, 0x9c, 0x50, 0x1a, 0x8e, 0x99, 0x3f, 0xa7, 0xed, 0x5b, 0x3c, 0x3c, 0x2d, 0xa4, 0x8e, 0x28, - 0x0d, 0x2f, 0xfc, 0x39, 0x25, 0xdf, 0x83, 0xbd, 0xb5, 0x54, 0x61, 0x3e, 0xda, 0xe1, 0x07, 0xdf, - 0xce, 0x64, 0x2f, 0xb3, 0x39, 0xc9, 0xfa, 0x6b, 0x15, 0x60, 0x44, 0xe3, 0x15, 0x8d, 0x8f, 0x58, - 0xbc, 0x2d, 0x1c, 0x13, 0xa8, 0xbb, 0xf8, 0x3e, 0x10, 0x10, 0xc5, 0xd7, 0x7c, 0x60, 0xa1, 0x6f, - 0x98, 0x9c, 0xac, 0xf8, 0x9a, 0x3c, 0x03, 0x6d, 0xe1, 0xc4, 0xce, 0x3c, 0x69, 0xab, 0x1c, 0x8c, - 0x3f, 0x90, 0x0d, 0x21, 0x3b, 0xee, 0x70, 0xc8, 0xb9, 0xa2, 0x41, 0x4a, 0xd1, 0xfd, 0x1f, 0x43, - 0xb3, 0x40, 0xfe, 0xb6, 0x56, 0xd8, 0x2a, 0xb6, 0xc2, 0x7f, 0xe5, 0xce, 0x74, 0x1d, 0xe6, 0xdc, - 0x00, 0xc2, 0xf7, 0xa1, 0x75, 0x15, 0x47, 0xf3, 0xf1, 0xe6, 0xf4, 0x06, 0x48, 0xbb, 0x14, 0xe9, - 0xda, 0xac, 0x42, 0xa5, 0x5c, 0x85, 0xeb, 0xbc, 0xd5, 0x8b, 0x79, 0xfb, 0x4c, 0x0e, 0x02, 0xc2, - 0xd5, 0xf7, 0x0b, 0xae, 0xa2, 0x31, 0xdf, 0x34, 0x09, 0x68, 0xff, 0xa7, 0x49, 0xe0, 0x6b, 0x25, - 0x73, 0x7f, 0x18, 0xd3, 0xe4, 0x06, 0xf7, 0x4d, 0x50, 0x92, 0x38, 0xcb, 0x27, 0x2e, 0xc9, 0xe3, - 0x8d, 0xe6, 0xba, 0x57, 0x30, 0x1c, 0xd5, 0x14, 0xbb, 0xeb, 0xe6, 0xcc, 0x5d, 0x2f, 0xcf, 0xdc, - 0x37, 0x60, 0x0f, 0xbe, 0xb5, 0xe8, 0x72, 0x1c, 0xf8, 0x09, 0xe3, 0xe3, 0x2c, 0xbe, 0xb5, 0xe8, - 0xf2, 0xd4, 0x4f, 0x18, 0x16, 0x35, 0x73, 0x62, 0x9c, 0x01, 0xb3, 0x6c, 0x34, 0xb8, 0xd2, 0x96, - 0xa0, 0xca, 0x7c, 0x58, 0x70, 0xcb, 0x71, 0x59, 0x14, 0xe7, 0x42, 0x3a, 0x17, 0x6a, 0x72, 0xa2, - 0x94, 0x91, 0x10, 0x60, 0xdc, 0x0c, 0x01, 0xd6, 0x57, 0xb2, 0x8d, 0x6b, 0x50, 0x1b, 0x9c, 0x9b, - 0x15, 0x6c, 0xdd, 0x83, 0x97, 0x2f, 0xcd, 0x2a, 0x12, 0x2e, 0x3b, 0xa6, 0x82, 0x84, 0xcb, 0x61, - 0xd7, 0xac, 0x13, 0x1d, 0xea, 0xc7, 0x83, 0xf3, 0x9e, 0xa9, 0x22, 0xa9, 0x73, 0x34, 0x32, 0x35, - 0x24, 0x5d, 0xf4, 0xec, 0x33, 0xb3, 0x91, 0x4d, 0x01, 0x3a, 0x92, 0xec, 0x5e, 0xa7, 0x6b, 0x1a, - 0x62, 0x75, 0xf4, 0xa5, 0x09, 0xc8, 0xec, 0xf6, 0x4e, 0xcd, 0xa6, 0xf5, 0xfb, 0xbc, 0x14, 0xcf, - 0x28, 0x73, 0xb6, 0xbc, 0x57, 0x96, 0x1c, 0xf0, 0x95, 0x42, 0xbf, 0xca, 0x1b, 0x8d, 0x7c, 0xb5, - 0xdd, 0xcb, 0x9a, 0xf1, 0x7a, 0xba, 0xc9, 0xd0, 0x55, 0x74, 0xe2, 0x7b, 0xa2, 0xe7, 0xa9, 0xef, - 0x1a, 0x7f, 0x90, 0x63, 0xfd, 0x26, 0xb3, 0x0c, 0x47, 0x8f, 0xff, 0xfa, 0x92, 0x3c, 0xd8, 0xa8, - 0x9a, 0x6f, 0x99, 0x65, 0x8a, 0x17, 0xc5, 0xfa, 0x47, 0x15, 0x0c, 0x19, 0x9a, 0x64, 0x8a, 0xed, - 0xd7, 0x65, 0x71, 0x20, 0xa7, 0x99, 0xdd, 0x12, 0x42, 0x60, 0xfb, 0x45, 0x36, 0x8a, 0xf1, 0xf7, - 0x6f, 0xed, 0x9a, 0x18, 0xde, 0x2e, 0x14, 0x43, 0x36, 0x8a, 0x2d, 0x62, 0x9a, 0x35, 0xd3, 0xdd, - 0x52, 0x2d, 0xa3, 0x18, 0xb2, 0x51, 0x6c, 0x4e, 0x4b, 0xaf, 0xe9, 0x75, 0xb6, 0x50, 0x0c, 0xd9, - 0x28, 0xe6, 0x87, 0x57, 0x91, 0x9c, 0x69, 0x8a, 0x62, 0xe8, 0x29, 0x8a, 0x21, 0xbb, 0x38, 0x1a, - 0xac, 0xe1, 0xd4, 0xa6, 0xc9, 0x82, 0x7c, 0x0e, 0x5a, 0xc2, 0x1c, 0x96, 0x8a, 0x8f, 0x24, 0x3b, - 0xf2, 0x79, 0xb0, 0x16, 0x38, 0xc4, 0x9f, 0x23, 0xde, 0xe2, 0x85, 0x1c, 0x79, 0x04, 0x5a, 0x12, - 0xaf, 0xe6, 0xc9, 0x74, 0x63, 0x78, 0xcb, 0xc3, 0x65, 0x4b, 0x2e, 0xf9, 0x08, 0x54, 0x37, 0x40, - 0x31, 0xe5, 0xda, 0x6c, 0x83, 0x62, 0x82, 0x69, 0xfd, 0x0c, 0xf4, 0xec, 0x04, 0xd2, 0x02, 0xfd, - 0x68, 0x70, 0x7e, 0xd1, 0x3f, 0xbf, 0xec, 0x99, 0x15, 0x2c, 0xd9, 0xae, 0x3d, 0x18, 0x9a, 0x55, - 0xd2, 0x84, 0x86, 0xdd, 0x1b, 0x0d, 0x07, 0xe7, 0x5d, 0xb3, 0x26, 0x36, 0xc3, 0xd3, 0xce, 0x51, - 0xcf, 0x54, 0xac, 0x3f, 0xd6, 0xa0, 0x31, 0xa2, 0x49, 0xe2, 0x47, 0x21, 0x5e, 0xfd, 0x44, 0x2c, - 0xd7, 0x9f, 0x8b, 0x0c, 0x49, 0xe9, 0x7f, 0xc3, 0x6b, 0xf8, 0x39, 0x80, 0x93, 0xb2, 0xd9, 0x38, - 0xa0, 0x2b, 0x1a, 0xc8, 0x62, 0x79, 0x4f, 0xfa, 0xc4, 0xff, 0x7c, 0xd8, 0x49, 0xd9, 0xec, 0x14, - 0xb9, 0xb6, 0xe1, 0x64, 0x4b, 0x72, 0x0f, 0x9a, 0x31, 0x9d, 0x47, 0x8c, 0x8e, 0x1d, 0xcf, 0x8b, - 0x25, 0xd4, 0x80, 0x20, 0x75, 0x3c, 0x2f, 0x2e, 0x41, 0x91, 0x5a, 0x86, 0xa2, 0x8d, 0xc7, 0xbe, - 0x56, 0x7a, 0xec, 0xef, 0x83, 0x8e, 0x0f, 0xfc, 0xd4, 0x99, 0x52, 0x89, 0x37, 0xf9, 0xde, 0x7a, - 0x06, 0x46, 0x6e, 0x10, 0x06, 0xe9, 0x1c, 0x71, 0x80, 0x87, 0xab, 0x73, 0x3e, 0x38, 0x37, 0x81, - 0xaf, 0x2e, 0x2f, 0x4e, 0xcc, 0x3d, 0x7e, 0xeb, 0x07, 0x83, 0x0b, 0xf3, 0x43, 0x6b, 0x90, 0x0d, - 0xe7, 0x36, 0x5d, 0x92, 0xfb, 0xa0, 0x60, 0x5e, 0xaa, 0xef, 0xcc, 0x0b, 0xb2, 0xf0, 0x1d, 0x8f, - 0x91, 0xdb, 0xf8, 0x1a, 0x24, 0xa3, 0x61, 0x73, 0x8e, 0x35, 0x05, 0xe0, 0x97, 0xba, 0xb7, 0x42, - 0x67, 0x1e, 0x80, 0xe6, 0xb8, 0xcc, 0x8f, 0x42, 0x59, 0x45, 0x86, 0x50, 0x1a, 0xa7, 0x9e, 0x2d, - 0x19, 0xd8, 0x7d, 0x43, 0x27, 0x7f, 0xd7, 0xf3, 0xf5, 0x36, 0x68, 0x62, 0xfd, 0xb9, 0x0a, 0xad, - 0x8e, 0xeb, 0x46, 0x69, 0xc8, 0xb6, 0x3e, 0xeb, 0xc6, 0x5c, 0x97, 0xbe, 0x0b, 0x2a, 0xff, 0xe9, - 0x77, 0xc1, 0xfa, 0xc6, 0x9c, 0x95, 0x7d, 0x01, 0xd1, 0xd7, 0x5f, 0x40, 0xac, 0x10, 0x6e, 0x8f, - 0xd2, 0x49, 0xe2, 0xc6, 0xfe, 0x02, 0x4d, 0xd9, 0xda, 0x64, 0x44, 0xa2, 0x74, 0xb2, 0xb6, 0x58, - 0x4d, 0xd2, 0x49, 0xdf, 0xcb, 0xb0, 0xb4, 0xf8, 0x5a, 0xdd, 0xc0, 0x52, 0xeb, 0xfb, 0xd0, 0x92, - 0x37, 0x7b, 0xdb, 0xa3, 0x0e, 0x1e, 0x81, 0x9e, 0xc1, 0x60, 0xde, 0x21, 0x2a, 0x79, 0x87, 0xe0, - 0xcd, 0xe6, 0xd5, 0xd0, 0xac, 0x1d, 0x1c, 0x40, 0x1d, 0xff, 0x47, 0x00, 0xb4, 0x23, 0xbb, 0xd7, - 0xb9, 0xc0, 0x2a, 0x03, 0xd0, 0x2e, 0x87, 0x5d, 0x5c, 0x57, 0x71, 0xdd, 0xed, 0x9d, 0xf6, 0x2e, - 0x7a, 0x66, 0xed, 0xe9, 0x4f, 0xa1, 0x7e, 0x8e, 0x57, 0xf8, 0x19, 0x34, 0xa5, 0x39, 0xa7, 0x51, - 0xb4, 0x20, 0xa5, 0xe2, 0xda, 0x2f, 0x61, 0x85, 0x55, 0x79, 0x5c, 0xfd, 0xbc, 0xfa, 0xf4, 0x9f, - 0x55, 0xd0, 0x86, 0x41, 0x8a, 0x0f, 0xb9, 0xcf, 0x40, 0x7f, 0xe9, 0xc7, 0xf4, 0x24, 0x4a, 0xe8, - 0xc6, 0x9f, 0x6d, 0xba, 0xdc, 0xdf, 0x2d, 0x41, 0x93, 0x55, 0x21, 0x4f, 0xa0, 0x21, 0x6b, 0x83, - 0xdc, 0xce, 0x3a, 0x6a, 0x5e, 0x29, 0xfb, 0xe2, 0x8b, 0xa1, 0xfc, 0x8c, 0x5d, 0x21, 0x9f, 0x80, - 0xca, 0x63, 0x47, 0x76, 0xd7, 0x71, 0x7c, 0xa7, 0xe0, 0x73, 0x68, 0x15, 0x73, 0x48, 0x24, 0x1a, - 0x94, 0xd3, 0x5a, 0xfe, 0xdb, 0x93, 0x1c, 0x64, 0xa5, 0x31, 0xc5, 0xc4, 0x94, 0x84, 0x27, 0x1a, - 0xff, 0xd6, 0xfe, 0xec, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xd6, 0x30, 0xb1, 0x7a, 0x17, - 0x00, 0x00, + 0x15, 0x97, 0x44, 0x91, 0x22, 0x9f, 0x14, 0x9b, 0x99, 0xba, 0x1b, 0xad, 0x17, 0xd9, 0x24, 0x4c, + 0x36, 0x1b, 0x38, 0xbb, 0xee, 0xd6, 0x69, 0xda, 0xed, 0x9f, 0x8b, 0x62, 0x29, 0xb6, 0x10, 0xdb, + 0x52, 0x29, 0x7b, 0x0b, 0x14, 0x05, 0x04, 0x8a, 0x1c, 0x4b, 0xc4, 0x52, 0xa4, 0x4c, 0x0e, 0x95, + 0x04, 0x28, 0x7a, 0xeb, 0xa1, 0xfd, 0x00, 0x45, 0x81, 0xde, 0x7b, 0x69, 0x0f, 0xfd, 0x1c, 0xed, + 0xb5, 0x97, 0x7e, 0x8c, 0xde, 0x7b, 0x28, 0xde, 0xcc, 0x90, 0xa2, 0xe8, 0x38, 0xab, 0xfe, 0xb9, + 0x08, 0x33, 0xef, 0x3d, 0xbd, 0x79, 0xff, 0xe6, 0xf7, 0xde, 0x10, 0x9a, 0xf3, 0xc8, 0xa3, 0xc1, + 0xfe, 0x22, 0x8e, 0x58, 0x44, 0x94, 0xc5, 0xe4, 0x8d, 0xa5, 0x83, 0x76, 0x11, 0xa6, 0x09, 0xf5, + 0xac, 0x2f, 0x61, 0xab, 0x4b, 0x2f, 0x9d, 0x34, 0x60, 0x1d, 0x37, 0x39, 0x8d, 0x3c, 0x4a, 0x08, + 0xd4, 0x9d, 0x94, 0xcd, 0xda, 0xd5, 0xfb, 0xd5, 0x27, 0x86, 0xcd, 0xd7, 0x9c, 0x16, 0x46, 0x61, + 0xbb, 0x26, 0x69, 0x61, 0x14, 0x5a, 0xdf, 0x07, 0xe8, 0xb8, 0x2e, 0x4d, 0xf2, 0x7f, 0xbd, 0x76, + 0x42, 0x96, 0xfd, 0x0b, 0xd7, 0x64, 0x07, 0xd4, 0xa9, 0xbf, 0xa4, 0xd9, 0xdf, 0xc4, 0xc6, 0x7a, + 0x0e, 0xda, 0x88, 0xb2, 0x51, 0x3a, 0x21, 0x77, 0xa0, 0x91, 0x26, 0x34, 0x1e, 0xfb, 0x9e, 0xfc, + 0x9b, 0x86, 0xdb, 0xbe, 0x87, 0xca, 0xd0, 0xe4, 0xec, 0x38, 0x5c, 0x5b, 0x57, 0xd0, 0x18, 0x51, + 0xd6, 0xa5, 0x89, 0x4b, 0xbe, 0x07, 0x4d, 0x4f, 0xd8, 0x3c, 0x76, 0xdc, 0x84, 0xff, 0xb7, 0x79, + 0xf0, 0xad, 0xfd, 0xc5, 0xe4, 0xcd, 0xfe, 0xba, 0x2f, 0x36, 0x78, 0xf9, 0x9e, 0x7c, 0x00, 0xda, + 0x22, 0x9d, 0x04, 0xbe, 0xcb, 0xd5, 0xb6, 0x6c, 0xb9, 0x23, 0x6d, 0x68, 0x2c, 0x62, 0x7f, 0xe9, + 0x30, 0xda, 0x56, 0x38, 0x23, 0xdb, 0x5a, 0xaf, 0xa0, 0x71, 0x44, 0xd9, 0x60, 0xc1, 0x12, 0xb2, + 0x07, 0xb7, 0xfd, 0xcb, 0xf1, 0x3c, 0xf2, 0xfc, 0x4b, 0x9f, 0x7a, 0xe3, 0xc4, 0x0f, 0x5d, 0xca, + 0x0f, 0x56, 0xec, 0x6d, 0xff, 0xf2, 0x54, 0xd2, 0x47, 0x48, 0x46, 0xb7, 0x03, 0x7f, 0xee, 0x33, + 0x7e, 0x8e, 0x6a, 0x8b, 0x8d, 0xf5, 0x73, 0x80, 0x17, 0x71, 0xf4, 0x3a, 0xa1, 0x5c, 0xdf, 0x87, + 0xa0, 0x73, 0x1d, 0x99, 0xef, 0xaa, 0xdd, 0xe0, 0xfb, 0xbe, 0x47, 0x3e, 0x02, 0x63, 0x42, 0x2f, + 0xa3, 0x98, 0xf3, 0x14, 0xce, 0xd3, 0x05, 0xa1, 0xef, 0xad, 0x74, 0xab, 0x45, 0xdd, 0xbf, 0xae, + 0x82, 0x7e, 0x44, 0xd9, 0x4f, 0x53, 0x1a, 0xbf, 0xe5, 0x99, 0x98, 0x39, 0xab, 0x4c, 0xcc, 0x1c, + 0x46, 0xee, 0x43, 0xdd, 0xa3, 0x89, 0xf0, 0xbc, 0x79, 0xd0, 0xe2, 0xa1, 0x92, 0xae, 0xd9, 0x9c, + 0x43, 0x3e, 0x06, 0x25, 0x49, 0x27, 0xfc, 0xbc, 0xb2, 0x00, 0x32, 0xc8, 0x43, 0xa8, 0x7b, 0x0e, + 0x73, 0xda, 0x75, 0x2e, 0xb0, 0xcd, 0x05, 0x56, 0xfe, 0xd8, 0x9c, 0x69, 0xbd, 0x02, 0x7d, 0x94, + 0x99, 0x91, 0x1d, 0x59, 0x2d, 0x68, 0x94, 0x09, 0x94, 0x47, 0xde, 0x15, 0x47, 0x0a, 0x9b, 0x9a, + 0x99, 0xc0, 0x28, 0x9d, 0xf0, 0x13, 0xad, 0xcf, 0x50, 0xd9, 0x95, 0xed, 0x84, 0x53, 0x4a, 0x4c, + 0x50, 0x82, 0xe8, 0xb5, 0x8c, 0x14, 0x2e, 0xc9, 0x16, 0xd4, 0x66, 0xbe, 0x8c, 0x70, 0x6d, 0xe6, + 0x5b, 0x23, 0xd0, 0xbb, 0x34, 0x10, 0x47, 0xdf, 0x01, 0x2d, 0xa1, 0x57, 0x79, 0x68, 0x8f, 0x2b, + 0xb6, 0x9a, 0xd0, 0xab, 0xbe, 0x47, 0x3e, 0x01, 0x35, 0x46, 0x7d, 0xf2, 0xcc, 0x5b, 0xf2, 0x4c, + 0x71, 0x08, 0x8a, 0x71, 0xee, 0x8b, 0x06, 0xa8, 0x5d, 0x1a, 0xf4, 0x3d, 0xeb, 0x97, 0xa0, 0x1f, + 0x06, 0x3e, 0x0d, 0xd9, 0xb1, 0x8f, 0x07, 0xe6, 0x75, 0x5a, 0xf3, 0x3d, 0x72, 0x17, 0x80, 0x17, + 0xaf, 0x33, 0xa5, 0x21, 0x93, 0x95, 0x6a, 0x20, 0xa5, 0x83, 0x04, 0xb4, 0x78, 0x49, 0x63, 0x99, + 0x3f, 0x5c, 0x62, 0x5e, 0x3d, 0xba, 0xf4, 0x45, 0xce, 0xeb, 0x5c, 0x5e, 0x17, 0x04, 0x51, 0xf1, + 0x81, 0x13, 0x4e, 0x79, 0x5a, 0x0d, 0x9b, 0xaf, 0xad, 0xbf, 0x54, 0xc1, 0x10, 0xc7, 0x77, 0x5c, + 0xf7, 0xda, 0xf9, 0x85, 0xcb, 0x53, 0x5b, 0xbb, 0x3c, 0x1f, 0x80, 0x96, 0xb8, 0x33, 0x3a, 0x17, + 0xe5, 0x6c, 0xd8, 0x72, 0xc7, 0xe9, 0xd4, 0x8d, 0x29, 0xe3, 0x87, 0xb7, 0x6c, 0xb9, 0xe3, 0x25, + 0x15, 0x4d, 0xfd, 0x90, 0x9f, 0xad, 0xdb, 0x62, 0x83, 0x06, 0x31, 0x67, 0x9a, 0xb4, 0xb5, 0xfb, + 0x0a, 0x1a, 0x84, 0xeb, 0x3c, 0xa5, 0x8d, 0x9b, 0x52, 0x6a, 0x9d, 0x42, 0x53, 0x58, 0x7c, 0xc2, + 0x95, 0x94, 0x6d, 0x5e, 0x99, 0x56, 0xbb, 0xc1, 0x34, 0xa5, 0x68, 0x9a, 0xf5, 0x9b, 0x3c, 0x02, + 0x08, 0x17, 0x65, 0x6d, 0x3b, 0xa0, 0xb2, 0x68, 0x21, 0xef, 0xb3, 0x61, 0x8b, 0x0d, 0xd9, 0x03, + 0x23, 0xa1, 0x6c, 0x7c, 0x85, 0x95, 0x20, 0xcb, 0x39, 0xcb, 0xb3, 0xa8, 0x4c, 0x5b, 0x4f, 0xb2, + 0x1a, 0xdd, 0x03, 0x63, 0x9a, 0xcb, 0xd6, 0x0b, 0xb2, 0x47, 0xb9, 0xec, 0x54, 0xae, 0xac, 0x7e, + 0xee, 0x1a, 0x75, 0x96, 0x74, 0x43, 0x63, 0x76, 0x40, 0x4d, 0xc3, 0xec, 0x5e, 0xe9, 0xb6, 0xd8, + 0x58, 0x7f, 0xcb, 0xdd, 0x1a, 0x6e, 0xec, 0xd6, 0x1d, 0x68, 0x84, 0xd1, 0x98, 0xba, 0xb3, 0x48, + 0xea, 0xd2, 0xc2, 0xa8, 0xe7, 0xce, 0x22, 0xf2, 0x19, 0xd4, 0x67, 0xd4, 0xc1, 0x8a, 0x52, 0x9e, + 0x34, 0x0f, 0xda, 0xdc, 0xfc, 0x5c, 0xf9, 0xfe, 0x31, 0x75, 0xbc, 0x5e, 0xc8, 0xe2, 0xb7, 0x36, + 0x97, 0x42, 0xb0, 0x73, 0xa3, 0x90, 0x61, 0xc9, 0xaa, 0x02, 0xec, 0xe4, 0x76, 0xf7, 0x07, 0x60, + 0xe4, 0xc2, 0x58, 0xbd, 0x5f, 0xd3, 0xb7, 0xd2, 0x28, 0x5c, 0xa2, 0x55, 0x4b, 0x27, 0x48, 0xb3, + 0xcc, 0x89, 0xcd, 0x8f, 0x6a, 0x5f, 0x56, 0xad, 0xaf, 0x32, 0x67, 0x8e, 0x28, 0xdb, 0xd0, 0x99, + 0x87, 0xa0, 0x5e, 0xcf, 0x4f, 0x1e, 0x73, 0xc1, 0x5b, 0xe9, 0x1d, 0xfd, 0x6f, 0x7a, 0x47, 0x25, + 0xbd, 0x7f, 0xcf, 0xa3, 0xdf, 0xa5, 0xc1, 0x86, 0x8a, 0x3f, 0x95, 0x98, 0x8a, 0x7a, 0xb7, 0x64, + 0xab, 0xc9, 0x75, 0xec, 0xff, 0x6c, 0xe6, 0x30, 0x09, 0xb4, 0x8f, 0xa1, 0xe1, 0xd1, 0x60, 0x9c, + 0xd0, 0x2b, 0x99, 0x90, 0x5b, 0xb2, 0x2d, 0x09, 0x68, 0xb2, 0x35, 0x8f, 0x06, 0x23, 0x7a, 0x55, + 0xbc, 0xbd, 0x6a, 0xb9, 0xf5, 0xcd, 0x9c, 0xd8, 0x6b, 0x6b, 0x3c, 0xc9, 0x7c, 0x6d, 0x3d, 0x84, + 0x3a, 0x1e, 0x41, 0x1a, 0xa0, 0x9c, 0x8e, 0x8e, 0xcc, 0x0a, 0x31, 0x40, 0x3d, 0x1f, 0x0c, 0xfb, + 0x87, 0x66, 0x15, 0x69, 0xa3, 0x8b, 0x17, 0x66, 0xcd, 0xfa, 0x05, 0x80, 0xb0, 0xe8, 0x2c, 0x62, + 0x74, 0xe5, 0x46, 0xb5, 0xe8, 0xc6, 0x03, 0xe9, 0x46, 0x8d, 0xbb, 0x21, 0x4c, 0xeb, 0x87, 0x97, + 0x11, 0xfe, 0x45, 0x3a, 0xf0, 0xed, 0x1c, 0x3b, 0x05, 0x74, 0x09, 0xe4, 0xb4, 0x7e, 0xab, 0x64, + 0x41, 0x3b, 0x4d, 0xa6, 0xe4, 0x1e, 0x07, 0xdf, 0x6a, 0x21, 0xc8, 0x19, 0x4c, 0x1e, 0x57, 0x10, + 0x8d, 0x89, 0x05, 0x8a, 0xe3, 0x66, 0xed, 0x66, 0xab, 0x20, 0xd1, 0x71, 0xdd, 0xe3, 0x8a, 0x8d, + 0x4c, 0xf2, 0x24, 0xc3, 0x1d, 0x91, 0x2c, 0xb3, 0x20, 0xc5, 0xd1, 0x03, 0xf1, 0x58, 0x60, 0x91, + 0x25, 0x1a, 0x45, 0xfd, 0x9a, 0xb6, 0x51, 0x3a, 0x41, 0x6d, 0xd8, 0x9f, 0x50, 0x1b, 0x5e, 0x4c, + 0x1e, 0xce, 0x92, 0x36, 0xa4, 0x73, 0x6d, 0xfc, 0xe6, 0x5a, 0xa0, 0x2c, 0xd2, 0x09, 0x0f, 0xf0, + 0xba, 0xb6, 0xa1, 0xd0, 0xb6, 0x48, 0x27, 0x28, 0x33, 0xa5, 0x4c, 0x02, 0x5d, 0x51, 0xe6, 0x88, + 0x32, 0x94, 0x99, 0x52, 0xc6, 0xad, 0xa2, 0xac, 0xad, 0x5f, 0xb7, 0x4a, 0xc8, 0x24, 0x42, 0xc6, + 0xa3, 0x41, 0xdb, 0xb8, 0x26, 0xd3, 0xa5, 0x01, 0xca, 0x78, 0x34, 0x20, 0x9f, 0x40, 0x3d, 0x8c, + 0x18, 0x6d, 0x43, 0xa1, 0xb3, 0xae, 0x32, 0x79, 0x5c, 0xb1, 0x39, 0xfb, 0x85, 0x01, 0x8d, 0x53, + 0x9a, 0x24, 0xce, 0x94, 0x5a, 0x7f, 0xaa, 0x81, 0x71, 0x8e, 0x09, 0xed, 0x8a, 0x36, 0x0a, 0x6e, + 0x4c, 0x1d, 0x46, 0xbd, 0xb1, 0xec, 0xfa, 0x8a, 0x6d, 0x48, 0x4a, 0x87, 0xf1, 0x3e, 0xb5, 0xf0, + 0x32, 0x76, 0x4d, 0xb0, 0x25, 0xa5, 0xc3, 0xc8, 0x53, 0xd0, 0x70, 0x46, 0x72, 0x13, 0x99, 0x86, + 0x77, 0x8e, 0x51, 0x52, 0x84, 0x3c, 0xc0, 0xb4, 0x26, 0x6b, 0x33, 0xc0, 0x6a, 0x04, 0xc4, 0xac, + 0x26, 0x85, 0xfa, 0x51, 0x0b, 0xf5, 0x83, 0xf5, 0x1e, 0x53, 0xc7, 0x43, 0xba, 0xc6, 0xe9, 0x1a, + 0x6e, 0x33, 0x86, 0xbb, 0x44, 0x46, 0x23, 0x63, 0xb8, 0xcb, 0xbe, 0x87, 0x8a, 0xf0, 0x26, 0xf9, + 0x1e, 0x8f, 0xb0, 0x6a, 0xab, 0x1e, 0xb6, 0xe4, 0xc2, 0x14, 0x67, 0xdc, 0x34, 0xc5, 0xc1, 0xfa, + 0x14, 0xf7, 0x07, 0x05, 0x74, 0x1e, 0x2d, 0xec, 0x21, 0xeb, 0xd1, 0xa8, 0x96, 0xa3, 0x71, 0x17, + 0xc0, 0xa3, 0x01, 0x5d, 0x0f, 0x96, 0xa4, 0x74, 0x18, 0x1e, 0x1e, 0x85, 0x81, 0x1f, 0xd2, 0x0c, + 0x83, 0xc5, 0x6e, 0x93, 0xb8, 0x14, 0x02, 0xa0, 0xde, 0x14, 0x00, 0x6d, 0x2d, 0x00, 0x2b, 0x4f, + 0x1b, 0x37, 0x79, 0xaa, 0xaf, 0x79, 0x5a, 0x04, 0x15, 0x63, 0x0d, 0x54, 0x72, 0x34, 0x80, 0x22, + 0x1a, 0xac, 0x52, 0xd5, 0x2c, 0xa6, 0x6a, 0x15, 0xf8, 0x56, 0x31, 0xf0, 0x8f, 0x60, 0x2b, 0x70, + 0x12, 0x36, 0x4e, 0x28, 0x0d, 0xc7, 0xcc, 0x9f, 0xd3, 0xf6, 0x2d, 0x1e, 0x9e, 0x16, 0x52, 0x47, + 0x94, 0x86, 0xe7, 0xfe, 0x9c, 0x92, 0xef, 0xc0, 0xce, 0x4a, 0xaa, 0x30, 0x1f, 0x6d, 0xf1, 0x83, + 0x6f, 0x67, 0xb2, 0x17, 0xd9, 0x9c, 0x64, 0xfd, 0xb5, 0x0a, 0x30, 0xa2, 0xf1, 0x92, 0xc6, 0x87, + 0x2c, 0xde, 0x14, 0x8e, 0x09, 0xd4, 0x5d, 0x7c, 0x1f, 0x08, 0x88, 0xe2, 0x6b, 0x3e, 0xb0, 0xd0, + 0x37, 0x4c, 0x4e, 0x56, 0x7c, 0x4d, 0x9e, 0x81, 0xb6, 0x70, 0x62, 0x67, 0x9e, 0xb4, 0x55, 0x0e, + 0xc6, 0x1f, 0xc9, 0x86, 0x90, 0x1d, 0xb7, 0x3f, 0xe4, 0x5c, 0xd1, 0x20, 0xa5, 0xe8, 0xee, 0x0f, + 0xa1, 0x59, 0x20, 0x7f, 0x53, 0x2b, 0x6c, 0x15, 0x5b, 0xe1, 0xbf, 0x72, 0x67, 0xba, 0x0e, 0x73, + 0x6e, 0x00, 0xe1, 0xfb, 0xd0, 0xba, 0x8c, 0xa3, 0xf9, 0x78, 0x7d, 0x7a, 0x03, 0xa4, 0x5d, 0x88, + 0x74, 0xad, 0x57, 0xa1, 0x52, 0xae, 0xc2, 0x55, 0xde, 0xea, 0xc5, 0xbc, 0x7d, 0x2e, 0x07, 0x01, + 0xe1, 0xea, 0x87, 0x05, 0x57, 0xd1, 0x98, 0xf7, 0x4d, 0x02, 0xda, 0xff, 0x69, 0x12, 0xf8, 0x9d, + 0x92, 0xb9, 0x3f, 0x8c, 0x69, 0x72, 0x83, 0xfb, 0x26, 0x28, 0x49, 0x9c, 0xe5, 0x13, 0x97, 0xe4, + 0xc9, 0x5a, 0x73, 0xdd, 0x29, 0x18, 0x8e, 0x6a, 0x8a, 0xdd, 0x75, 0x7d, 0xe6, 0xae, 0x97, 0x67, + 0xee, 0x1b, 0xb0, 0xa7, 0xd0, 0x93, 0xb5, 0xf7, 0xf5, 0xe4, 0x47, 0xb0, 0xc5, 0x9c, 0x18, 0x07, + 0xc2, 0x2c, 0x35, 0x0d, 0x7e, 0x42, 0x4b, 0x50, 0x65, 0x72, 0x2c, 0xb8, 0xe5, 0xb8, 0x2c, 0x8a, + 0x73, 0x21, 0x9d, 0x0b, 0x35, 0x39, 0x51, 0xca, 0x48, 0x3c, 0x30, 0x6e, 0xc6, 0x03, 0xeb, 0x6b, + 0xd9, 0xd3, 0x35, 0xa8, 0x0d, 0xce, 0xcc, 0x0a, 0xf6, 0xf1, 0xc1, 0xcb, 0x97, 0x66, 0x15, 0x09, + 0x17, 0x1d, 0x53, 0x41, 0xc2, 0xc5, 0xb0, 0x6b, 0xd6, 0x89, 0x0e, 0xf5, 0xa3, 0xc1, 0x59, 0xcf, + 0x54, 0x91, 0xd4, 0x39, 0x1c, 0x99, 0x1a, 0x92, 0xce, 0x7b, 0xf6, 0xa9, 0xd9, 0xc8, 0x46, 0x02, + 0x1d, 0x49, 0x76, 0xaf, 0xd3, 0x35, 0x0d, 0xb1, 0x3a, 0xfc, 0xca, 0x04, 0x64, 0x76, 0x7b, 0x27, + 0x66, 0xd3, 0xfa, 0x7d, 0x5e, 0x97, 0xa7, 0x94, 0x39, 0x1b, 0x5e, 0x32, 0x4b, 0x4e, 0xfb, 0x4a, + 0xa1, 0x79, 0xe5, 0x5d, 0x47, 0x3e, 0xe1, 0xee, 0x65, 0x9d, 0x79, 0x15, 0xd6, 0x0c, 0x6a, 0x45, + 0x5b, 0xbe, 0x27, 0x1a, 0xa0, 0xfa, 0xae, 0xb8, 0x23, 0xc7, 0xfa, 0x55, 0x66, 0x19, 0xce, 0x21, + 0xff, 0xf5, 0x8d, 0x79, 0xb0, 0x56, 0x42, 0xdf, 0x30, 0xd8, 0x14, 0x6f, 0x8d, 0xf5, 0x8f, 0x2a, + 0x18, 0x32, 0x34, 0xc9, 0x14, 0x7b, 0xb1, 0xcb, 0xe2, 0x40, 0x8e, 0x36, 0xdb, 0x25, 0xb8, 0xc0, + 0x5e, 0x8c, 0x6c, 0x14, 0xe3, 0x8f, 0xe1, 0xda, 0x35, 0x31, 0xbc, 0x6a, 0x28, 0x86, 0x6c, 0x14, + 0x5b, 0xc4, 0x34, 0xeb, 0xac, 0xdb, 0xa5, 0xc2, 0x46, 0x31, 0x64, 0xa3, 0xd8, 0x9c, 0x96, 0x9e, + 0xd6, 0xab, 0x6c, 0xa1, 0x18, 0xb2, 0x51, 0xcc, 0x0f, 0x2f, 0x23, 0x39, 0xe0, 0x14, 0xc5, 0xd0, + 0x53, 0x14, 0x43, 0x76, 0x71, 0x4e, 0x58, 0x61, 0xab, 0x4d, 0x93, 0x05, 0xf9, 0x02, 0xb4, 0x84, + 0x39, 0x2c, 0x15, 0x5f, 0x4c, 0xb6, 0xe4, 0x5b, 0x61, 0x25, 0xb0, 0x8f, 0x3f, 0x87, 0xbc, 0xdf, + 0x0b, 0x39, 0xf2, 0x18, 0xb4, 0x24, 0x5e, 0xce, 0x93, 0xe9, 0xda, 0x24, 0x97, 0x87, 0xcb, 0x96, + 0x5c, 0xf2, 0x08, 0x54, 0x37, 0x40, 0x31, 0xe5, 0xda, 0xa0, 0x83, 0x62, 0x82, 0x69, 0xfd, 0x04, + 0xf4, 0xec, 0x04, 0xd2, 0x02, 0xfd, 0x70, 0x70, 0x76, 0xde, 0x3f, 0xbb, 0xe8, 0x99, 0x15, 0x2c, + 0xd9, 0xae, 0x3d, 0x18, 0x9a, 0x55, 0xd2, 0x84, 0x86, 0xdd, 0x1b, 0x0d, 0x07, 0x67, 0x5d, 0xb3, + 0x26, 0x36, 0xc3, 0x93, 0xce, 0x61, 0xcf, 0x54, 0xac, 0x3f, 0xd6, 0xa0, 0x31, 0xa2, 0x49, 0xe2, + 0x47, 0x21, 0xe2, 0x40, 0x22, 0x96, 0xab, 0x6f, 0x47, 0x86, 0xa4, 0xf4, 0xdf, 0xf3, 0x34, 0x7e, + 0x0e, 0xe0, 0xa4, 0x6c, 0x36, 0x0e, 0xe8, 0x92, 0x06, 0xb2, 0x58, 0x3e, 0x90, 0x3e, 0xf1, 0x3f, + 0xef, 0x77, 0x52, 0x36, 0x3b, 0x41, 0xae, 0x6d, 0x38, 0xd9, 0x92, 0xdc, 0x83, 0x66, 0x4c, 0xe7, + 0x11, 0xa3, 0x63, 0xc7, 0xf3, 0x62, 0x89, 0x3b, 0x20, 0x48, 0x1d, 0xcf, 0x8b, 0x4b, 0xb8, 0xa4, + 0x96, 0x71, 0x69, 0xed, 0xe5, 0xaf, 0x95, 0x5e, 0xfe, 0xbb, 0xa0, 0xe3, 0x6b, 0x3f, 0x75, 0xa6, + 0x54, 0xe2, 0x4d, 0xbe, 0xb7, 0x9e, 0x81, 0x91, 0x1b, 0x84, 0x41, 0x3a, 0x43, 0x1c, 0xe0, 0xe1, + 0xea, 0x9c, 0x0d, 0xce, 0x4c, 0xe0, 0xab, 0x8b, 0xf3, 0x63, 0x73, 0x87, 0xdf, 0xfa, 0xc1, 0xe0, + 0xdc, 0xfc, 0xd8, 0x1a, 0x64, 0x93, 0xba, 0x4d, 0xaf, 0xc8, 0x7d, 0x50, 0x30, 0x2f, 0xd5, 0x77, + 0xe6, 0x05, 0x59, 0xf8, 0xa8, 0xc7, 0xc8, 0xad, 0x7d, 0x1a, 0x92, 0xd1, 0xb0, 0x39, 0xc7, 0x9a, + 0x02, 0xf0, 0x4b, 0xdd, 0x5b, 0xa2, 0x33, 0x0f, 0x40, 0x73, 0x5c, 0xe6, 0x47, 0xa1, 0xac, 0x22, + 0x43, 0x28, 0x8d, 0x53, 0xcf, 0x96, 0x0c, 0x6c, 0xc5, 0xa1, 0x93, 0x3f, 0xf2, 0xf9, 0x7a, 0x13, + 0x34, 0xb1, 0xfe, 0x5c, 0x85, 0x56, 0xc7, 0x75, 0xa3, 0x34, 0x64, 0x1b, 0x9f, 0x75, 0x63, 0xae, + 0x4b, 0x1f, 0x09, 0x95, 0xff, 0xf4, 0x23, 0x61, 0x7d, 0x6d, 0xe8, 0xca, 0x3e, 0x87, 0xe8, 0xab, + 0xcf, 0x21, 0x56, 0x08, 0xb7, 0x47, 0xe9, 0x24, 0x71, 0x63, 0x7f, 0x81, 0xa6, 0x6c, 0x6c, 0x32, + 0x22, 0x51, 0x3a, 0x59, 0x59, 0xac, 0x26, 0xe9, 0xa4, 0xef, 0x65, 0x58, 0x5a, 0x7c, 0xba, 0xae, + 0x61, 0xa9, 0xf5, 0x5d, 0x68, 0xc9, 0x9b, 0xbd, 0xe9, 0x51, 0x7b, 0x8f, 0x41, 0xcf, 0x60, 0x30, + 0xef, 0x10, 0x95, 0xbc, 0x43, 0xf0, 0x66, 0xf3, 0x6a, 0x68, 0xd6, 0xf6, 0xf6, 0xa0, 0x8e, 0xff, + 0x23, 0x00, 0xda, 0xa1, 0xdd, 0xeb, 0x9c, 0x63, 0x95, 0x01, 0x68, 0x17, 0xc3, 0x2e, 0xae, 0xab, + 0xb8, 0xee, 0xf6, 0x4e, 0x7a, 0xe7, 0x3d, 0xb3, 0x76, 0xf0, 0x63, 0xa8, 0x9f, 0xe1, 0x15, 0x7e, + 0x06, 0x4d, 0x69, 0xce, 0x49, 0x14, 0x2d, 0x48, 0xa9, 0xb8, 0x76, 0x4b, 0x58, 0x61, 0x55, 0x9e, + 0x54, 0xbf, 0xa8, 0x1e, 0xfc, 0xb3, 0x0a, 0xda, 0x30, 0x48, 0xf1, 0x55, 0xf7, 0x39, 0xe8, 0x2f, + 0xfd, 0x98, 0x1e, 0x47, 0x09, 0x5d, 0xfb, 0xb3, 0x4d, 0xaf, 0x76, 0xb7, 0x4b, 0xd0, 0x64, 0x55, + 0xc8, 0x53, 0x68, 0xc8, 0xda, 0x20, 0xb7, 0xb3, 0x8e, 0x9a, 0x57, 0xca, 0xae, 0xf8, 0x7c, 0x28, + 0xbf, 0x69, 0x57, 0xc8, 0xa7, 0xa0, 0xf2, 0xd8, 0x91, 0xed, 0x55, 0x1c, 0xdf, 0x29, 0xf8, 0x1c, + 0x5a, 0xc5, 0x1c, 0x12, 0x89, 0x06, 0xe5, 0xb4, 0x96, 0xff, 0xf6, 0x34, 0x07, 0x59, 0x69, 0x4c, + 0x31, 0x31, 0x25, 0xe1, 0x89, 0xc6, 0x3f, 0xbc, 0x3f, 0xfb, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x5e, 0xff, 0x32, 0x57, 0x87, 0x17, 0x00, 0x00, } diff --git a/pbx/model.proto b/pbx/model.proto index 03d8702f7..22f21b7a0 100644 --- a/pbx/model.proto +++ b/pbx/model.proto @@ -330,7 +330,7 @@ message ServerPres { What what = 3; string user_agent = 4; int32 seq_id = 5; - repeated int32 seq_list = 6; + repeated DelQuery del_seq = 6; string target_user_id = 7; string actor_user_id = 8; AccessMode acs = 9; diff --git a/server/datamodel.go b/server/datamodel.go index 0353f6a77..09129e3d7 100644 --- a/server/datamodel.go +++ b/server/datamodel.go @@ -78,12 +78,6 @@ type MsgFindQuery struct { Tags []string `json:"tags"` } -// Range of ids from low to hi inclusive -type MsgSeqRange struct { - Low int `json:"low,omitempty"` - Hi int `json:"hi,omitempty"` -} - // Either an individual ID or a randge of deleted IDs type MsgDelQuery struct { SeqId int `json:"seq,omitempty"` @@ -404,7 +398,7 @@ type MsgServerPres struct { What string `json:"what"` UserAgent string `json:"ua,omitempty"` SeqId int `json:"seq,omitempty"` - SeqList []int `json:"list,omitempty"` + DelSeq []MsgDelQuery `json:"delseq,omitempty"` AcsTarget string `json:"tgt,omitempty"` AcsActor string `json:"act,omitempty"` Acs *MsgAccessMode `json:"acs,omitempty"` diff --git a/server/pbconverter.go b/server/pbconverter.go index 8332b1456..af7ea51a4 100644 --- a/server/pbconverter.go +++ b/server/pbconverter.go @@ -69,7 +69,7 @@ func pb_serv_serialize(msg *ServerComMessage) *pbx.ServerMsg { What: what, UserAgent: msg.Pres.UserAgent, SeqId: int32(msg.Pres.SeqId), - SeqList: intSliceToInt32(msg.Pres.SeqList), + DelSeq: pb_DelQuery_serialize(msg.Pres.DelSeq), TargetUserId: msg.Pres.AcsTarget, ActorUserId: msg.Pres.AcsActor, Acs: pb_AccessMode_serialize(msg.Pres.Acs)}} @@ -143,7 +143,7 @@ func pb_serv_deserialize(pkt *pbx.ServerMsg) *ServerComMessage { What: what, UserAgent: pres.GetUserAgent(), SeqId: int(pres.GetSeqId()), - SeqList: int32SliceToInt(pres.GetSeqList()), + DelSeq: pb_DelQuery_deserialize(pres.GetDelSeq()), AcsTarget: pres.GetTargetUserId(), AcsActor: pres.GetActorUserId(), Acs: pb_AccessMode_deserialize(pres.GetAcs()), diff --git a/server/pres.go b/server/pres.go index 400c53fd3..3161c0375 100644 --- a/server/pres.go +++ b/server/pres.go @@ -11,7 +11,7 @@ import ( type PresParams struct { userAgent string seqId int - seqList []int + delSeq []MsgDelQuery // Uid who performed the action actor string @@ -202,7 +202,7 @@ func (t *Topic) presSubsOnline(what, src string, params *PresParams, globals.hub.route <- &ServerComMessage{ Pres: &MsgServerPres{Topic: t.x_original, What: what, Src: src, Acs: params.packAcs(), AcsActor: actor, AcsTarget: target, - SeqId: params.seqId, SeqList: params.seqList, filter: int(filter), singleUser: singleUser}, + SeqId: params.seqId, DelSeq: params.delSeq, filter: int(filter), singleUser: singleUser}, rcptto: t.name, skipSid: skipSid} // log.Printf("Pres K.2, L.3, W.2: topic'%s' what='%s', who='%s', acs='w:%s/g:%s'", t.name, what, @@ -268,7 +268,7 @@ func (t *Topic) presSubsOffline(what string, params *PresParams, filter types.Ac globals.hub.route <- &ServerComMessage{ Pres: &MsgServerPres{Topic: "me", What: what, Src: t.original(uid), Acs: params.packAcs(), AcsActor: actor, AcsTarget: target, - SeqId: params.seqId, SeqList: params.seqList, + SeqId: params.seqId, DelSeq: params.delSeq, skipTopic: skipTopic}, rcptto: user, skipSid: skipSid} } @@ -305,7 +305,7 @@ func presSubsOfflineOffline(topic string, cat types.TopicCat, subs []types.Subsc globals.hub.route <- &ServerComMessage{ Pres: &MsgServerPres{Topic: "me", What: what, Src: original, Acs: params.packAcs(), AcsActor: actor, AcsTarget: target, - SeqId: params.seqId, SeqList: params.seqList}, + SeqId: params.seqId, DelSeq: params.delSeq}, rcptto: user, skipSid: skipSid} } } @@ -336,7 +336,7 @@ func (t *Topic) presSingleUserOffline(uid types.Uid, what string, params *PresPa globals.hub.route <- &ServerComMessage{ Pres: &MsgServerPres{Topic: "me", What: what, - Src: t.original(uid), SeqId: params.seqId, SeqList: params.seqList, + Src: t.original(uid), SeqId: params.seqId, DelSeq: params.delSeq, Acs: params.packAcs(), AcsActor: actor, AcsTarget: target, UserAgent: params.userAgent, wantReply: strings.HasPrefix(what, "?unkn"), skipTopic: skipTopic}, rcptto: user, skipSid: skipSid} @@ -362,7 +362,7 @@ func presSingleUserOfflineOffline(uid types.Uid, original string, what string, globals.hub.route <- &ServerComMessage{ Pres: &MsgServerPres{Topic: "me", What: what, - Src: original, SeqId: params.seqId, SeqList: params.seqList, + Src: original, SeqId: params.seqId, DelSeq: params.delSeq, Acs: params.packAcs(), AcsActor: actor, AcsTarget: target}, rcptto: uid.UserId(), skipSid: skipSid} } @@ -391,15 +391,15 @@ func (t *Topic) presPubMessageCount(uid types.Uid, recv, read int, skip string) // Let other sessions of a given user know that what messages are now deleted // Cases V.1, V.2 -func (t *Topic) presPubMessageDelete(uid types.Uid, list []int, clear int, skip string) { - if clear > 0 || (len(list) > 0 && list[0] > 0) { +func (t *Topic) presPubMessageDelete(uid types.Uid, list []MsgDelQuery, skip string) { + if len(list) > 0 { // This check is only needed for V.1, but it does not hurt V.2. Let's do it here for both. pud, _ := t.perUser[uid] if !(pud.modeGiven & pud.modeWant).IsPresencer() { return } - params := &PresParams{seqId: clear, seqList: list} + params := &PresParams{delSeq: list} // Case V.2 user := uid.UserId() diff --git a/server/store/adapter/adapter.go b/server/store/adapter/adapter.go index 6a7a5cc8a..08742f6a7 100644 --- a/server/store/adapter/adapter.go +++ b/server/store/adapter/adapter.go @@ -69,7 +69,6 @@ type Adapter interface { // Messages MessageSave(msg *t.Message) error MessageGetAll(topic string, forUser t.Uid, opts *t.BrowseOpt) ([]t.Message, error) - MessageDeleteAll(topic string, before int) error MessageDeleteList(topic string, forUser t.Uid, hard bool, list []int) error // Devices (for push notifications) diff --git a/server/store/store.go b/server/store/store.go index 37a9c7179..b574330cb 100644 --- a/server/store/store.go +++ b/server/store/store.go @@ -289,7 +289,7 @@ func (TopicsObjMapper) Delete(topic string) error { if err := adaptr.SubsDelForTopic(topic); err != nil { return err } - if err := adaptr.MessageDeleteAll(topic, -1); err != nil { + if err := adaptr.MessageDeleteList(topic, types.ZeroUid, true, nil); err != nil { return err } @@ -354,8 +354,9 @@ func (MessagesObjMapper) Save(msg *types.Message) error { return adaptr.MessageSave(msg) } -// Delete messages. Hard-delete if hard == tru, otherwise a soft-delete -func (MessagesObjMapper) Delete(topic string, forUser types.Uid, hard bool, cleared int) (err error) { +func (MessagesObjMapper) DeleteList(topic string, delId int, forUser types.Uid, hard bool, list []int) (err error) { + err = adaptr.MessageDeleteList(topic, forUser, hard, list) + if hard { err = adaptr.MessageDeleteAll(topic, cleared) if err != nil { @@ -370,13 +371,6 @@ func (MessagesObjMapper) Delete(topic string, forUser types.Uid, hard bool, clea update := map[string]interface{}{"ClearId": cleared} err = adaptr.SubsUpdate(topic, forUser, update) } - - return -} - -func (MessagesObjMapper) DeleteList(topic string, forUser types.Uid, hard bool, list []int) (err error) { - err = adaptr.MessageDeleteList(topic, forUser, hard, list) - return err } diff --git a/server/topic.go b/server/topic.go index d61ffdb73..32637b2f7 100644 --- a/server/topic.go +++ b/server/topic.go @@ -12,6 +12,7 @@ import ( // "encoding/json" "errors" "log" + "sort" "sync/atomic" "time" @@ -24,7 +25,7 @@ import ( const UA_TIMER_DELAY = time.Second * 5 // Maximum number of SeqIds to pass in a list -const MAX_SEQ_COUNT = 128 +const MAX_SEQ_COUNT = 256 // Topic: an isolated communication channel type Topic struct { @@ -1615,7 +1616,7 @@ func (t *Topic) replyDelMsg(sess *Session, del *MsgClientDel) error { var err error var filteredList []int if del.DelSeq == nil || len(del.DelSeq) == 0 { - err = error.New("del.msg: not IDs to delete") + err = errors.New("del.msg: not IDs to delete") } else { remains := MAX_SEQ_COUNT for _, dq := range del.DelSeq { @@ -1645,6 +1646,31 @@ func (t *Topic) replyDelMsg(sess *Session, del *MsgClientDel) error { } } + sort.Ints(filteredList) + ll := len(filteredList) + if ll > 1 { + p := 0 + // Remove zeros + for i := 0; i < ll && filteredList[i] == 0; i++ { + p++ + } + if p > 0 { + filteredList = filteredList[p:] + p = 0 + } + // Remove duplicates + for i := 1; i < ll; i++ { + if filteredList[p] == filteredList[i] { + continue + } + p++ + if p < i { + filteredList[p] = filteredList[i] + } + } + filteredList = filteredList[:p+1] + } + if len(filteredList) == 0 { err = errors.New("del.msg: no valid entries in list") } @@ -1669,53 +1695,51 @@ func (t *Topic) replyDelMsg(sess *Session, del *MsgClientDel) error { del.Hard = false } - if del.Before > 0 { - // Make sure user has not deleted the messages already - if (del.Before <= t.clearId) || (!del.Hard && del.Before <= pud.clearId) { - sess.queueOut(InfoNoAction(del.Id, t.original(sess.uid), now)) - return nil - } - - err = store.Messages.Delete(t.name, sess.uid, del.Hard, del.Before) - } else { - // del.List != nil - - err = store.Messages.DeleteList(t.name, sess.uid, del.Hard, filteredList) - } - + err = store.Messages.DeleteList(t.name, t.delId+1, sess.uid, del.Hard, filteredList) if err != nil { sess.queueOut(ErrUnknown(del.Id, t.original(sess.uid), now)) return err } - var params *PresParams - if del.Before > 0 { - if del.Hard { - t.clearId = del.Before - params = &PresParams{seqId: del.Before, actor: sess.uid.UserId()} + // Increment Delete transaction ID + t.delId++ + + // Convert a list of IDs into IDs and ranges + ranges := []MsgDelQuery{{SeqId: filteredList[0]}} + for r, i := 0, 1; i < len(filteredList); i++ { + if ranges[r].SeqId+1 == filteredList[i] { + // Convert single ID into a range of IDs + ranges[r].LowId = ranges[r].SeqId + ranges[r].SeqId = 0 + ranges[r].HiId = filteredList[i] + } else if ranges[r].HiId+1 == filteredList[i] { + // Extend current range + ranges[r].HiId++ } else { - pud.clearId = del.Before - if pud.readId < pud.clearId { - pud.readId = pud.clearId - } - if pud.recvId < pud.readId { - pud.recvId = pud.readId - } - t.perUser[sess.uid] = pud + // Start new range + r++ + ranges = append(ranges, MsgDelQuery{SeqId: filteredList[i]}) } - } else if del.Hard { - params = &PresParams{seqList: filteredList, actor: sess.uid.UserId()} } if del.Hard { log.Println("hard delete") + for uid, pud := range t.perUser { + pud.delId = t.delId + t.perUser[uid] = pud + } // Broadcast the change to all, online and offline, exclude the session making the change. + params := &PresParams{delSeq: ranges, actor: sess.uid.UserId()} t.presSubsOnline("del", "", params, types.ModeRead, sess.sid, "") t.presSubsOffline("del", params, types.ModeRead, sess.sid, true) } else { log.Println("soft delete") + pud := t.perUser[sess.uid] + pud.delId = t.delId + t.perUser[sess.uid] = pud + // Notify user's other sessions - t.presPubMessageDelete(sess.uid, filteredList, del.Before, sess.sid) + t.presPubMessageDelete(sess.uid, ranges, sess.sid) } sess.queueOut(NoErr(del.Id, t.original(sess.uid), now)) @@ -2014,7 +2038,7 @@ func getDefaultAccess(cat types.TopicCat, auth bool) types.AccessMode { } // Takes get.data parameters and ClearID, returns database query parameters -func msgOpts2storeOpts(req *MsgBrowseOpts, clearId int) *types.BrowseOpt { +func msgOpts2storeOpts(req *MsgBrowseOpts, delId int) *types.BrowseOpt { var opts *types.BrowseOpt if req != nil || clearId > 0 { opts = &types.BrowseOpt{} @@ -2023,10 +2047,6 @@ func msgOpts2storeOpts(req *MsgBrowseOpts, clearId int) *types.BrowseOpt { if req.SinceId != 0 || req.BeforeId != 0 { opts.Since = req.SinceId opts.Before = req.BeforeId - } else if req.SinceTs != nil || req.BeforeTs != nil { - opts.ByTime = true - opts.After = req.SinceTs - opts.Until = req.BeforeTs } } if clearId > opts.Since {