From 420fdae3857a66a2f7ad8ca44ad2b177cc47e158 Mon Sep 17 00:00:00 2001 From: "teamgram.io" <74940245+teamgramio@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:26:00 +0800 Subject: [PATCH] feat: fix getDialogs bug --- app/messenger/msg/internal/dao/outbox.go | 26 +- .../biz/dialog/dialog/class_name_registers.go | 6 +- .../biz/dialog/dialog/codec_schema.tl.pb.go | 21 +- app/service/biz/dialog/dialog/dialog.tl.pb.go | 460 ++++++++++-------- .../biz/dialog/dialog/dialog_ext_helper.go | 6 +- .../biz/dialog/dialog/rpc_client_registers.go | 2 +- .../dialog.insertOrUpdateDialog_handler.go | 7 +- 7 files changed, 301 insertions(+), 227 deletions(-) diff --git a/app/messenger/msg/internal/dao/outbox.go b/app/messenger/msg/internal/dao/outbox.go index 9d382dddc..f32b6e462 100644 --- a/app/messenger/msg/internal/dao/outbox.go +++ b/app/messenger/msg/internal/dao/outbox.go @@ -23,11 +23,10 @@ import ( "errors" "fmt" idgen_client "github.com/teamgram/teamgram-server/app/service/idgen/client" - "math" - "time" - "github.com/zeromicro/go-zero/core/jsonx" "github.com/zeromicro/go-zero/core/logx" + "math" + "time" "github.com/teamgram/marmota/pkg/hack" "github.com/teamgram/marmota/pkg/stores/sqlx" @@ -132,7 +131,7 @@ func (d *Dao) sendMessageToOutbox(ctx context.Context, fromId int64, peer *mtpro Message: message.Message, Mentioned: false, MediaUnread: message.MediaUnread, - Date2: time.Now().Unix(), + Date2: int64(outMsgBox.Message.Date), Deleted: false, } @@ -167,7 +166,7 @@ func (d *Dao) sendMessageToOutbox(ctx context.Context, fromId int64, peer *mtpro TopMessage: outBoxMsgId, UnreadCount: 0, DraftMessageData: "null", - Date2: time.Now().Unix(), + Date2: int64(outMsgBox.Message.Date), } if dialogMessageId > 1 { //// if box_id > 1, then dialogs already created. @@ -214,7 +213,7 @@ func (d *Dao) sendMessageToOutbox(ctx context.Context, fromId int64, peer *mtpro TopMessage: outBoxMsgId, UnreadCount: 0, DraftMessageData: "null", - Date2: time.Now().Unix(), + Date2: int64(outMsgBox.Message.Date), } if dialogMessageId > 1 { @@ -401,14 +400,14 @@ func (d *Dao) DeleteMessages(ctx context.Context, userId int64, msgIds []int32) topMessageIndex = math.MaxInt32 } - getLastTopMessage := func(topMessage2 int32) int32 { + getLastTopMessage := func(topMessage2 int32) (int32, int64) { for i := 0; i < len(topMessageDOList); i++ { if topMessageDOList[i].UserMessageBoxId >= topMessage2 { continue } - return topMessageDOList[i].UserMessageBoxId + return topMessageDOList[i].UserMessageBoxId, topMessageDOList[i].Date2 } - return 0 + return 0, 0 } //_, err = d.DialogsDAO.SelectDialogsWithCB().SelectByPeer(ctx, userId, model.GetPeerIdByDialogId(userId, dialogId)) @@ -417,7 +416,7 @@ func (d *Dao) DeleteMessages(ctx context.Context, userId int64, msgIds []int32) //} for i := 0; i < len(msgDOList); i++ { - topMessage := getLastTopMessage(topMessageIndex) + topMessage, _ := getLastTopMessage(topMessageIndex) if topMessage == msgDOList[i].UserMessageBoxId { topMessageIndex = topMessage } @@ -430,9 +429,10 @@ func (d *Dao) DeleteMessages(ctx context.Context, userId int64, msgIds []int32) if result.Err != nil { return } - - d.DialogsDAO.UpdateOutboxDialogTx(tx, - getLastTopMessage(topMessageIndex), + topMessage, _ := getLastTopMessage(topMessageIndex) + d.DialogsDAO.UpdateOutboxDialogTx( + tx, + topMessage, time.Now().Unix(), userId, peer.PeerType, diff --git a/app/service/biz/dialog/dialog/class_name_registers.go b/app/service/biz/dialog/dialog/class_name_registers.go index 3057a1ac0..e1c8cb874 100644 --- a/app/service/biz/dialog/dialog/class_name_registers.go +++ b/app/service/biz/dialog/dialog/class_name_registers.go @@ -2,7 +2,7 @@ * WARNING! All changes made in this file will be lost! * Created from 'scheme.tl' by 'mtprotoc' * - * Copyright (c) 2022-present, Teamgram Authors. + * Copyright (c) 2023-present, Teamgram Authors. * All rights reserved. * * Author: Benqi (wubenqi@gmail.com) @@ -139,7 +139,7 @@ var clazzNameRegisters2 = map[string]map[int]int32{ }, Predicate_dialog_insertOrUpdateDialog: { - 0: -317723281, // 0xed0fed6f + 0: 382601889, // 0x16ce0aa1 }, Predicate_dialog_deleteDialog: { @@ -219,7 +219,7 @@ var clazzIdNameRegisters2 = map[int32]string{ -92425614: Predicate_dialog_getTopMessage, // 0xfa7db272 489158840: Predicate_dialog_updateReadInbox, // 0x1d27f8b8 1483799934: Predicate_dialog_updateReadOutbox, // 0x5870fd7e - -317723281: Predicate_dialog_insertOrUpdateDialog, // 0xed0fed6f + 382601889: Predicate_dialog_insertOrUpdateDialog, // 0x16ce0aa1 28515811: Predicate_dialog_deleteDialog, // 0x1b31de3 -1885617487: Predicate_dialog_getUserPinnedMessage, // 0x8f9bc2b1 371388970: Predicate_dialog_updateUserPinnedMessage, // 0x1622f22a diff --git a/app/service/biz/dialog/dialog/codec_schema.tl.pb.go b/app/service/biz/dialog/dialog/codec_schema.tl.pb.go index 24d8044e4..3e051ada0 100644 --- a/app/service/biz/dialog/dialog/codec_schema.tl.pb.go +++ b/app/service/biz/dialog/dialog/codec_schema.tl.pb.go @@ -142,9 +142,9 @@ var clazzIdRegisters2 = map[int32]func() mtproto.TLObject{ Constructor: 1483799934, } }, - -317723281: func() mtproto.TLObject { // 0xed0fed6f + 382601889: func() mtproto.TLObject { // 0x16ce0aa1 return &TLDialogInsertOrUpdateDialog{ - Constructor: -317723281, + Constructor: 382601889, } }, 28515811: func() mtproto.TLObject { // 0x1b31de3 @@ -1914,8 +1914,8 @@ func (m *TLDialogInsertOrUpdateDialog) Encode(layer int32) []byte { // x.Int(int32(CRC32_dialog_insertOrUpdateDialog)) switch uint32(m.Constructor) { - case 0xed0fed6f: - x.UInt(0xed0fed6f) + case 0x16ce0aa1: + x.UInt(0x16ce0aa1) // set flags var flags uint32 = 0 @@ -1935,6 +1935,9 @@ func (m *TLDialogInsertOrUpdateDialog) Encode(layer int32) []byte { if m.GetUnreadMark() == true { flags |= 1 << 4 } + if m.GetDate2() != nil { + flags |= 1 << 5 + } x.UInt(flags) @@ -1958,6 +1961,10 @@ func (m *TLDialogInsertOrUpdateDialog) Encode(layer int32) []byte { x.Int(m.GetUnreadCount().Value) } + if m.GetDate2() != nil { + x.Long(m.GetDate2().Value) + } + default: // log.Errorf("") } @@ -1971,7 +1978,7 @@ func (m *TLDialogInsertOrUpdateDialog) CalcByteSize(layer int32) int { func (m *TLDialogInsertOrUpdateDialog) Decode(dBuf *mtproto.DecodeBuf) error { switch uint32(m.Constructor) { - case 0xed0fed6f: + case 0x16ce0aa1: flags := dBuf.UInt() _ = flags @@ -1999,6 +2006,10 @@ func (m *TLDialogInsertOrUpdateDialog) Decode(dBuf *mtproto.DecodeBuf) error { if (flags & (1 << 4)) != 0 { m.UnreadMark = true } + if (flags & (1 << 5)) != 0 { + m.Date2 = &types.Int64Value{Value: dBuf.Long()} + } + return dBuf.GetError() default: diff --git a/app/service/biz/dialog/dialog/dialog.tl.pb.go b/app/service/biz/dialog/dialog/dialog.tl.pb.go index 4f0e42625..eb37bd067 100644 --- a/app/service/biz/dialog/dialog/dialog.tl.pb.go +++ b/app/service/biz/dialog/dialog/dialog.tl.pb.go @@ -57,7 +57,7 @@ const ( CRC32_dialog_getTopMessage TLConstructor = -92425614 CRC32_dialog_updateReadInbox TLConstructor = 489158840 CRC32_dialog_updateReadOutbox TLConstructor = 1483799934 - CRC32_dialog_insertOrUpdateDialog TLConstructor = -317723281 + CRC32_dialog_insertOrUpdateDialog TLConstructor = 382601889 CRC32_dialog_deleteDialog TLConstructor = 28515811 CRC32_dialog_getUserPinnedMessage TLConstructor = -1885617487 CRC32_dialog_updateUserPinnedMessage TLConstructor = 371388970 @@ -97,7 +97,7 @@ var TLConstructor_name = map[int32]string{ -92425614: "CRC32_dialog_getTopMessage", 489158840: "CRC32_dialog_updateReadInbox", 1483799934: "CRC32_dialog_updateReadOutbox", - -317723281: "CRC32_dialog_insertOrUpdateDialog", + 382601889: "CRC32_dialog_insertOrUpdateDialog", 28515811: "CRC32_dialog_deleteDialog", -1885617487: "CRC32_dialog_getUserPinnedMessage", 371388970: "CRC32_dialog_updateUserPinnedMessage", @@ -137,7 +137,7 @@ var TLConstructor_value = map[string]int32{ "CRC32_dialog_getTopMessage": -92425614, "CRC32_dialog_updateReadInbox": 489158840, "CRC32_dialog_updateReadOutbox": 1483799934, - "CRC32_dialog_insertOrUpdateDialog": -317723281, + "CRC32_dialog_insertOrUpdateDialog": 382601889, "CRC32_dialog_deleteDialog": 28515811, "CRC32_dialog_getUserPinnedMessage": -1885617487, "CRC32_dialog_updateUserPinnedMessage": 371388970, @@ -2049,6 +2049,7 @@ type TLDialogInsertOrUpdateDialog struct { ReadInboxMaxId *types.Int32Value `protobuf:"bytes,8,opt,name=read_inbox_max_id,json=readInboxMaxId,proto3" json:"read_inbox_max_id,omitempty"` UnreadCount *types.Int32Value `protobuf:"bytes,9,opt,name=unread_count,json=unreadCount,proto3" json:"unread_count,omitempty"` UnreadMark bool `protobuf:"varint,10,opt,name=unread_mark,json=unreadMark,proto3" json:"unread_mark,omitempty"` + Date2 *types.Int64Value `protobuf:"bytes,11,opt,name=date2,proto3" json:"date2,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2150,6 +2151,13 @@ func (m *TLDialogInsertOrUpdateDialog) GetUnreadMark() bool { return false } +func (m *TLDialogInsertOrUpdateDialog) GetDate2() *types.Int64Value { + if m != nil { + return m.Date2 + } + return nil +} + //-------------------------------------------------------------------------------------------- type TLDialogDeleteDialog struct { Constructor TLConstructor `protobuf:"varint,1,opt,name=constructor,proto3,enum=dialog.TLConstructor" json:"constructor,omitempty"` @@ -3420,174 +3428,175 @@ func init() { func init() { proto.RegisterFile("dialog.tl.proto", fileDescriptor_0afe6dcb8d4fc860) } var fileDescriptor_0afe6dcb8d4fc860 = []byte{ - // 2660 bytes of a gzipped FileDescriptorProto + // 2679 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x6b, 0x6c, 0x1c, 0x57, - 0xf5, 0xf7, 0xd8, 0xbb, 0x6b, 0xfb, 0x38, 0x76, 0x26, 0x13, 0x3f, 0x36, 0xeb, 0xc4, 0x5e, 0x4f, - 0xec, 0xc4, 0x69, 0x9b, 0xf5, 0xff, 0xef, 0x20, 0x2a, 0x01, 0xaa, 0x94, 0x38, 0x09, 0x59, 0xd5, - 0x76, 0xcc, 0xe0, 0x24, 0x02, 0x15, 0x96, 0xf1, 0xce, 0xf5, 0x7a, 0xe8, 0xee, 0xce, 0x6a, 0x66, - 0x36, 0xc4, 0x7c, 0xe2, 0x51, 0xa4, 0xa4, 0x4d, 0x11, 0x9f, 0x82, 0x14, 0x51, 0x4a, 0x83, 0x90, - 0xa0, 0x44, 0xd0, 0x52, 0x22, 0x10, 0x29, 0x2a, 0xa2, 0xa1, 0x41, 0x11, 0x15, 0x95, 0x4a, 0x25, - 0x1e, 0x42, 0x6a, 0x93, 0xd6, 0xa4, 0x45, 0x6a, 0x93, 0xaa, 0x6d, 0xc8, 0x83, 0x16, 0xcd, 0xbd, - 0xf3, 0xba, 0x73, 0xef, 0xae, 0x03, 0x8a, 0xc3, 0x92, 0x2f, 0xd9, 0xb9, 0xf7, 0xdc, 0x33, 0xbf, - 0xf3, 0xbb, 0xe7, 0x9e, 0x7b, 0xe6, 0x1c, 0xc3, 0x6a, 0x4d, 0x57, 0x8b, 0x46, 0x21, 0x63, 0x17, - 0x33, 0x15, 0xd3, 0xb0, 0x0d, 0x29, 0x41, 0x06, 0x52, 0x5b, 0x0b, 0xba, 0xbd, 0x50, 0x9d, 0xcb, - 0xe4, 0x8d, 0xd2, 0x58, 0xc1, 0x28, 0x18, 0x63, 0x78, 0x7a, 0xae, 0x3a, 0x8f, 0x9f, 0xf0, 0x03, - 0xfe, 0x45, 0x96, 0xa5, 0x06, 0x0a, 0x86, 0x51, 0x28, 0xa2, 0x40, 0xea, 0x0b, 0xa6, 0x5a, 0xa9, - 0x20, 0xd3, 0x72, 0xe7, 0x53, 0x56, 0x7e, 0x01, 0x95, 0x54, 0xe7, 0x3d, 0x79, 0xc3, 0x44, 0x39, - 0x7b, 0xb1, 0x82, 0xbc, 0xb9, 0x75, 0xc1, 0x9c, 0x6d, 0xaa, 0x65, 0xab, 0x62, 0x98, 0xb6, 0x3b, - 0xd5, 0x1d, 0x4c, 0x59, 0x8b, 0xe5, 0x3c, 0x19, 0x95, 0x7f, 0xd4, 0x0c, 0xed, 0x3b, 0x31, 0xcc, - 0x5d, 0x87, 0x6c, 0x69, 0x04, 0xba, 0x2a, 0x26, 0xd2, 0xf4, 0xbc, 0x6a, 0xa3, 0x5c, 0x59, 0x2d, - 0xa1, 0xa4, 0x90, 0x16, 0x46, 0xdb, 0x95, 0x4e, 0x7f, 0x74, 0x5a, 0x2d, 0x21, 0xe9, 0x6e, 0xe8, - 0xc8, 0x1b, 0x65, 0xcb, 0x36, 0xab, 0x79, 0xdb, 0x30, 0x93, 0xcd, 0x69, 0x61, 0xb4, 0x6b, 0xbc, - 0x27, 0xe3, 0xda, 0x3f, 0x3b, 0x39, 0x11, 0x4c, 0x2a, 0x61, 0x49, 0xa9, 0x1b, 0xe2, 0x86, 0xa9, - 0x21, 0x33, 0xd9, 0x92, 0x16, 0x46, 0x5b, 0x14, 0xf2, 0x20, 0x6d, 0x06, 0x97, 0xa9, 0x64, 0x2c, - 0x2d, 0x8c, 0x76, 0x8c, 0xaf, 0xce, 0x94, 0x6c, 0x8c, 0x2e, 0x43, 0x90, 0x29, 0xee, 0xb4, 0x34, - 0x0a, 0xa2, 0x7a, 0x50, 0xd5, 0x8b, 0xea, 0x5c, 0x11, 0xe5, 0x4a, 0x7a, 0x39, 0xa7, 0x6b, 0xc9, - 0x78, 0x5a, 0x18, 0x8d, 0x2b, 0x5d, 0xfe, 0xf8, 0x94, 0x5e, 0xce, 0x6a, 0x92, 0x04, 0x31, 0x4d, - 0xb5, 0x51, 0x32, 0x81, 0xdf, 0x83, 0x7f, 0x3b, 0xc6, 0xd9, 0x0b, 0xa8, 0x84, 0x72, 0xa8, 0x64, - 0xd8, 0x7a, 0xde, 0x28, 0x27, 0x5b, 0x89, 0x71, 0x78, 0x74, 0x97, 0x3b, 0x28, 0x6d, 0x00, 0xb0, - 0xed, 0x62, 0xae, 0x82, 0x4c, 0xdd, 0xd0, 0x92, 0x6d, 0x58, 0x7d, 0xbb, 0x6d, 0x17, 0x67, 0xf0, - 0x80, 0x7c, 0x37, 0xac, 0x9a, 0x9d, 0xcc, 0x69, 0x3e, 0x65, 0x9b, 0x21, 0xae, 0xa9, 0xb6, 0x3a, - 0x8e, 0x99, 0xea, 0x18, 0x5f, 0xe3, 0xb1, 0xe0, 0x93, 0xaa, 0x90, 0x79, 0xf9, 0x45, 0x01, 0x56, - 0x93, 0xc1, 0xdd, 0x7a, 0xd1, 0x46, 0xe6, 0xed, 0xe0, 0xbb, 0x0b, 0x9a, 0x75, 0x0d, 0x93, 0x1d, - 0x57, 0x9a, 0x75, 0x4d, 0xfa, 0x08, 0x74, 0x92, 0x45, 0xb9, 0x79, 0x8c, 0xc1, 0x25, 0xbc, 0x27, - 0x42, 0x38, 0x01, 0xa8, 0xac, 0xd2, 0x42, 0x4f, 0xc1, 0xde, 0xc5, 0x43, 0x7b, 0x27, 0x4f, 0x80, - 0xe4, 0xd3, 0x11, 0xd8, 0xb5, 0x95, 0x26, 0xa5, 0x8f, 0x26, 0xc5, 0x97, 0xf3, 0xa8, 0xf9, 0xa5, - 0x4f, 0xcd, 0x8c, 0x5e, 0x2e, 0x23, 0xed, 0xbf, 0xe7, 0x8a, 0xfd, 0xd0, 0x5e, 0x41, 0xc8, 0xc4, - 0x67, 0x0a, 0x93, 0x13, 0x57, 0xda, 0x9c, 0x81, 0xd9, 0xc5, 0x0a, 0x92, 0xfa, 0xa0, 0x15, 0x4f, - 0xba, 0x5e, 0xd7, 0xa2, 0x24, 0x9c, 0xc7, 0xac, 0x46, 0x91, 0x10, 0x58, 0x50, 0x9f, 0x04, 0x5f, - 0xce, 0x23, 0xe1, 0x94, 0x00, 0x1d, 0x64, 0xca, 0xda, 0xa9, 0xda, 0xea, 0xed, 0x20, 0xa0, 0x6a, - 0x21, 0xd3, 0x4a, 0xb6, 0xa4, 0x5b, 0x1c, 0x02, 0xf0, 0x83, 0x33, 0x9a, 0x5f, 0x50, 0x6d, 0x2b, - 0x19, 0x23, 0xa3, 0xf8, 0x41, 0x4a, 0x41, 0x5b, 0x7e, 0x41, 0x2d, 0x97, 0x51, 0xd1, 0x4a, 0xc6, - 0xf1, 0x84, 0xff, 0x2c, 0x6f, 0x87, 0xee, 0xd9, 0xc9, 0x9c, 0xa5, 0x97, 0x2a, 0x45, 0x14, 0xc6, - 0xbf, 0x85, 0x36, 0x7f, 0x2d, 0x6d, 0x3e, 0x96, 0xf1, 0x4c, 0x7f, 0x4e, 0x80, 0xee, 0x19, 0x84, - 0xcc, 0x03, 0xba, 0xbd, 0xb0, 0xd3, 0x54, 0xe7, 0xed, 0x29, 0x64, 0x59, 0x6a, 0x01, 0xad, 0x38, - 0x07, 0x43, 0x10, 0x73, 0xb6, 0x10, 0xfb, 0x40, 0xc7, 0x78, 0xa7, 0x7f, 0x0c, 0x1c, 0x30, 0x0a, - 0x9e, 0x92, 0xee, 0x84, 0xb8, 0xe6, 0x40, 0x62, 0x8f, 0x4a, 0x08, 0xa8, 0x42, 0x64, 0xe4, 0x7b, - 0xa1, 0x67, 0x76, 0x32, 0x57, 0xad, 0x38, 0xf1, 0x86, 0x32, 0x64, 0x9c, 0x26, 0x63, 0xbd, 0x87, - 0x8d, 0x67, 0xb5, 0xc7, 0xca, 0x4b, 0x02, 0xa4, 0x7c, 0xb7, 0xca, 0x59, 0xea, 0x41, 0x5a, 0x65, - 0xc4, 0x68, 0xe1, 0xa6, 0x8d, 0xee, 0x83, 0x56, 0x67, 0xaf, 0x73, 0x6e, 0x64, 0x68, 0x51, 0x12, - 0xce, 0x63, 0x56, 0xfb, 0xcf, 0x9c, 0x5f, 0x1a, 0x83, 0xd6, 0x12, 0x81, 0x84, 0xa3, 0x6d, 0x4d, - 0x8a, 0x3c, 0x29, 0xf9, 0x7b, 0x02, 0xf4, 0x07, 0x76, 0xe5, 0x8b, 0x48, 0x35, 0x1b, 0xd1, 0x30, - 0xf9, 0xf3, 0xd0, 0x1b, 0xc0, 0x2c, 0x20, 0x7b, 0x7b, 0xb1, 0x88, 0x71, 0x5a, 0xb7, 0x1e, 0xa1, - 0x5c, 0x84, 0x64, 0x84, 0x92, 0x95, 0x7c, 0xdb, 0x1f, 0x28, 0xcf, 0x2a, 0xa9, 0xe6, 0xfd, 0xe4, - 0x50, 0xee, 0x2b, 0x9b, 0x48, 0xd5, 0x1a, 0xc6, 0xb3, 0x32, 0xd0, 0x51, 0xc5, 0x88, 0x30, 0x44, - 0xd7, 0xbb, 0x82, 0x43, 0xba, 0xc3, 0x30, 0x8a, 0x0a, 0x10, 0x89, 0x29, 0xd5, 0xbc, 0x5f, 0x3e, - 0x27, 0xc0, 0xba, 0xc0, 0x2c, 0xdb, 0x28, 0x14, 0xbc, 0x88, 0x34, 0xa3, 0x97, 0x1b, 0xc6, 0xaa, - 0x11, 0x48, 0x54, 0x70, 0xec, 0xe7, 0x1b, 0xe4, 0x4e, 0xca, 0x55, 0x18, 0xa2, 0xbc, 0x2f, 0xbc, - 0x43, 0x8e, 0xb5, 0x93, 0xba, 0x65, 0xaf, 0x80, 0x6b, 0xbc, 0x22, 0x40, 0x9a, 0xf3, 0x5e, 0x6b, - 0xc7, 0xe2, 0xde, 0xf9, 0x79, 0x0b, 0xd9, 0x3b, 0x9d, 0x4c, 0xea, 0xd6, 0x53, 0xf9, 0x21, 0xe8, - 0x42, 0x87, 0xf2, 0xc5, 0xaa, 0x86, 0x72, 0x2e, 0x39, 0x31, 0x1e, 0x39, 0x9d, 0xae, 0x10, 0xb9, - 0x3c, 0xa5, 0x41, 0xe8, 0x30, 0x30, 0xaa, 0x1c, 0x4e, 0xf6, 0x48, 0x2a, 0x08, 0x46, 0x00, 0xb4, - 0x1b, 0xe2, 0x45, 0xbd, 0xa4, 0xdb, 0x98, 0xea, 0xb8, 0x42, 0x1e, 0xe4, 0xd3, 0x02, 0xbe, 0xb2, - 0x18, 0x1b, 0x1b, 0xc6, 0xae, 0x7e, 0x68, 0x9f, 0x37, 0x8a, 0x5a, 0xe0, 0x3d, 0x71, 0xa5, 0x8d, - 0x0c, 0x64, 0x35, 0xf9, 0x88, 0x00, 0xeb, 0xf9, 0x3b, 0x94, 0xd5, 0x56, 0xc6, 0x29, 0x9c, 0x09, - 0x5d, 0xcb, 0x15, 0x75, 0xcb, 0x76, 0xd3, 0x82, 0x84, 0x8e, 0x5f, 0x25, 0xff, 0x8a, 0x3a, 0x71, - 0x01, 0x96, 0x09, 0xa3, 0x5a, 0xb6, 0xff, 0x37, 0xe8, 0x7c, 0x88, 0x8a, 0x85, 0x05, 0x64, 0x93, - 0x45, 0x2b, 0xe7, 0x12, 0x14, 0x9a, 0x58, 0x04, 0xcd, 0xf3, 0x02, 0x0c, 0x04, 0x68, 0x4c, 0x84, - 0xb3, 0xd2, 0x95, 0x46, 0xb4, 0x11, 0xe2, 0xf3, 0x86, 0x99, 0x47, 0x7c, 0x32, 0xc9, 0x5c, 0x5d, - 0x12, 0xc3, 0x0e, 0x92, 0xa0, 0x1c, 0xe4, 0x31, 0x01, 0xfa, 0x38, 0x0e, 0xe2, 0xf8, 0x6a, 0xc3, - 0xdc, 0xf3, 0x0c, 0xc6, 0x59, 0xa3, 0xd2, 0x68, 0xb9, 0xc8, 0x59, 0xea, 0xa0, 0x91, 0x04, 0x53, - 0x41, 0xaa, 0x96, 0x2d, 0xcf, 0x19, 0x87, 0x1a, 0xe6, 0x6a, 0x93, 0xa1, 0x13, 0x5f, 0xd7, 0xba, - 0x83, 0xca, 0x99, 0x26, 0x61, 0xb7, 0xc3, 0xf4, 0x90, 0x66, 0x35, 0xe7, 0x92, 0x4e, 0xf1, 0x2c, - 0xd9, 0x5b, 0xb5, 0x1b, 0xc9, 0x94, 0x61, 0xe8, 0xc2, 0xa6, 0x18, 0x18, 0x56, 0x60, 0xcb, 0x2a, - 0xd3, 0xc7, 0x9a, 0xd5, 0xe4, 0x3f, 0xb5, 0x84, 0x8f, 0xab, 0x5e, 0xb6, 0x90, 0x69, 0xef, 0x35, - 0xf7, 0x91, 0xfc, 0x9f, 0xd4, 0x2c, 0x1a, 0xc5, 0xa0, 0x8f, 0x41, 0x87, 0x6d, 0x54, 0x72, 0x74, - 0xaa, 0xde, 0x9f, 0x21, 0xb5, 0xa6, 0x8c, 0x57, 0x6b, 0xca, 0x64, 0xcb, 0xf6, 0xb6, 0xf1, 0xfd, - 0x6a, 0xb1, 0x8a, 0x14, 0xb0, 0x83, 0x73, 0xb0, 0x07, 0xa4, 0x30, 0x1d, 0x25, 0x15, 0x53, 0xd2, - 0xba, 0xbc, 0x92, 0xd5, 0x01, 0x5f, 0x53, 0xea, 0xa1, 0xac, 0x26, 0xed, 0x86, 0x35, 0x21, 0x1f, - 0x71, 0x15, 0xb5, 0x2d, 0xaf, 0xa8, 0xcb, 0x77, 0x22, 0xa2, 0xe7, 0x1e, 0x58, 0xe5, 0x26, 0x87, - 0x79, 0xe7, 0xb2, 0x49, 0xb6, 0x2f, 0xaf, 0xc2, 0xcd, 0x26, 0xc9, 0xe5, 0x34, 0x48, 0x27, 0x97, - 0x90, 0x16, 0x46, 0xdb, 0xa8, 0x6c, 0xf2, 0x3b, 0x42, 0x38, 0xff, 0xd7, 0x50, 0x11, 0x35, 0xda, - 0x9e, 0xca, 0xdf, 0xa7, 0x6e, 0x8b, 0x02, 0xb2, 0xf7, 0x59, 0xde, 0x6d, 0xd1, 0x68, 0x01, 0xec, - 0xf7, 0x42, 0x38, 0x9f, 0x25, 0xc7, 0xbe, 0x61, 0xd1, 0x3a, 0x81, 0x8c, 0xe4, 0x17, 0xb9, 0x92, - 0x55, 0x08, 0x05, 0x32, 0x32, 0x38, 0x65, 0x15, 0xb2, 0x9a, 0x7c, 0x46, 0x80, 0xe1, 0xfa, 0x67, - 0xdf, 0x2d, 0x9c, 0xdd, 0x7a, 0xa3, 0x48, 0x59, 0x2f, 0x56, 0xbb, 0xac, 0x17, 0xbf, 0xe9, 0xb2, - 0x9e, 0xfc, 0x25, 0x2a, 0x9d, 0x0c, 0xbb, 0xf9, 0xed, 0x82, 0x2f, 0x1f, 0x15, 0x40, 0x8e, 0xfa, - 0x46, 0x18, 0x82, 0xb5, 0x17, 0xd7, 0xe6, 0x6e, 0x3d, 0x10, 0xbf, 0x06, 0xe8, 0x64, 0xb5, 0x71, - 0xaf, 0xa4, 0x59, 0x8e, 0x24, 0x84, 0x14, 0x94, 0x15, 0xf8, 0xe4, 0x7a, 0x90, 0x9f, 0x44, 0xef, - 0xc6, 0xc9, 0xd5, 0xed, 0x4e, 0x40, 0x7f, 0x4a, 0x81, 0x41, 0x9a, 0x6e, 0xcf, 0x20, 0x64, 0x12, - 0x2c, 0x2b, 0x91, 0x7b, 0x8e, 0x82, 0x88, 0x8f, 0xa0, 0xfb, 0xc2, 0xd0, 0x37, 0x46, 0x97, 0x33, - 0x4e, 0xa8, 0xc0, 0x9f, 0x35, 0x75, 0xb3, 0xf8, 0x53, 0x02, 0xdc, 0x49, 0x71, 0x38, 0x41, 0xca, - 0x93, 0x5e, 0xf1, 0x09, 0xa9, 0xda, 0x8c, 0x6a, 0xda, 0x7a, 0x5e, 0xaf, 0xa8, 0xe5, 0x95, 0xa8, - 0xa9, 0x48, 0x1b, 0x00, 0xdc, 0x92, 0xa8, 0x47, 0x6b, 0x8b, 0xd2, 0xee, 0x8e, 0x64, 0x35, 0xa9, - 0x07, 0x12, 0x6e, 0x28, 0x21, 0xd0, 0xe3, 0x25, 0x1c, 0x44, 0xce, 0x52, 0x97, 0x8c, 0x85, 0x71, - 0xdb, 0xb3, 0x0b, 0xa8, 0x84, 0x1a, 0xa8, 0x5e, 0x11, 0x6d, 0x9b, 0x24, 0x38, 0x6d, 0x13, 0xe7, - 0x53, 0xb0, 0x8f, 0xb2, 0x64, 0x8f, 0x6e, 0xd9, 0x86, 0xb9, 0x38, 0x3b, 0x3b, 0xd9, 0x30, 0xa6, - 0xd0, 0xad, 0x9d, 0x44, 0xb4, 0xb5, 0xf3, 0x44, 0xf4, 0x53, 0x70, 0x6a, 0x31, 0x5c, 0xd0, 0xbe, - 0xf5, 0x56, 0x48, 0x10, 0x73, 0x7e, 0x61, 0x03, 0xda, 0x14, 0xfc, 0xdb, 0x19, 0xcb, 0x2f, 0xa8, - 0x36, 0x46, 0xde, 0xa6, 0xe0, 0xdf, 0x52, 0x12, 0x5a, 0x5d, 0x4f, 0xc2, 0xa0, 0xdb, 0x14, 0xef, - 0x51, 0xfe, 0x04, 0xf4, 0xef, 0x47, 0xce, 0x4b, 0x72, 0xdc, 0xfa, 0xb9, 0x5b, 0x76, 0xb6, 0x92, - 0x42, 0xba, 0xe5, 0xe6, 0xca, 0xce, 0x96, 0x7c, 0x0f, 0xac, 0x71, 0x55, 0xba, 0xb5, 0x33, 0x84, - 0x4c, 0xaf, 0x98, 0xef, 0x29, 0x5a, 0x1b, 0xb9, 0x59, 0x70, 0xbd, 0xdc, 0x5d, 0xff, 0x51, 0x10, - 0xa9, 0xf5, 0xa1, 0x26, 0x99, 0xb7, 0xbc, 0x56, 0x93, 0xcc, 0x92, 0x3f, 0x0e, 0xbd, 0xd4, 0x62, - 0xa6, 0xa5, 0xe4, 0xa9, 0xa8, 0xdf, 0x52, 0x62, 0x15, 0x31, 0x6d, 0x99, 0x1a, 0x8a, 0x22, 0x6d, - 0x19, 0x4b, 0xde, 0x08, 0x1d, 0xae, 0xa2, 0x49, 0xa3, 0x5c, 0x70, 0xae, 0x8c, 0x60, 0x75, 0x8b, - 0x2b, 0x74, 0xc7, 0xf5, 0x0e, 0xe8, 0xa4, 0x1c, 0x40, 0x5a, 0x03, 0x9d, 0x13, 0xca, 0xc4, 0xb6, - 0xf1, 0xdc, 0xbe, 0xe9, 0x7b, 0xa7, 0xf7, 0x1e, 0x98, 0x16, 0x9b, 0xa4, 0x11, 0x48, 0x92, 0x21, - 0xb6, 0x3f, 0x20, 0xfe, 0xe4, 0xc8, 0x95, 0x53, 0x1f, 0x38, 0xff, 0x04, 0x69, 0x3d, 0xac, 0x26, - 0x62, 0x7e, 0x8f, 0x51, 0x7c, 0xf9, 0x85, 0xa5, 0x37, 0xaf, 0x7b, 0xb3, 0x3d, 0xe1, 0x59, 0x1f, - 0xae, 0x78, 0xf2, 0xcc, 0xb7, 0xaa, 0x92, 0x4c, 0xcf, 0xfa, 0xac, 0x88, 0x6f, 0x5f, 0xb8, 0x71, - 0xf5, 0x1f, 0x44, 0xc3, 0x20, 0xf4, 0x11, 0x19, 0xa6, 0x65, 0x23, 0xfe, 0xf5, 0xe2, 0xd2, 0x1b, - 0x82, 0x34, 0x02, 0x1b, 0xc2, 0x4a, 0x98, 0xce, 0x83, 0x78, 0xfc, 0xa9, 0x1f, 0xbe, 0x17, 0x93, - 0xee, 0x84, 0x01, 0x4a, 0x8c, 0x29, 0xe4, 0x8b, 0xc7, 0x5f, 0xfb, 0xf5, 0x5f, 0x5c, 0xa3, 0x36, - 0xc1, 0x3a, 0x4a, 0x38, 0x5c, 0x4e, 0x17, 0x97, 0x1e, 0xbd, 0xba, 0x74, 0x8d, 0xc8, 0x6d, 0x84, - 0x7e, 0x56, 0x69, 0x20, 0x79, 0xe3, 0xb1, 0xf3, 0x0f, 0xc7, 0x18, 0x80, 0xd1, 0x02, 0xb6, 0xf8, - 0xf5, 0x13, 0xe7, 0x7e, 0x10, 0x93, 0xb6, 0xc0, 0x7a, 0x4a, 0x2c, 0x52, 0x10, 0x16, 0x7f, 0x7c, - 0xee, 0xfa, 0x53, 0x2e, 0x27, 0xff, 0x0f, 0xc3, 0x51, 0x78, 0xbc, 0x7a, 0xab, 0xf8, 0xce, 0xe5, - 0x4b, 0x2f, 0xdd, 0x20, 0x4b, 0xfe, 0x0f, 0x36, 0xf2, 0x97, 0x50, 0xa5, 0x52, 0xf1, 0x81, 0xa3, - 0xd7, 0xfe, 0x7e, 0x95, 0xac, 0x18, 0xf6, 0x88, 0x67, 0x56, 0x88, 0xc7, 0x9e, 0x3e, 0xf9, 0x84, - 0x0b, 0xe5, 0x2e, 0x18, 0xac, 0xa9, 0x97, 0x14, 0xf8, 0xc4, 0xcb, 0xdf, 0x38, 0xf6, 0xba, 0xcb, - 0x57, 0xd4, 0xc6, 0x48, 0x09, 0x4e, 0x7c, 0xed, 0xe2, 0xd2, 0x97, 0xdf, 0x27, 0xa2, 0x77, 0x44, - 0x58, 0x8b, 0x96, 0xba, 0xc4, 0x53, 0x3f, 0x3b, 0xfc, 0x9c, 0xab, 0x36, 0x03, 0x43, 0x94, 0x2c, - 0xaf, 0x10, 0x25, 0xfe, 0xed, 0x8d, 0xa3, 0x57, 0xdc, 0xed, 0xdd, 0x0c, 0x29, 0x3e, 0x0c, 0x07, - 0xb3, 0xf8, 0xee, 0x95, 0x1b, 0x0f, 0x5e, 0xab, 0x29, 0x18, 0x54, 0x5b, 0xc4, 0xb7, 0x5f, 0x7d, - 0xef, 0xc5, 0x0f, 0x3c, 0xb2, 0x68, 0xc3, 0x22, 0x25, 0x0f, 0xf1, 0xe7, 0x97, 0x1f, 0x7d, 0x9d, - 0x75, 0xd5, 0x68, 0x39, 0x41, 0x7c, 0xff, 0xda, 0xb3, 0xcf, 0xc6, 0x19, 0x73, 0x78, 0xc9, 0xba, - 0xf8, 0xd6, 0x9f, 0x9f, 0xb9, 0xe8, 0x52, 0x95, 0x8e, 0x78, 0x6b, 0x38, 0x2b, 0x16, 0x2f, 0x9c, - 0xfe, 0x5d, 0x27, 0xa3, 0x91, 0xf7, 0xed, 0x25, 0x3e, 0xf9, 0xb5, 0xb7, 0x6e, 0xf8, 0xbb, 0x3a, - 0xcc, 0x01, 0xca, 0x2e, 0x79, 0xfc, 0xd5, 0x87, 0x9e, 0x74, 0xe8, 0xdf, 0xbc, 0x2c, 0x5e, 0x72, - 0xb6, 0xc5, 0x07, 0xce, 0x9e, 0xd8, 0x27, 0x6d, 0x8a, 0xf8, 0x0c, 0x9b, 0xc5, 0x8b, 0xdf, 0xfc, - 0xe7, 0x3b, 0x5d, 0xd2, 0x38, 0x8c, 0x70, 0x50, 0xb0, 0xa9, 0xb6, 0xf8, 0xcc, 0xb1, 0x4b, 0x47, - 0xdc, 0x80, 0x33, 0xc2, 0xba, 0x0d, 0xb5, 0x40, 0x7c, 0xfa, 0x8f, 0x8f, 0x5c, 0x48, 0x30, 0xfb, - 0x15, 0x49, 0x63, 0xc5, 0x53, 0x8f, 0xbc, 0x79, 0x38, 0xc6, 0x48, 0x45, 0xf2, 0x4b, 0xf1, 0xf8, - 0xc3, 0xc7, 0x4f, 0x34, 0x4b, 0x1f, 0x86, 0x4c, 0x54, 0x57, 0xfd, 0x74, 0x4e, 0x3c, 0x7d, 0xfc, - 0xdd, 0xdf, 0x34, 0x33, 0x41, 0x26, 0x9c, 0x4e, 0x89, 0x8f, 0x9f, 0xf9, 0xc5, 0xf3, 0xee, 0xf6, - 0x0e, 0x45, 0x9c, 0x90, 0x4a, 0x56, 0xc4, 0x93, 0x97, 0x97, 0xa6, 0x79, 0x56, 0x53, 0xc9, 0x80, - 0xf8, 0xd5, 0x6f, 0x7f, 0xe5, 0x4a, 0x6b, 0x2a, 0x76, 0xf8, 0xbb, 0x03, 0x4d, 0xe3, 0x27, 0x7b, - 0xa0, 0x5d, 0x99, 0x99, 0x70, 0x8b, 0x03, 0xd3, 0xd0, 0x57, 0xab, 0x65, 0x2b, 0x07, 0xc9, 0x42, - 0xad, 0xe0, 0x9a, 0xa2, 0xab, 0xaf, 0x72, 0x93, 0x34, 0x03, 0xc9, 0x9a, 0xad, 0xd2, 0x8d, 0xac, - 0x42, 0x46, 0x88, 0xd5, 0x78, 0x1f, 0xac, 0xe5, 0x75, 0x35, 0x07, 0x58, 0x65, 0xe1, 0xf9, 0x94, - 0xff, 0xb2, 0x3a, 0x19, 0x87, 0xdc, 0x24, 0x7d, 0x0e, 0x7a, 0xf8, 0x7d, 0xcc, 0x74, 0x0d, 0xb0, - 0xff, 0xf6, 0x1b, 0x02, 0x86, 0x99, 0xd6, 0x25, 0x87, 0xe1, 0xa8, 0x0c, 0xcb, 0xc7, 0x14, 0xf4, - 0xd6, 0xe8, 0x19, 0x0e, 0xb1, 0xea, 0x22, 0x22, 0xa9, 0x2e, 0x5f, 0x1b, 0xae, 0x34, 0xc9, 0x4d, - 0xd2, 0x02, 0x0c, 0x2c, 0xd3, 0xb6, 0xdb, 0xc2, 0x65, 0x9a, 0x27, 0x9a, 0x5a, 0x17, 0xa1, 0x24, - 0xc8, 0xb7, 0xe4, 0x26, 0x09, 0xc1, 0x86, 0xfa, 0x8d, 0xba, 0xd1, 0x3a, 0x2f, 0xa2, 0x24, 0x53, - 0x49, 0xee, 0x7b, 0x76, 0x1d, 0xb2, 0x31, 0x3f, 0x6b, 0xd8, 0x5e, 0xd9, 0xfa, 0x7a, 0xaa, 0xeb, - 0xaa, 0xfb, 0x0c, 0xac, 0xab, 0xdd, 0xbc, 0x1a, 0xae, 0x8f, 0x98, 0x48, 0x2d, 0x83, 0xb6, 0xb7, - 0x46, 0x3f, 0x6a, 0xa8, 0x9e, 0x6e, 0x2c, 0xc2, 0xd9, 0xcd, 0x4f, 0xf9, 0xce, 0xc6, 0xf4, 0x86, - 0x64, 0xae, 0x3e, 0x4a, 0xa6, 0x2e, 0xd2, 0xfd, 0xd0, 0x5f, 0xaf, 0xd1, 0xb3, 0x89, 0x55, 0xcf, - 0x93, 0x63, 0xfd, 0x79, 0x12, 0xba, 0xb9, 0x0d, 0x97, 0xc1, 0x3a, 0xf6, 0x3b, 0x02, 0x29, 0x36, - 0x2f, 0x97, 0x9b, 0xa4, 0x6c, 0x58, 0x5b, 0xa8, 0x35, 0xc2, 0xd7, 0x16, 0x08, 0x70, 0xb8, 0x9c, - 0xf4, 0xb7, 0x26, 0xda, 0xc1, 0xe0, 0x6c, 0x4d, 0x44, 0x84, 0x35, 0x33, 0x08, 0x03, 0x4c, 0x17, - 0x41, 0xae, 0xa7, 0x8e, 0xc8, 0xb0, 0xfa, 0x82, 0xed, 0xe0, 0x16, 0xf2, 0x39, 0xdb, 0xc1, 0x93, - 0x63, 0xf5, 0xee, 0xf6, 0xc3, 0x2d, 0x55, 0x44, 0xe6, 0x84, 0xdb, 0xf0, 0x3c, 0xab, 0xe7, 0x80, - 0x8f, 0x8f, 0x5b, 0xe9, 0xdd, 0xc4, 0xdd, 0x0f, 0x46, 0x8e, 0xb3, 0x2d, 0xf7, 0xf9, 0x01, 0xab, - 0x56, 0x5d, 0x76, 0x4b, 0x2d, 0x3e, 0x59, 0xf5, 0x0c, 0xec, 0x39, 0x18, 0x5a, 0xbe, 0x46, 0x7a, - 0xd7, 0xcd, 0x91, 0x4b, 0xa4, 0xd9, 0x77, 0x28, 0x7e, 0x48, 0xe1, 0x14, 0x30, 0x87, 0xeb, 0x13, - 0x5d, 0x4b, 0xe7, 0x67, 0x61, 0x70, 0xb9, 0x8a, 0xe4, 0x1d, 0xb5, 0x68, 0x61, 0x65, 0x59, 0xfd, - 0xb9, 0x70, 0x60, 0xa1, 0x6b, 0x8c, 0x72, 0x9d, 0x83, 0xea, 0xca, 0xa4, 0x06, 0xb8, 0x81, 0xc5, - 0xff, 0xe2, 0xc3, 0xfe, 0xd2, 0x5b, 0xa3, 0xa6, 0x58, 0x2f, 0x10, 0x12, 0x91, 0x65, 0x02, 0x78, - 0x6f, 0x8d, 0xfa, 0x20, 0x47, 0x71, 0x44, 0xa4, 0x06, 0x6e, 0xff, 0x3b, 0x56, 0x6e, 0x92, 0x0e, - 0xc2, 0xe8, 0x4d, 0xd7, 0xf1, 0xb6, 0x71, 0x2d, 0xa9, 0xbf, 0x28, 0xb5, 0x36, 0x02, 0xc1, 0xf9, - 0xb0, 0xa7, 0xce, 0x29, 0x55, 0x87, 0xe3, 0x9c, 0xd3, 0xf0, 0x3c, 0xbb, 0xb1, 0x7b, 0xfc, 0x80, - 0x49, 0x57, 0xc1, 0x06, 0xb9, 0x8a, 0x02, 0x01, 0x56, 0xd3, 0x6c, 0xd8, 0x45, 0xe8, 0x62, 0x14, - 0xdf, 0x45, 0x28, 0x99, 0x14, 0xef, 0x4f, 0x2e, 0xe5, 0xa6, 0x1d, 0x9f, 0xbc, 0xf4, 0xca, 0x80, - 0xf0, 0xdb, 0xf3, 0x03, 0xc2, 0x0b, 0xe7, 0x07, 0x84, 0x97, 0xcf, 0x0f, 0x08, 0x9f, 0xde, 0x1e, - 0xfa, 0x03, 0x75, 0x1b, 0xa9, 0xa5, 0x82, 0xa9, 0x06, 0x3f, 0xb6, 0x5a, 0xc8, 0x3c, 0x88, 0xcc, - 0x31, 0xb5, 0x52, 0x19, 0x73, 0x7e, 0xea, 0x79, 0x34, 0x36, 0xa7, 0x7f, 0x71, 0x8c, 0xe8, 0x76, - 0xff, 0x9b, 0x4b, 0x60, 0xe0, 0xdb, 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xb1, 0xf7, 0x3c, - 0x05, 0x2f, 0x00, 0x00, + 0xf5, 0xf7, 0xd8, 0xbb, 0x6b, 0xfb, 0x6c, 0xec, 0x4c, 0x26, 0x7e, 0x6c, 0xd6, 0x89, 0x1f, 0x13, + 0x3b, 0x71, 0xfa, 0x58, 0xff, 0xeb, 0x54, 0xad, 0xf4, 0x07, 0x55, 0x4a, 0x9c, 0x84, 0xac, 0x6a, + 0x3b, 0x66, 0x70, 0x12, 0x81, 0x0a, 0xcb, 0x78, 0xe7, 0x7a, 0x3d, 0x74, 0x77, 0x67, 0x35, 0x33, + 0x1b, 0x62, 0x3e, 0xf1, 0x28, 0x52, 0xd2, 0xa6, 0x88, 0x2f, 0x04, 0x29, 0xa2, 0x94, 0x04, 0x21, + 0x41, 0x89, 0xa0, 0xa5, 0x04, 0x2a, 0x52, 0x04, 0xa2, 0xa1, 0x41, 0x11, 0x15, 0x95, 0x4a, 0x25, + 0x24, 0x84, 0xd4, 0x26, 0xad, 0x69, 0x8b, 0x54, 0x92, 0xaa, 0x4d, 0x48, 0x1a, 0x5a, 0x34, 0xf7, + 0xce, 0xeb, 0xce, 0xbd, 0xbb, 0x0e, 0x28, 0x0e, 0x4b, 0xbe, 0x64, 0xe7, 0xde, 0x73, 0xcf, 0xfc, + 0xce, 0xef, 0x9e, 0x7b, 0xee, 0x99, 0x73, 0x0c, 0xab, 0x35, 0x5d, 0x2d, 0x1a, 0x85, 0x8c, 0x5d, + 0xcc, 0x54, 0x4c, 0xc3, 0x36, 0xa4, 0x04, 0x19, 0x48, 0xdf, 0x59, 0xd0, 0xed, 0x85, 0xea, 0x5c, + 0x26, 0x6f, 0x94, 0xc6, 0x0a, 0x46, 0xc1, 0x18, 0xc3, 0xd3, 0x73, 0xd5, 0x79, 0xfc, 0x84, 0x1f, + 0xf0, 0x2f, 0xb2, 0x2c, 0xdd, 0x5f, 0x30, 0x8c, 0x42, 0x11, 0x05, 0x52, 0x9f, 0x37, 0xd5, 0x4a, + 0x05, 0x99, 0x96, 0x3b, 0x9f, 0xb6, 0xf2, 0x0b, 0xa8, 0xa4, 0x3a, 0xef, 0xc9, 0x1b, 0x26, 0xca, + 0xd9, 0x8b, 0x15, 0xe4, 0xcd, 0xad, 0x0b, 0xe6, 0x6c, 0x53, 0x2d, 0x5b, 0x15, 0xc3, 0xb4, 0xdd, + 0xa9, 0xae, 0x60, 0xca, 0x5a, 0x2c, 0xe7, 0xc9, 0xa8, 0xfc, 0xa3, 0x66, 0x68, 0xdf, 0x81, 0x61, + 0xee, 0x3c, 0x68, 0x4b, 0x23, 0xd0, 0x59, 0x31, 0x91, 0xa6, 0xe7, 0x55, 0x1b, 0xe5, 0xca, 0x6a, + 0x09, 0xa5, 0x84, 0x41, 0x61, 0xb4, 0x5d, 0xe9, 0xf0, 0x47, 0xa7, 0xd5, 0x12, 0x92, 0xee, 0x85, + 0x64, 0xde, 0x28, 0x5b, 0xb6, 0x59, 0xcd, 0xdb, 0x86, 0x99, 0x6a, 0x1e, 0x14, 0x46, 0x3b, 0xc7, + 0xbb, 0x33, 0xae, 0xfd, 0xb3, 0x93, 0x13, 0xc1, 0xa4, 0x12, 0x96, 0x94, 0xba, 0x20, 0x6e, 0x98, + 0x1a, 0x32, 0x53, 0x2d, 0x83, 0xc2, 0x68, 0x8b, 0x42, 0x1e, 0xa4, 0xcd, 0xe0, 0x32, 0x95, 0x8a, + 0x0d, 0x0a, 0xa3, 0xc9, 0xf1, 0xd5, 0x99, 0x92, 0x8d, 0xd1, 0x65, 0x08, 0x32, 0xc5, 0x9d, 0x96, + 0x46, 0x41, 0x54, 0x0f, 0xa8, 0x7a, 0x51, 0x9d, 0x2b, 0xa2, 0x5c, 0x49, 0x2f, 0xe7, 0x74, 0x2d, + 0x15, 0x1f, 0x14, 0x46, 0xe3, 0x4a, 0xa7, 0x3f, 0x3e, 0xa5, 0x97, 0xb3, 0x9a, 0x24, 0x41, 0x4c, + 0x53, 0x6d, 0x94, 0x4a, 0xe0, 0xf7, 0xe0, 0xdf, 0x8e, 0x71, 0xf6, 0x02, 0x2a, 0xa1, 0x1c, 0x2a, + 0x19, 0xb6, 0x9e, 0x37, 0xca, 0xa9, 0x56, 0x62, 0x1c, 0x1e, 0xdd, 0xe9, 0x0e, 0x4a, 0x1b, 0x00, + 0x6c, 0xbb, 0x98, 0xab, 0x20, 0x53, 0x37, 0xb4, 0x54, 0x1b, 0x56, 0xdf, 0x6e, 0xdb, 0xc5, 0x19, + 0x3c, 0x20, 0xdf, 0x0b, 0xab, 0x66, 0x27, 0x73, 0x9a, 0x4f, 0xd9, 0x66, 0x88, 0x6b, 0xaa, 0xad, + 0x8e, 0x63, 0xa6, 0x92, 0xe3, 0x6b, 0x3c, 0x16, 0x7c, 0x52, 0x15, 0x32, 0x2f, 0xbf, 0x24, 0xc0, + 0x6a, 0x32, 0xb8, 0x4b, 0x2f, 0xda, 0xc8, 0xbc, 0x15, 0x7c, 0x77, 0x42, 0xb3, 0xae, 0x61, 0xb2, + 0xe3, 0x4a, 0xb3, 0xae, 0x49, 0xff, 0x0f, 0x1d, 0x64, 0x51, 0x6e, 0x1e, 0x63, 0x70, 0x09, 0xef, + 0x8e, 0x10, 0x4e, 0x00, 0x2a, 0xab, 0xb4, 0xd0, 0x53, 0xb0, 0x77, 0xf1, 0xd0, 0xde, 0xc9, 0x13, + 0x20, 0xf9, 0x74, 0x04, 0x76, 0xdd, 0x49, 0x93, 0xd2, 0x4b, 0x93, 0xe2, 0xcb, 0x79, 0xd4, 0xfc, + 0xd2, 0xa7, 0x66, 0x46, 0x2f, 0x97, 0x91, 0xf6, 0xdf, 0x73, 0xc5, 0x3e, 0x68, 0xaf, 0x20, 0x64, + 0xe2, 0x33, 0x85, 0xc9, 0x89, 0x2b, 0x6d, 0xce, 0xc0, 0xec, 0x62, 0x05, 0x49, 0xbd, 0xd0, 0x8a, + 0x27, 0x5d, 0xaf, 0x6b, 0x51, 0x12, 0xce, 0x63, 0x56, 0xa3, 0x48, 0x08, 0x2c, 0xa8, 0x4f, 0x82, + 0x2f, 0xe7, 0x91, 0x70, 0x4a, 0x80, 0x24, 0x99, 0xb2, 0x76, 0xa8, 0xb6, 0x7a, 0x2b, 0x08, 0xa8, + 0x5a, 0xc8, 0xb4, 0x52, 0x2d, 0x83, 0x2d, 0x0e, 0x01, 0xf8, 0xc1, 0x19, 0xcd, 0x2f, 0xa8, 0xb6, + 0x95, 0x8a, 0x91, 0x51, 0xfc, 0x20, 0xa5, 0xa1, 0x2d, 0xbf, 0xa0, 0x96, 0xcb, 0xa8, 0x68, 0xa5, + 0xe2, 0x78, 0xc2, 0x7f, 0x96, 0xb7, 0x41, 0xd7, 0xec, 0x64, 0xce, 0xd2, 0x4b, 0x95, 0x22, 0x0a, + 0xe3, 0xdf, 0x42, 0x9b, 0xbf, 0x96, 0x36, 0x1f, 0xcb, 0x78, 0xa6, 0x3f, 0x2f, 0x40, 0xd7, 0x0c, + 0x42, 0xe6, 0x7e, 0xdd, 0x5e, 0xd8, 0x61, 0xaa, 0xf3, 0xf6, 0x14, 0xb2, 0x2c, 0xb5, 0x80, 0x56, + 0x9c, 0x83, 0x21, 0x88, 0x39, 0x5b, 0x88, 0x7d, 0x20, 0x39, 0xde, 0xe1, 0x1f, 0x03, 0x07, 0x8c, + 0x82, 0xa7, 0xa4, 0xdb, 0x21, 0xae, 0x39, 0x90, 0xd8, 0xa3, 0x12, 0x02, 0xaa, 0x10, 0x19, 0xf9, + 0x7e, 0xe8, 0x9e, 0x9d, 0xcc, 0x55, 0x2b, 0x4e, 0xbc, 0xa1, 0x0c, 0x19, 0xa7, 0xc9, 0x58, 0xef, + 0x61, 0xe3, 0x59, 0xed, 0xb1, 0xf2, 0xb2, 0x00, 0x69, 0xdf, 0xad, 0x72, 0x96, 0x7a, 0x80, 0x56, + 0x19, 0x31, 0x5a, 0xb8, 0x61, 0xa3, 0x7b, 0xa1, 0xd5, 0xd9, 0xeb, 0x9c, 0x1b, 0x19, 0x5a, 0x94, + 0x84, 0xf3, 0x98, 0xd5, 0xfe, 0x33, 0xe7, 0x97, 0xc6, 0xa0, 0xb5, 0x44, 0x20, 0xe1, 0x68, 0x5b, + 0x93, 0x22, 0x4f, 0x4a, 0xfe, 0x9e, 0x00, 0x7d, 0x81, 0x5d, 0xf9, 0x22, 0x52, 0xcd, 0x46, 0x34, + 0x4c, 0xfe, 0x1c, 0xf4, 0x04, 0x30, 0x0b, 0xc8, 0xde, 0x56, 0x2c, 0x62, 0x9c, 0xd6, 0xcd, 0x47, + 0x28, 0x17, 0x21, 0x15, 0xa1, 0x64, 0x25, 0xdf, 0xf6, 0x47, 0xca, 0xb3, 0x4a, 0xaa, 0xf9, 0x20, + 0x39, 0x94, 0x7b, 0xcb, 0x26, 0x52, 0xb5, 0x86, 0xf1, 0xac, 0x0c, 0x24, 0xab, 0x18, 0x11, 0x86, + 0xe8, 0x7a, 0x57, 0x70, 0x48, 0xb7, 0x1b, 0x46, 0x51, 0x01, 0x22, 0x31, 0xa5, 0x9a, 0x0f, 0xca, + 0xe7, 0x04, 0x58, 0x17, 0x98, 0x65, 0x1b, 0x85, 0x82, 0x17, 0x91, 0x66, 0xf4, 0x72, 0xc3, 0x58, + 0x35, 0x02, 0x89, 0x0a, 0x8e, 0xfd, 0x7c, 0x83, 0xdc, 0x49, 0xb9, 0x0a, 0x43, 0x94, 0xf7, 0x85, + 0x77, 0xc8, 0xb1, 0x76, 0x52, 0xb7, 0xec, 0x15, 0x70, 0x8d, 0x57, 0x05, 0x18, 0xe4, 0xbc, 0xd7, + 0xda, 0xbe, 0xb8, 0x67, 0x7e, 0xde, 0x42, 0xf6, 0x0e, 0x27, 0x93, 0xba, 0xf9, 0x54, 0xde, 0x0d, + 0x9d, 0xe8, 0x60, 0xbe, 0x58, 0xd5, 0x50, 0xce, 0x25, 0x27, 0xc6, 0x23, 0xa7, 0xc3, 0x15, 0x22, + 0x97, 0xa7, 0x34, 0x00, 0x49, 0x03, 0xa3, 0xca, 0xe1, 0x64, 0x8f, 0xa4, 0x82, 0x60, 0x04, 0x40, + 0xbb, 0x20, 0x5e, 0xd4, 0x4b, 0xba, 0x8d, 0xa9, 0x8e, 0x2b, 0xe4, 0x41, 0x3e, 0x2d, 0xe0, 0x2b, + 0x8b, 0xb1, 0xb1, 0x61, 0xec, 0xea, 0x83, 0xf6, 0x79, 0xa3, 0xa8, 0x05, 0xde, 0x13, 0x57, 0xda, + 0xc8, 0x40, 0x56, 0x93, 0x0f, 0x0b, 0xb0, 0x9e, 0xbf, 0x43, 0x59, 0x6d, 0x65, 0x9c, 0xc2, 0x99, + 0xd0, 0xb5, 0x5c, 0x51, 0xb7, 0x6c, 0x37, 0x2d, 0x48, 0xe8, 0xf8, 0x55, 0xf2, 0xaf, 0xa9, 0x13, + 0x17, 0x60, 0x99, 0x30, 0xaa, 0x65, 0xfb, 0x7f, 0x83, 0xce, 0x47, 0xa8, 0x58, 0x58, 0x40, 0x36, + 0x59, 0xb4, 0x72, 0x2e, 0x41, 0xa1, 0x89, 0x45, 0xd0, 0xbc, 0x20, 0x40, 0x7f, 0x80, 0xc6, 0x44, + 0x38, 0x2b, 0x5d, 0x69, 0x44, 0x1b, 0x21, 0x3e, 0x6f, 0x98, 0x79, 0xc4, 0x27, 0x93, 0xcc, 0xd5, + 0x25, 0x31, 0xec, 0x20, 0x09, 0xca, 0x41, 0x8e, 0x0b, 0xd0, 0xcb, 0x71, 0x10, 0xc7, 0x57, 0x1b, + 0xe6, 0x9e, 0x67, 0x30, 0xce, 0x1a, 0x95, 0x46, 0xcb, 0x45, 0xce, 0x52, 0x07, 0x8d, 0x24, 0x98, + 0x0a, 0x52, 0xb5, 0x6c, 0x79, 0xce, 0x38, 0xd8, 0x30, 0x57, 0x9b, 0x0c, 0x1d, 0xf8, 0xba, 0xd6, + 0x1d, 0x54, 0xce, 0x34, 0x09, 0xbb, 0x49, 0xd3, 0x43, 0x9a, 0xd5, 0x9c, 0x4b, 0x3a, 0xcd, 0xb3, + 0x64, 0x4f, 0xd5, 0x6e, 0x24, 0x53, 0x86, 0xa1, 0x13, 0x9b, 0x62, 0x60, 0x58, 0x81, 0x2d, 0xab, + 0x4c, 0x1f, 0x6b, 0x56, 0x93, 0x8f, 0xc4, 0xc2, 0xc7, 0x55, 0x2f, 0x5b, 0xc8, 0xb4, 0xf7, 0x98, + 0x7b, 0x49, 0xfe, 0x4f, 0x6a, 0x16, 0x8d, 0x62, 0xd0, 0x47, 0x21, 0x69, 0x1b, 0x95, 0x1c, 0x9d, + 0xaa, 0xf7, 0x65, 0x48, 0xad, 0x29, 0xe3, 0xd5, 0x9a, 0x32, 0xd9, 0xb2, 0xbd, 0x75, 0x7c, 0x9f, + 0x5a, 0xac, 0x22, 0x05, 0xec, 0xe0, 0x1c, 0xec, 0x06, 0x29, 0x4c, 0x47, 0x49, 0xc5, 0x94, 0xb4, + 0x2e, 0xaf, 0x64, 0x75, 0xc0, 0xd7, 0x94, 0x7a, 0x30, 0xab, 0x49, 0xbb, 0x60, 0x4d, 0xc8, 0x47, + 0x5c, 0x45, 0x6d, 0xcb, 0x2b, 0xea, 0xf4, 0x9d, 0x88, 0xe8, 0xb9, 0x0f, 0x56, 0xb9, 0xc9, 0x61, + 0xde, 0xb9, 0x6c, 0x52, 0xed, 0xcb, 0xab, 0x70, 0xb3, 0x49, 0x72, 0x39, 0x0d, 0xd0, 0xc9, 0x25, + 0x0c, 0x0a, 0xa3, 0x6d, 0xe1, 0x6c, 0x52, 0xba, 0x0b, 0x7f, 0xb2, 0xa1, 0xf1, 0x54, 0xb2, 0xb6, + 0xe6, 0x7b, 0xee, 0x26, 0x9a, 0x89, 0xa4, 0xfc, 0x1d, 0x21, 0xfc, 0xc9, 0xa0, 0xa1, 0x22, 0x6a, + 0x34, 0x37, 0x90, 0xbf, 0x4f, 0x5d, 0x30, 0x05, 0x64, 0xef, 0xb5, 0xbc, 0x0b, 0xa6, 0xd1, 0x62, + 0xde, 0x1f, 0x84, 0x70, 0x0a, 0x4c, 0x22, 0x45, 0xc3, 0xa2, 0x75, 0x62, 0x1f, 0x49, 0x49, 0x72, + 0x25, 0xab, 0x10, 0x8a, 0x7d, 0x64, 0x70, 0xca, 0x2a, 0x64, 0x35, 0xf9, 0x8c, 0x00, 0xc3, 0xf5, + 0xc3, 0x85, 0x5b, 0x6b, 0xbb, 0xf9, 0x46, 0x91, 0x4a, 0x60, 0xac, 0x76, 0x25, 0x30, 0x7e, 0xc3, + 0x95, 0x40, 0xf9, 0x8b, 0x54, 0x06, 0x1a, 0x76, 0xf3, 0x5b, 0x05, 0x5f, 0x3e, 0x22, 0x80, 0x1c, + 0xf5, 0x8d, 0x30, 0x04, 0x6b, 0x0f, 0x2e, 0xe7, 0xdd, 0x7c, 0x20, 0x7e, 0xd9, 0xd0, 0x49, 0x84, + 0xe3, 0x5e, 0x15, 0xb4, 0x1c, 0xc9, 0x21, 0x29, 0x28, 0x2b, 0xf0, 0x95, 0xf6, 0x30, 0x3f, 0xef, + 0xde, 0x85, 0xf3, 0xb1, 0x5b, 0x9d, 0xb3, 0xfe, 0x94, 0x02, 0x83, 0x34, 0xdd, 0x9e, 0x41, 0xc8, + 0x24, 0x58, 0x56, 0x22, 0x5d, 0x1d, 0x05, 0x11, 0x1f, 0x41, 0xf7, 0x85, 0xa1, 0xcf, 0x92, 0x4e, + 0x67, 0x9c, 0x50, 0x81, 0xbf, 0x84, 0xea, 0x26, 0xfe, 0xa7, 0x04, 0xb8, 0x9d, 0xe2, 0x70, 0x82, + 0x54, 0x34, 0xbd, 0x7a, 0x15, 0x52, 0xb5, 0x19, 0xd5, 0xb4, 0xf5, 0xbc, 0x5e, 0x51, 0xcb, 0x2b, + 0x51, 0x86, 0x91, 0x36, 0x00, 0xb8, 0x55, 0x54, 0x8f, 0xd6, 0x16, 0xa5, 0xdd, 0x1d, 0xc9, 0x6a, + 0x52, 0x37, 0x24, 0xdc, 0x50, 0x42, 0xa0, 0xc7, 0x4b, 0x38, 0x88, 0x9c, 0xa5, 0x2e, 0x19, 0x0b, + 0xe3, 0xb6, 0x67, 0x17, 0x50, 0x09, 0x35, 0x50, 0x89, 0x23, 0xda, 0x69, 0x49, 0x70, 0x3a, 0x2d, + 0xce, 0xd7, 0x63, 0x2f, 0x65, 0xc9, 0x6e, 0xdd, 0xb2, 0x0d, 0x73, 0x71, 0x76, 0x76, 0xb2, 0x61, + 0x4c, 0xa1, 0xbb, 0x41, 0x89, 0x68, 0x37, 0xe8, 0xc9, 0xe8, 0xd7, 0xe3, 0xd4, 0x62, 0xb8, 0x06, + 0x7e, 0xf3, 0xad, 0x90, 0x20, 0xe6, 0xfc, 0xc2, 0x06, 0xb4, 0x29, 0xf8, 0xb7, 0x33, 0x96, 0x5f, + 0x50, 0x6d, 0x8c, 0xbc, 0x4d, 0xc1, 0xbf, 0xa5, 0x14, 0xb4, 0xba, 0x9e, 0x84, 0x41, 0xb7, 0x29, + 0xde, 0xa3, 0xfc, 0x71, 0xe8, 0xdb, 0x87, 0x9c, 0x97, 0xe4, 0xb8, 0x25, 0x77, 0xb7, 0x52, 0x6d, + 0xa5, 0x84, 0xc1, 0x96, 0x1b, 0xab, 0x54, 0x5b, 0xf2, 0x7d, 0xb0, 0xc6, 0x55, 0xe9, 0x96, 0xdb, + 0x10, 0x32, 0xbd, 0xfa, 0xbf, 0xa7, 0x68, 0x6d, 0xe4, 0x66, 0xc1, 0x25, 0x76, 0x77, 0xfd, 0x47, + 0x40, 0xa4, 0xd6, 0x87, 0xfa, 0x6a, 0xde, 0xf2, 0x5a, 0x7d, 0x35, 0x4b, 0xfe, 0x18, 0xf4, 0x50, + 0x8b, 0x99, 0x2e, 0x94, 0xa7, 0xa2, 0x7e, 0x17, 0x8a, 0x55, 0xc4, 0x74, 0x72, 0x6a, 0x28, 0x8a, + 0x74, 0x72, 0x2c, 0x79, 0x23, 0x24, 0x5d, 0x45, 0x93, 0x46, 0xb9, 0xe0, 0x5c, 0x19, 0xc1, 0xea, + 0x16, 0x57, 0xe8, 0xb6, 0xcb, 0x49, 0xe8, 0xa0, 0x1c, 0x40, 0x5a, 0x03, 0x1d, 0x13, 0xca, 0xc4, + 0xd6, 0xf1, 0xdc, 0xde, 0xe9, 0xfb, 0xa7, 0xf7, 0xec, 0x9f, 0x16, 0x9b, 0xa4, 0x11, 0x48, 0x91, + 0x21, 0xb6, 0xa5, 0x20, 0xfe, 0xe4, 0xf0, 0x95, 0x53, 0x1f, 0x3a, 0xff, 0x04, 0x69, 0x3d, 0xac, + 0x26, 0x62, 0x7e, 0x5b, 0x52, 0x7c, 0xe5, 0xc5, 0xa5, 0xb7, 0xdf, 0xf7, 0x66, 0xbb, 0xc3, 0xb3, + 0x3e, 0x5c, 0xf1, 0xe4, 0x99, 0x6f, 0x55, 0x25, 0x99, 0x9e, 0xf5, 0x59, 0x11, 0xdf, 0xb9, 0x70, + 0xfd, 0xea, 0x3f, 0x88, 0x86, 0x01, 0xe8, 0x25, 0x32, 0x4c, 0x97, 0x47, 0xfc, 0xcb, 0x1b, 0x4b, + 0x6f, 0x09, 0xd2, 0x08, 0x6c, 0x08, 0x2b, 0x61, 0x9a, 0x15, 0xe2, 0xb1, 0xa7, 0x7f, 0x78, 0x39, + 0x26, 0xdd, 0x0e, 0xfd, 0x94, 0x18, 0x53, 0xfb, 0x17, 0x8f, 0xbd, 0xfe, 0x9b, 0x3f, 0xbb, 0x46, + 0x6d, 0x82, 0x75, 0x94, 0x70, 0xb8, 0x02, 0x2f, 0x2e, 0x3d, 0x7e, 0x75, 0xe9, 0x1a, 0x91, 0xdb, + 0x08, 0x7d, 0xac, 0xd2, 0x40, 0xf2, 0xfa, 0xf1, 0xf3, 0x8f, 0xc6, 0x18, 0x80, 0xd1, 0x9a, 0xb7, + 0xf8, 0xb5, 0x13, 0xe7, 0x7e, 0x10, 0x93, 0xb6, 0xc0, 0x7a, 0x4a, 0x2c, 0x52, 0x43, 0x16, 0x7f, + 0x7c, 0xee, 0xfd, 0xa7, 0x5d, 0x4e, 0xee, 0x82, 0xe1, 0x28, 0x3c, 0x5e, 0x89, 0x56, 0x7c, 0xf7, + 0xd2, 0xc5, 0x97, 0xaf, 0x93, 0x25, 0xff, 0x07, 0x1b, 0xf9, 0x4b, 0xa8, 0xea, 0xaa, 0xf8, 0xd0, + 0x91, 0x6b, 0x7f, 0xbb, 0x4a, 0x56, 0x0c, 0x7b, 0xc4, 0x33, 0x2b, 0xc4, 0xa3, 0xcf, 0x9e, 0x7c, + 0xd2, 0x85, 0x72, 0x07, 0x0c, 0xd4, 0xd4, 0x4b, 0x6a, 0x82, 0xe2, 0xa5, 0xaf, 0x1f, 0x7d, 0xd3, + 0xe5, 0x2b, 0x6a, 0x63, 0xa4, 0x6a, 0x27, 0xbe, 0xfe, 0xc6, 0xd2, 0x97, 0x3e, 0x20, 0xa2, 0xb7, + 0x45, 0x58, 0x8b, 0x56, 0xc7, 0xc4, 0x53, 0x3f, 0x3f, 0xf4, 0xbc, 0xab, 0x36, 0x03, 0x43, 0x94, + 0x2c, 0xaf, 0x76, 0x25, 0xfe, 0xf5, 0xad, 0x23, 0x57, 0xdc, 0xed, 0xdd, 0x0c, 0x69, 0x3e, 0x0c, + 0x07, 0xb3, 0xf8, 0xde, 0x95, 0xeb, 0x0f, 0x5f, 0xab, 0x29, 0x18, 0x14, 0x68, 0xc4, 0x77, 0x5e, + 0xbb, 0xfc, 0xd2, 0x87, 0x1e, 0x59, 0xb4, 0x61, 0x91, 0x2a, 0x89, 0xf8, 0xcc, 0xa5, 0xc7, 0xdf, + 0x64, 0x5d, 0x35, 0x5a, 0x81, 0x10, 0x3f, 0xb8, 0xf6, 0xdc, 0x73, 0x71, 0x69, 0x4b, 0xc4, 0x1c, + 0x5e, 0xb2, 0x2e, 0x1e, 0xff, 0xc6, 0x33, 0x3f, 0x13, 0xa4, 0xc1, 0x88, 0xa3, 0x86, 0x13, 0x62, + 0xf1, 0xc2, 0xe9, 0xdf, 0x77, 0x30, 0xdc, 0xf0, 0x3e, 0xbb, 0xc4, 0xa7, 0xbe, 0xfa, 0xf7, 0xeb, + 0xfe, 0x86, 0x0e, 0x73, 0x30, 0xb2, 0x4b, 0x9e, 0x78, 0xed, 0x91, 0xa7, 0x1c, 0xe6, 0x37, 0x2f, + 0x0b, 0x95, 0x1c, 0x6b, 0xf1, 0xa1, 0xb3, 0x27, 0xf6, 0x4a, 0x9b, 0x22, 0xee, 0xc2, 0x26, 0xf0, + 0xe2, 0x37, 0xff, 0xf9, 0x6e, 0xa7, 0x34, 0x0e, 0x23, 0x1c, 0x14, 0x6c, 0x96, 0x2d, 0xfe, 0xea, + 0xe8, 0xc5, 0xc3, 0x6e, 0xac, 0x19, 0x61, 0x3d, 0x86, 0x5a, 0x20, 0x3e, 0xfb, 0xa7, 0xc7, 0x2e, + 0x24, 0x98, 0xad, 0x8a, 0x64, 0xb0, 0xe2, 0xa9, 0xc7, 0xde, 0x3e, 0x14, 0x63, 0xa4, 0x22, 0xa9, + 0xa5, 0x78, 0xec, 0xd1, 0x63, 0x27, 0x9a, 0xa5, 0x7b, 0x20, 0x13, 0xd5, 0x55, 0x3f, 0x93, 0x13, + 0x4f, 0x1f, 0x7b, 0xef, 0xb7, 0xcd, 0x4c, 0x7c, 0x09, 0x67, 0x52, 0xe2, 0x13, 0x67, 0x7e, 0xf1, + 0x82, 0x7b, 0x08, 0x86, 0x22, 0xfe, 0x47, 0xe5, 0x29, 0xe2, 0xc9, 0x4b, 0x4b, 0xd3, 0x3c, 0xab, + 0xa9, 0x3c, 0x40, 0xfc, 0xca, 0xb7, 0xbf, 0x7c, 0xa5, 0x35, 0x1d, 0x3b, 0xf4, 0xdd, 0xfe, 0xa6, + 0xf1, 0x93, 0xdd, 0xd0, 0xae, 0xcc, 0x4c, 0xb8, 0x75, 0x81, 0x69, 0xe8, 0xad, 0xd5, 0xe0, 0x95, + 0x83, 0x3c, 0xa1, 0x56, 0x5c, 0x4d, 0xd3, 0xb5, 0x5a, 0xb9, 0x49, 0x9a, 0x81, 0x54, 0xcd, 0xc6, + 0xea, 0x46, 0x56, 0x21, 0x23, 0xc4, 0x6a, 0x7c, 0x00, 0xd6, 0xf2, 0x7a, 0xa0, 0xfd, 0xac, 0xb2, + 0xf0, 0x7c, 0xda, 0x7f, 0x59, 0x9d, 0x64, 0x43, 0x6e, 0x92, 0x3e, 0x0b, 0xdd, 0xfc, 0xae, 0xe7, + 0x60, 0x0d, 0xb0, 0xff, 0xf6, 0x1b, 0x02, 0x86, 0x99, 0x46, 0x27, 0x87, 0xe1, 0xa8, 0x0c, 0xcb, + 0xc7, 0x14, 0xf4, 0xd4, 0xe8, 0x30, 0x0e, 0xb1, 0xea, 0x22, 0x22, 0xe9, 0x4e, 0x5f, 0x1b, 0xae, + 0x4b, 0xc9, 0x4d, 0xd2, 0x02, 0xf4, 0x2f, 0xd3, 0xe4, 0xdb, 0xc2, 0x65, 0x9a, 0x27, 0x9a, 0x5e, + 0x17, 0xa1, 0x24, 0x48, 0xb5, 0xe4, 0x26, 0x09, 0xc1, 0x86, 0xfa, 0x6d, 0xbd, 0xd1, 0x3a, 0x2f, + 0xa2, 0x24, 0xd3, 0x29, 0xee, 0x7b, 0x76, 0x1e, 0xb4, 0x31, 0x3f, 0x6b, 0xd8, 0xce, 0xda, 0xfa, + 0x7a, 0xaa, 0xeb, 0xaa, 0xfb, 0x34, 0xac, 0xab, 0xdd, 0xea, 0x1a, 0xae, 0x8f, 0x98, 0x48, 0x2d, + 0x83, 0xb6, 0xa7, 0x46, 0xf7, 0x6a, 0xa8, 0x9e, 0x6e, 0x2c, 0xc2, 0xd9, 0xcd, 0x4f, 0xfa, 0xce, + 0xc6, 0x74, 0x92, 0x64, 0xae, 0x3e, 0x4a, 0xa6, 0x2e, 0xd2, 0x7d, 0xd0, 0x57, 0xaf, 0x2d, 0xb4, + 0x89, 0x55, 0xcf, 0x93, 0x63, 0xfd, 0x79, 0x12, 0xba, 0xb8, 0xed, 0x99, 0x81, 0x3a, 0xf6, 0x3b, + 0x02, 0x69, 0x36, 0x25, 0x97, 0x9b, 0xa4, 0x6c, 0x58, 0x5b, 0xa8, 0x91, 0xc2, 0xd7, 0x16, 0x08, + 0x70, 0xb8, 0x9c, 0xf4, 0xb7, 0x26, 0xda, 0xef, 0xe0, 0x6c, 0x4d, 0x44, 0x84, 0x35, 0x33, 0x08, + 0x03, 0x4c, 0xcf, 0x41, 0xae, 0xa7, 0x8e, 0xc8, 0xb0, 0xfa, 0x82, 0xed, 0xe0, 0x96, 0xfd, 0x39, + 0xdb, 0xc1, 0x93, 0x63, 0xf5, 0xee, 0xf2, 0xc3, 0x2d, 0x55, 0x3f, 0xe6, 0x84, 0xdb, 0xf0, 0x3c, + 0xab, 0x67, 0xbf, 0x8f, 0x8f, 0x5b, 0xe4, 0xdd, 0xc4, 0xdd, 0x0f, 0x46, 0x8e, 0xb3, 0x2d, 0x0f, + 0xf8, 0x01, 0xab, 0x56, 0x49, 0x76, 0x4b, 0x2d, 0x3e, 0x59, 0xf5, 0x0c, 0xec, 0x39, 0x18, 0x5a, + 0xbe, 0x3c, 0x7a, 0xc7, 0x8d, 0x91, 0x4b, 0xa4, 0xd9, 0x77, 0x28, 0x7e, 0x48, 0xe1, 0xd4, 0x2e, + 0x87, 0xeb, 0x13, 0x5d, 0x4b, 0xe7, 0x67, 0x60, 0x60, 0xb9, 0x62, 0xe4, 0x6d, 0xb5, 0x68, 0x61, + 0x65, 0x59, 0xfd, 0xb9, 0x70, 0x60, 0xa1, 0xcb, 0x8b, 0x72, 0x9d, 0x83, 0xea, 0xca, 0xa4, 0xfb, + 0xb9, 0x81, 0xc5, 0xff, 0xd8, 0xc3, 0xfe, 0xd2, 0x53, 0xa3, 0x9c, 0x58, 0x2f, 0x10, 0x12, 0x91, + 0x65, 0x02, 0x78, 0x4f, 0x8d, 0xd2, 0x20, 0x47, 0x71, 0x44, 0xa4, 0x06, 0x6e, 0xff, 0x13, 0x56, + 0x6e, 0x92, 0x0e, 0xc0, 0xe8, 0x0d, 0x97, 0xf0, 0xb6, 0x72, 0x2d, 0xa9, 0xbf, 0x28, 0xbd, 0x36, + 0x02, 0xc1, 0xf9, 0xa6, 0xa7, 0xce, 0x29, 0x55, 0x82, 0xe3, 0x9c, 0xd3, 0xf0, 0x3c, 0xbb, 0xb1, + 0xbb, 0xfd, 0x80, 0x49, 0x17, 0xc0, 0x06, 0xb8, 0x8a, 0x02, 0x01, 0x56, 0xd3, 0x6c, 0xd8, 0x45, + 0xe8, 0x3a, 0x14, 0xdf, 0x45, 0x28, 0x99, 0x34, 0xef, 0x0f, 0x34, 0xe5, 0xa6, 0xed, 0x9f, 0xb8, + 0xf8, 0x6a, 0xbf, 0xf0, 0xbb, 0xf3, 0xfd, 0xc2, 0x8b, 0xe7, 0xfb, 0x85, 0x57, 0xce, 0xf7, 0x0b, + 0x9f, 0xda, 0x16, 0xfa, 0x73, 0x76, 0x1b, 0xa9, 0xa5, 0x82, 0xa9, 0x06, 0x3f, 0xee, 0xb4, 0x90, + 0x79, 0x00, 0x99, 0x63, 0x6a, 0xa5, 0x32, 0xe6, 0xfc, 0xd4, 0xf3, 0x68, 0x6c, 0x4e, 0xff, 0xc2, + 0x18, 0xd1, 0xed, 0xfe, 0x37, 0x97, 0xc0, 0xc0, 0xb7, 0xfe, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xf3, + 0xbc, 0x89, 0xcb, 0x33, 0x2f, 0x00, 0x00, } func (this *DialogExt) GoString() string { @@ -4049,7 +4058,7 @@ func (this *TLDialogInsertOrUpdateDialog) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 13) + s := make([]string, 0, 14) s = append(s, "&dialog.TLDialogInsertOrUpdateDialog{") s = append(s, "Constructor: "+fmt.Sprintf("%#v", this.Constructor)+",\n") s = append(s, "UserId: "+fmt.Sprintf("%#v", this.UserId)+",\n") @@ -4068,6 +4077,9 @@ func (this *TLDialogInsertOrUpdateDialog) GoString() string { s = append(s, "UnreadCount: "+fmt.Sprintf("%#v", this.UnreadCount)+",\n") } s = append(s, "UnreadMark: "+fmt.Sprintf("%#v", this.UnreadMark)+",\n") + if this.Date2 != nil { + s = append(s, "Date2: "+fmt.Sprintf("%#v", this.Date2)+",\n") + } if this.XXX_unrecognized != nil { s = append(s, "XXX_unrecognized:"+fmt.Sprintf("%#v", this.XXX_unrecognized)+",\n") } @@ -6982,6 +6994,18 @@ func (m *TLDialogInsertOrUpdateDialog) MarshalToSizedBuffer(dAtA []byte) (int, e i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.Date2 != nil { + { + size, err := m.Date2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDialogTl(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x5a + } if m.UnreadMark { i-- if m.UnreadMark { @@ -7330,21 +7354,21 @@ func (m *TLDialogUpdateDialogFiltersOrder) MarshalToSizedBuffer(dAtA []byte) (in copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Order) > 0 { - dAtA33 := make([]byte, len(m.Order)*10) - var j32 int + dAtA34 := make([]byte, len(m.Order)*10) + var j33 int for _, num1 := range m.Order { num := uint64(num1) for num >= 1<<7 { - dAtA33[j32] = uint8(uint64(num)&0x7f | 0x80) + dAtA34[j33] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j32++ + j33++ } - dAtA33[j32] = uint8(num) - j32++ + dAtA34[j33] = uint8(num) + j33++ } - i -= j32 - copy(dAtA[i:], dAtA33[:j32]) - i = encodeVarintDialogTl(dAtA, i, uint64(j32)) + i -= j33 + copy(dAtA[i:], dAtA34[:j33]) + i = encodeVarintDialogTl(dAtA, i, uint64(j33)) i-- dAtA[i] = 0x22 } @@ -7470,21 +7494,21 @@ func (m *TLDialogEditPeerFolders) MarshalToSizedBuffer(dAtA []byte) (int, error) dAtA[i] = 0x28 } if len(m.PeerDialogList) > 0 { - dAtA35 := make([]byte, len(m.PeerDialogList)*10) - var j34 int + dAtA36 := make([]byte, len(m.PeerDialogList)*10) + var j35 int for _, num1 := range m.PeerDialogList { num := uint64(num1) for num >= 1<<7 { - dAtA35[j34] = uint8(uint64(num)&0x7f | 0x80) + dAtA36[j35] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j34++ + j35++ } - dAtA35[j34] = uint8(num) - j34++ + dAtA36[j35] = uint8(num) + j35++ } - i -= j34 - copy(dAtA[i:], dAtA35[:j34]) - i = encodeVarintDialogTl(dAtA, i, uint64(j34)) + i -= j35 + copy(dAtA[i:], dAtA36[:j35]) + i = encodeVarintDialogTl(dAtA, i, uint64(j35)) i-- dAtA[i] = 0x22 } @@ -7951,21 +7975,21 @@ func (m *Vector_Long) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Datas) > 0 { - dAtA37 := make([]byte, len(m.Datas)*10) - var j36 int + dAtA38 := make([]byte, len(m.Datas)*10) + var j37 int for _, num1 := range m.Datas { num := uint64(num1) for num >= 1<<7 { - dAtA37[j36] = uint8(uint64(num)&0x7f | 0x80) + dAtA38[j37] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j36++ + j37++ } - dAtA37[j36] = uint8(num) - j36++ + dAtA38[j37] = uint8(num) + j37++ } - i -= j36 - copy(dAtA[i:], dAtA37[:j36]) - i = encodeVarintDialogTl(dAtA, i, uint64(j36)) + i -= j37 + copy(dAtA[i:], dAtA38[:j37]) + i = encodeVarintDialogTl(dAtA, i, uint64(j37)) i-- dAtA[i] = 0xa } @@ -8683,6 +8707,10 @@ func (m *TLDialogInsertOrUpdateDialog) Size() (n int) { if m.UnreadMark { n += 2 } + if m.Date2 != nil { + l = m.Date2.Size() + n += 1 + l + sovDialogTl(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -13285,6 +13313,42 @@ func (m *TLDialogInsertOrUpdateDialog) Unmarshal(dAtA []byte) error { } } m.UnreadMark = bool(v != 0) + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Date2", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDialogTl + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDialogTl + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDialogTl + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Date2 == nil { + m.Date2 = &types.Int64Value{} + } + if err := m.Date2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDialogTl(dAtA[iNdEx:]) diff --git a/app/service/biz/dialog/dialog/dialog_ext_helper.go b/app/service/biz/dialog/dialog/dialog_ext_helper.go index b1dbfbc3e..307391573 100644 --- a/app/service/biz/dialog/dialog/dialog_ext_helper.go +++ b/app/service/biz/dialog/dialog/dialog_ext_helper.go @@ -93,7 +93,7 @@ func (m DialogExtList) GetDialogsByOffsetLimit(offsetDate int32, offsetId int32, case mtproto.PEER_SELF, mtproto.PEER_USER: for i, dialog := range m { if dialog.Dialog.TopMessage == offsetId && - int32(dialog.Order) == offsetDate && + // int32(dialog.Order) == offsetDate && dialog.Dialog.Peer.UserId == offsetPeer.PeerId { idx = i break @@ -102,7 +102,7 @@ func (m DialogExtList) GetDialogsByOffsetLimit(offsetDate int32, offsetId int32, case mtproto.PEER_CHAT: for i, dialog := range m { if dialog.Dialog.TopMessage == offsetId && - int32(dialog.Order) == offsetDate && + // int32(dialog.Order) == offsetDate && dialog.Dialog.Peer.ChatId == offsetPeer.PeerId { idx = i break @@ -111,7 +111,7 @@ func (m DialogExtList) GetDialogsByOffsetLimit(offsetDate int32, offsetId int32, case mtproto.PEER_CHANNEL: for i, dialog := range m { if dialog.Dialog.TopMessage == offsetId && - int32(dialog.Order) == offsetDate && + // int32(dialog.Order) == offsetDate && dialog.Dialog.Peer.ChannelId == offsetPeer.PeerId { idx = i break diff --git a/app/service/biz/dialog/dialog/rpc_client_registers.go b/app/service/biz/dialog/dialog/rpc_client_registers.go index 135790af1..12e5ef2d8 100644 --- a/app/service/biz/dialog/dialog/rpc_client_registers.go +++ b/app/service/biz/dialog/dialog/rpc_client_registers.go @@ -2,7 +2,7 @@ * WARNING! All changes made in this file will be lost! * Created from 'scheme.tl' by 'mtprotoc' * - * Copyright (c) 2022-present, Teamgram Authors. + * Copyright (c) 2023-present, Teamgram Authors. * All rights reserved. * * Author: Benqi (wubenqi@gmail.com) diff --git a/app/service/biz/dialog/internal/core/dialog.insertOrUpdateDialog_handler.go b/app/service/biz/dialog/internal/core/dialog.insertOrUpdateDialog_handler.go index fb01b2531..d689411f1 100644 --- a/app/service/biz/dialog/internal/core/dialog.insertOrUpdateDialog_handler.go +++ b/app/service/biz/dialog/internal/core/dialog.insertOrUpdateDialog_handler.go @@ -13,7 +13,6 @@ import ( "github.com/teamgram/proto/mtproto" "github.com/teamgram/teamgram-server/app/service/biz/dialog/dialog" "github.com/teamgram/teamgram-server/app/service/biz/dialog/internal/dal/dataobject" - "time" ) // DialogInsertOrUpdateDialog @@ -21,11 +20,12 @@ import ( func (c *DialogCore) DialogInsertOrUpdateDialog(in *dialog.TLDialogInsertOrUpdateDialog) (*mtproto.Bool, error) { var ( cMap = make(map[string]interface{}, 0) - date = time.Now().Unix() + // date = time.Now().Unix() ) if in.GetTopMessage() != nil { cMap["top_message"] = in.GetTopMessage().GetValue() + cMap["date2"] = in.GetDate2().GetValue() } if in.GetReadOutboxMaxId() != nil { cMap["read_outbox_max_id"] = in.GetReadOutboxMaxId().GetValue() @@ -39,7 +39,6 @@ func (c *DialogCore) DialogInsertOrUpdateDialog(in *dialog.TLDialogInsertOrUpdat if in.GetUnreadMark() { cMap["unread_mark"] = 1 } - cMap["date2"] = date cMap["deleted"] = 0 rowsAffected, err := c.svcCtx.Dao.DialogsDAO.UpdateCustomMap( @@ -60,7 +59,7 @@ func (c *DialogCore) DialogInsertOrUpdateDialog(in *dialog.TLDialogInsertOrUpdat PeerId: in.PeerId, PeerDialogId: mtproto.MakePeerDialogId(in.PeerType, in.PeerId), DraftMessageData: "null", - Date2: date, + Date2: in.GetDate2().GetValue(), } if in.GetTopMessage() != nil {