From b0b5aac8d5624ac252815c644c6d8d67c42c1ced Mon Sep 17 00:00:00 2001 From: Song Gao Date: Mon, 21 Nov 2016 16:54:54 -0800 Subject: [PATCH 1/2] fix variable/method names in avdl --- go/protocol/chat1/gregor.go | 10 ++++---- go/protocol/chat1/local.go | 28 ++++++++++----------- protocol/avdl/chat1/gregor.avdl | 10 ++++---- protocol/avdl/chat1/local.avdl | 20 +++++++-------- protocol/js/flow-types-chat.js | 30 +++++++++++------------ protocol/json/chat1/gregor.json | 10 ++++---- protocol/json/chat1/local.json | 20 +++++++-------- shared/constants/types/flow-types-chat.js | 30 +++++++++++------------ 8 files changed, 79 insertions(+), 79 deletions(-) diff --git a/go/protocol/chat1/gregor.go b/go/protocol/chat1/gregor.go index 991da7b8323a..726c2bde939f 100644 --- a/go/protocol/chat1/gregor.go +++ b/go/protocol/chat1/gregor.go @@ -8,11 +8,11 @@ import ( ) type GenericPayload struct { - Action string `codec:"Action" json:"Action"` + Action string `codec:"action" json:"action"` } type NewConversationPayload struct { - Action string `codec:"Action" json:"Action"` + Action string `codec:"action" json:"action"` ConvID ConversationID `codec:"convID" json:"convID"` InboxVers InboxVers `codec:"inboxVers" json:"inboxVers"` UnreadUpdate *UnreadUpdate `codec:"unreadUpdate,omitempty" json:"unreadUpdate,omitempty"` @@ -27,7 +27,7 @@ type NewMessagePayload struct { } type ReadMessagePayload struct { - Action string `codec:"Action" json:"Action"` + Action string `codec:"action" json:"action"` ConvID ConversationID `codec:"convID" json:"convID"` MsgID MessageID `codec:"msgID" json:"msgID"` InboxVers InboxVers `codec:"inboxVers" json:"inboxVers"` @@ -35,7 +35,7 @@ type ReadMessagePayload struct { } type SetStatusPayload struct { - Action string `codec:"Action" json:"Action"` + Action string `codec:"action" json:"action"` ConvID ConversationID `codec:"convID" json:"convID"` Status ConversationStatus `codec:"status" json:"status"` InboxVers InboxVers `codec:"inboxVers" json:"inboxVers"` @@ -44,7 +44,7 @@ type SetStatusPayload struct { type UnreadUpdate struct { ConvID ConversationID `codec:"convID" json:"convID"` - UnreadMessages int `codec:"UnreadMessages" json:"UnreadMessages"` + UnreadMessages int `codec:"unreadMessages" json:"unreadMessages"` } type GregorInterface interface { diff --git a/go/protocol/chat1/local.go b/go/protocol/chat1/local.go index 7809fe5de20e..d09a92e3a6f2 100644 --- a/go/protocol/chat1/local.go +++ b/go/protocol/chat1/local.go @@ -278,7 +278,7 @@ type OutboxRecord struct { State OutboxState `codec:"state" json:"state"` OutboxID OutboxID `codec:"outboxID" json:"outboxID"` ConvID ConversationID `codec:"convID" json:"convID"` - Msg MessagePlaintext `codec:"Msg" json:"Msg"` + Msg MessagePlaintext `codec:"msg" json:"msg"` } type HeaderPlaintextVersion int @@ -513,9 +513,9 @@ func NewMessageUnboxedWithOutbox(v OutboxRecord) MessageUnboxed { } type UnreadFirstNumLimit struct { - NumRead int `codec:"NumRead" json:"NumRead"` - AtLeast int `codec:"AtLeast" json:"AtLeast"` - AtMost int `codec:"AtMost" json:"AtMost"` + NumRead int `codec:"numRead" json:"numRead"` + AtLeast int `codec:"atLeast" json:"atLeast"` + AtMost int `codec:"atMost" json:"atMost"` } type ConversationInfoLocal struct { @@ -621,8 +621,8 @@ type GetInboxSummaryForCLILocalRes struct { type GetConversationForCLILocalQuery struct { MarkAsRead bool `codec:"markAsRead" json:"markAsRead"` - MessageTypes []MessageType `codec:"MessageTypes" json:"MessageTypes"` - Since *string `codec:"Since,omitempty" json:"Since,omitempty"` + MessageTypes []MessageType `codec:"messageTypes" json:"messageTypes"` + Since *string `codec:"since,omitempty" json:"since,omitempty"` Limit UnreadFirstNumLimit `codec:"limit" json:"limit"` ConversationId ConversationID `codec:"conversationId" json:"conversationId"` } @@ -901,7 +901,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol { }, MethodType: rpc.MethodCall, }, - "GetMessagesLocal": { + "getMessagesLocal": { MakeArg: func() interface{} { ret := make([]GetMessagesLocalArg, 1) return &ret @@ -917,7 +917,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol { }, MethodType: rpc.MethodCall, }, - "DownloadAttachmentLocal": { + "downloadAttachmentLocal": { MakeArg: func() interface{} { ret := make([]DownloadAttachmentLocalArg, 1) return &ret @@ -933,7 +933,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol { }, MethodType: rpc.MethodCall, }, - "CancelPost": { + "cancelPost": { MakeArg: func() interface{} { ret := make([]CancelPostArg, 1) return &ret @@ -949,7 +949,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol { }, MethodType: rpc.MethodCall, }, - "RetryPost": { + "retryPost": { MakeArg: func() interface{} { ret := make([]RetryPostArg, 1) return &ret @@ -1026,23 +1026,23 @@ func (c LocalClient) GetConversationForCLILocal(ctx context.Context, query GetCo } func (c LocalClient) GetMessagesLocal(ctx context.Context, __arg GetMessagesLocalArg) (res GetMessagesLocalRes, err error) { - err = c.Cli.Call(ctx, "chat.1.local.GetMessagesLocal", []interface{}{__arg}, &res) + err = c.Cli.Call(ctx, "chat.1.local.getMessagesLocal", []interface{}{__arg}, &res) return } func (c LocalClient) DownloadAttachmentLocal(ctx context.Context, __arg DownloadAttachmentLocalArg) (res DownloadAttachmentLocalRes, err error) { - err = c.Cli.Call(ctx, "chat.1.local.DownloadAttachmentLocal", []interface{}{__arg}, &res) + err = c.Cli.Call(ctx, "chat.1.local.downloadAttachmentLocal", []interface{}{__arg}, &res) return } func (c LocalClient) CancelPost(ctx context.Context, outboxID OutboxID) (err error) { __arg := CancelPostArg{OutboxID: outboxID} - err = c.Cli.Call(ctx, "chat.1.local.CancelPost", []interface{}{__arg}, nil) + err = c.Cli.Call(ctx, "chat.1.local.cancelPost", []interface{}{__arg}, nil) return } func (c LocalClient) RetryPost(ctx context.Context, outboxID OutboxID) (err error) { __arg := RetryPostArg{OutboxID: outboxID} - err = c.Cli.Call(ctx, "chat.1.local.RetryPost", []interface{}{__arg}, nil) + err = c.Cli.Call(ctx, "chat.1.local.retryPost", []interface{}{__arg}, nil) return } diff --git a/protocol/avdl/chat1/gregor.avdl b/protocol/avdl/chat1/gregor.avdl index 3b65ec3680c3..3d7246e966ae 100644 --- a/protocol/avdl/chat1/gregor.avdl +++ b/protocol/avdl/chat1/gregor.avdl @@ -2,11 +2,11 @@ protocol gregor { record GenericPayload { - string Action; + string action; } record NewConversationPayload { - string Action; + string action; ConversationID convID; InboxVers inboxVers; union { null, UnreadUpdate } unreadUpdate; @@ -21,7 +21,7 @@ protocol gregor { } record ReadMessagePayload { - string Action; + string action; ConversationID convID; MessageID msgID; InboxVers inboxVers; @@ -29,7 +29,7 @@ protocol gregor { } record SetStatusPayload { - string Action; + string action; ConversationID convID; ConversationStatus status; InboxVers inboxVers; @@ -40,7 +40,7 @@ protocol gregor { ConversationID convID; // The count of unread messages to display // Counts only visible types of messages deserving of a badge, no EDITs - int UnreadMessages; + int unreadMessages; } } diff --git a/protocol/avdl/chat1/local.avdl b/protocol/avdl/chat1/local.avdl index d60e4b346867..619bb5ed2e64 100644 --- a/protocol/avdl/chat1/local.avdl +++ b/protocol/avdl/chat1/local.avdl @@ -70,7 +70,7 @@ protocol local { OutboxState state; OutboxID outboxID; ConversationID convID; - MessagePlaintext Msg; + MessagePlaintext msg; } enum HeaderPlaintextVersion { @@ -157,10 +157,10 @@ protocol local { // By definition, one could use a same non-zero number for both AtLeast and // AtMost to precisely control the number of items returned. record UnreadFirstNumLimit { - int NumRead; + int numRead; - int AtLeast; - int AtMost; + int atLeast; + int atMost; } record ConversationInfoLocal { @@ -291,9 +291,9 @@ protocol local { GetConversationForCLILocalRes getConversationForCLILocal(GetConversationForCLILocalQuery query); record GetConversationForCLILocalQuery { boolean markAsRead; - array MessageTypes; + array messageTypes; - union { null, string } Since; + union { null, string } since; UnreadFirstNumLimit limit; @@ -306,7 +306,7 @@ protocol local { } // Get messages by ID. - GetMessagesLocalRes GetMessagesLocal(ConversationID conversationID, array messageIDs); + GetMessagesLocalRes getMessagesLocal(ConversationID conversationID, array messageIDs); record GetMessagesLocalRes { array messages; array rateLimits; @@ -316,9 +316,9 @@ protocol local { record DownloadAttachmentLocalRes { array rateLimits; } - DownloadAttachmentLocalRes DownloadAttachmentLocal(int sessionID, ConversationID conversationID, MessageID messageID, keybase1.Stream sink, boolean preview); + DownloadAttachmentLocalRes downloadAttachmentLocal(int sessionID, ConversationID conversationID, MessageID messageID, keybase1.Stream sink, boolean preview); - void CancelPost(OutboxID outboxID); - void RetryPost(OutboxID outboxID); + void cancelPost(OutboxID outboxID); + void retryPost(OutboxID outboxID); } diff --git a/protocol/js/flow-types-chat.js b/protocol/js/flow-types-chat.js index 830c9c84a24b..b4a92e729406 100644 --- a/protocol/js/flow-types-chat.js +++ b/protocol/js/flow-types-chat.js @@ -116,7 +116,7 @@ export const NotifyChatChatActivityType = { } export function localCancelPostRpc (request: Exact) { - engineRpcOutgoing({...request, method: 'chat.1.local.CancelPost'}) + engineRpcOutgoing({...request, method: 'chat.1.local.cancelPost'}) } export function localCancelPostRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact): ChannelMap<*> { @@ -128,7 +128,7 @@ export function localCancelPostRpcPromise (request: $Exact void} & {param: localDownloadAttachmentLocalRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.local.DownloadAttachmentLocal'}) + engineRpcOutgoing({...request, method: 'chat.1.local.downloadAttachmentLocal'}) } export function localDownloadAttachmentLocalRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: localDownloadAttachmentLocalRpcParam}>): ChannelMap<*> { @@ -188,7 +188,7 @@ export function localGetInboxSummaryForCLILocalRpcPromise (request: $Exact void} & {param: localGetMessagesLocalRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.local.GetMessagesLocal'}) + engineRpcOutgoing({...request, method: 'chat.1.local.getMessagesLocal'}) } export function localGetMessagesLocalRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: localGetMessagesLocalRpcParam}>): ChannelMap<*> { @@ -260,7 +260,7 @@ export function localPostLocalRpcPromise (request: $Exact) { - engineRpcOutgoing({...request, method: 'chat.1.local.RetryPost'}) + engineRpcOutgoing({...request, method: 'chat.1.local.retryPost'}) } export function localRetryPostRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact): ChannelMap<*> { @@ -534,13 +534,13 @@ export type FailedMessageInfo = { } export type GenericPayload = { - Action: string, + action: string, } export type GetConversationForCLILocalQuery = { markAsRead: boolean, - MessageTypes?: ?Array, - Since?: ?string, + messageTypes?: ?Array, + since?: ?string, limit: UnreadFirstNumLimit, conversationId: ConversationID, } @@ -828,7 +828,7 @@ export type NewConversationLocalRes = { } export type NewConversationPayload = { - Action: string, + action: string, convID: ConversationID, inboxVers: InboxVers, unreadUpdate?: ?UnreadUpdate, @@ -863,7 +863,7 @@ export type OutboxRecord = { state: OutboxState, outboxID: OutboxID, convID: ConversationID, - Msg: MessagePlaintext, + msg: MessagePlaintext, } export type OutboxState = @@ -908,7 +908,7 @@ export type ReadMessageInfo = { } export type ReadMessagePayload = { - Action: string, + action: string, convID: ConversationID, msgID: MessageID, inboxVers: InboxVers, @@ -939,7 +939,7 @@ export type SetStatusInfo = { } export type SetStatusPayload = { - Action: string, + action: string, convID: ConversationID, status: ConversationStatus, inboxVers: InboxVers, @@ -979,14 +979,14 @@ export type TopicType = | 2 // DEV_2 export type UnreadFirstNumLimit = { - NumRead: int, - AtLeast: int, - AtMost: int, + numRead: int, + atLeast: int, + atMost: int, } export type UnreadUpdate = { convID: ConversationID, - UnreadMessages: int, + unreadMessages: int, } export type UnreadUpdateFull = { diff --git a/protocol/json/chat1/gregor.json b/protocol/json/chat1/gregor.json index a971a296c6dc..650e62df4562 100644 --- a/protocol/json/chat1/gregor.json +++ b/protocol/json/chat1/gregor.json @@ -8,7 +8,7 @@ "fields": [ { "type": "string", - "name": "Action" + "name": "action" } ] }, @@ -18,7 +18,7 @@ "fields": [ { "type": "string", - "name": "Action" + "name": "action" }, { "type": "ConversationID", @@ -72,7 +72,7 @@ "fields": [ { "type": "string", - "name": "Action" + "name": "action" }, { "type": "ConversationID", @@ -101,7 +101,7 @@ "fields": [ { "type": "string", - "name": "Action" + "name": "action" }, { "type": "ConversationID", @@ -134,7 +134,7 @@ }, { "type": "int", - "name": "UnreadMessages" + "name": "unreadMessages" } ] } diff --git a/protocol/json/chat1/local.json b/protocol/json/chat1/local.json index 877c8092ed08..2ff4e992d0fe 100644 --- a/protocol/json/chat1/local.json +++ b/protocol/json/chat1/local.json @@ -248,7 +248,7 @@ }, { "type": "MessagePlaintext", - "name": "Msg" + "name": "msg" } ] }, @@ -480,15 +480,15 @@ "fields": [ { "type": "int", - "name": "NumRead" + "name": "numRead" }, { "type": "int", - "name": "AtLeast" + "name": "atLeast" }, { "type": "int", - "name": "AtMost" + "name": "atMost" } ] }, @@ -915,14 +915,14 @@ "type": "array", "items": "MessageType" }, - "name": "MessageTypes" + "name": "messageTypes" }, { "type": [ null, "string" ], - "name": "Since" + "name": "since" }, { "type": "UnreadFirstNumLimit", @@ -1175,7 +1175,7 @@ ], "response": "GetConversationForCLILocalRes" }, - "GetMessagesLocal": { + "getMessagesLocal": { "request": [ { "name": "conversationID", @@ -1191,7 +1191,7 @@ ], "response": "GetMessagesLocalRes" }, - "DownloadAttachmentLocal": { + "downloadAttachmentLocal": { "request": [ { "name": "sessionID", @@ -1216,7 +1216,7 @@ ], "response": "DownloadAttachmentLocalRes" }, - "CancelPost": { + "cancelPost": { "request": [ { "name": "outboxID", @@ -1225,7 +1225,7 @@ ], "response": null }, - "RetryPost": { + "retryPost": { "request": [ { "name": "outboxID", diff --git a/shared/constants/types/flow-types-chat.js b/shared/constants/types/flow-types-chat.js index 830c9c84a24b..b4a92e729406 100644 --- a/shared/constants/types/flow-types-chat.js +++ b/shared/constants/types/flow-types-chat.js @@ -116,7 +116,7 @@ export const NotifyChatChatActivityType = { } export function localCancelPostRpc (request: Exact) { - engineRpcOutgoing({...request, method: 'chat.1.local.CancelPost'}) + engineRpcOutgoing({...request, method: 'chat.1.local.cancelPost'}) } export function localCancelPostRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact): ChannelMap<*> { @@ -128,7 +128,7 @@ export function localCancelPostRpcPromise (request: $Exact void} & {param: localDownloadAttachmentLocalRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.local.DownloadAttachmentLocal'}) + engineRpcOutgoing({...request, method: 'chat.1.local.downloadAttachmentLocal'}) } export function localDownloadAttachmentLocalRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: localDownloadAttachmentLocalRpcParam}>): ChannelMap<*> { @@ -188,7 +188,7 @@ export function localGetInboxSummaryForCLILocalRpcPromise (request: $Exact void} & {param: localGetMessagesLocalRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.local.GetMessagesLocal'}) + engineRpcOutgoing({...request, method: 'chat.1.local.getMessagesLocal'}) } export function localGetMessagesLocalRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: localGetMessagesLocalRpcParam}>): ChannelMap<*> { @@ -260,7 +260,7 @@ export function localPostLocalRpcPromise (request: $Exact) { - engineRpcOutgoing({...request, method: 'chat.1.local.RetryPost'}) + engineRpcOutgoing({...request, method: 'chat.1.local.retryPost'}) } export function localRetryPostRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact): ChannelMap<*> { @@ -534,13 +534,13 @@ export type FailedMessageInfo = { } export type GenericPayload = { - Action: string, + action: string, } export type GetConversationForCLILocalQuery = { markAsRead: boolean, - MessageTypes?: ?Array, - Since?: ?string, + messageTypes?: ?Array, + since?: ?string, limit: UnreadFirstNumLimit, conversationId: ConversationID, } @@ -828,7 +828,7 @@ export type NewConversationLocalRes = { } export type NewConversationPayload = { - Action: string, + action: string, convID: ConversationID, inboxVers: InboxVers, unreadUpdate?: ?UnreadUpdate, @@ -863,7 +863,7 @@ export type OutboxRecord = { state: OutboxState, outboxID: OutboxID, convID: ConversationID, - Msg: MessagePlaintext, + msg: MessagePlaintext, } export type OutboxState = @@ -908,7 +908,7 @@ export type ReadMessageInfo = { } export type ReadMessagePayload = { - Action: string, + action: string, convID: ConversationID, msgID: MessageID, inboxVers: InboxVers, @@ -939,7 +939,7 @@ export type SetStatusInfo = { } export type SetStatusPayload = { - Action: string, + action: string, convID: ConversationID, status: ConversationStatus, inboxVers: InboxVers, @@ -979,14 +979,14 @@ export type TopicType = | 2 // DEV_2 export type UnreadFirstNumLimit = { - NumRead: int, - AtLeast: int, - AtMost: int, + numRead: int, + atLeast: int, + atMost: int, } export type UnreadUpdate = { convID: ConversationID, - UnreadMessages: int, + unreadMessages: int, } export type UnreadUpdateFull = { From 032de8aba158205c5365a632ff6744af1028c9d3 Mon Sep 17 00:00:00 2001 From: Song Gao Date: Tue, 22 Nov 2016 17:26:54 -0800 Subject: [PATCH 2/2] more fixes --- go/protocol/chat1/local.go | 4 ++-- go/protocol/chat1/notify.go | 4 ++-- go/protocol/chat1/remote.go | 8 ++++---- protocol/avdl/chat1/local.avdl | 2 +- protocol/avdl/chat1/notify.avdl | 2 +- protocol/avdl/chat1/remote.avdl | 4 ++-- protocol/js/flow-types-chat.js | 8 ++++---- protocol/json/chat1/local.json | 2 +- protocol/json/chat1/notify.json | 2 +- protocol/json/chat1/remote.json | 4 ++-- shared/constants/types/flow-types-chat.js | 8 ++++---- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go/protocol/chat1/local.go b/go/protocol/chat1/local.go index d09a92e3a6f2..f00905727949 100644 --- a/go/protocol/chat1/local.go +++ b/go/protocol/chat1/local.go @@ -821,7 +821,7 @@ func LocalProtocol(i LocalInterface) rpc.Protocol { }, MethodType: rpc.MethodCall, }, - "SetConversationStatusLocal": { + "setConversationStatusLocal": { MakeArg: func() interface{} { ret := make([]SetConversationStatusLocalArg, 1) return &ret @@ -999,7 +999,7 @@ func (c LocalClient) PostLocalNonblock(ctx context.Context, __arg PostLocalNonbl } func (c LocalClient) SetConversationStatusLocal(ctx context.Context, __arg SetConversationStatusLocalArg) (res SetConversationStatusLocalRes, err error) { - err = c.Cli.Call(ctx, "chat.1.local.SetConversationStatusLocal", []interface{}{__arg}, &res) + err = c.Cli.Call(ctx, "chat.1.local.setConversationStatusLocal", []interface{}{__arg}, &res) return } diff --git a/go/protocol/chat1/notify.go b/go/protocol/chat1/notify.go index d130b24a4214..9734a86f4eaf 100644 --- a/go/protocol/chat1/notify.go +++ b/go/protocol/chat1/notify.go @@ -206,7 +206,7 @@ func NotifyChatProtocol(i NotifyChatInterface) rpc.Protocol { return rpc.Protocol{ Name: "chat.1.NotifyChat", Methods: map[string]rpc.ServeHandlerDescription{ - "NewChatActivity": { + "newChatActivity": { MakeArg: func() interface{} { ret := make([]NewChatActivityArg, 1) return &ret @@ -231,6 +231,6 @@ type NotifyChatClient struct { } func (c NotifyChatClient) NewChatActivity(ctx context.Context, __arg NewChatActivityArg) (err error) { - err = c.Cli.Notify(ctx, "chat.1.NotifyChat.NewChatActivity", []interface{}{__arg}) + err = c.Cli.Notify(ctx, "chat.1.NotifyChat.newChatActivity", []interface{}{__arg}) return } diff --git a/go/protocol/chat1/remote.go b/go/protocol/chat1/remote.go index 0e7305868c18..81e80e4f7932 100644 --- a/go/protocol/chat1/remote.go +++ b/go/protocol/chat1/remote.go @@ -269,7 +269,7 @@ func RemoteProtocol(i RemoteInterface) rpc.Protocol { }, MethodType: rpc.MethodCall, }, - "SetConversationStatus": { + "setConversationStatus": { MakeArg: func() interface{} { ret := make([]SetConversationStatusArg, 1) return &ret @@ -301,7 +301,7 @@ func RemoteProtocol(i RemoteInterface) rpc.Protocol { }, MethodType: rpc.MethodCall, }, - "GetUnreadUpdateFull": { + "getUnreadUpdateFull": { MakeArg: func() interface{} { ret := make([]GetUnreadUpdateFullArg, 1) return &ret @@ -394,7 +394,7 @@ func (c RemoteClient) MarkAsRead(ctx context.Context, __arg MarkAsReadArg) (res } func (c RemoteClient) SetConversationStatus(ctx context.Context, __arg SetConversationStatusArg) (res SetConversationStatusRes, err error) { - err = c.Cli.Call(ctx, "chat.1.remote.SetConversationStatus", []interface{}{__arg}, &res) + err = c.Cli.Call(ctx, "chat.1.remote.setConversationStatus", []interface{}{__arg}, &res) return } @@ -406,7 +406,7 @@ func (c RemoteClient) TlfFinalize(ctx context.Context, tlfID TLFID) (err error) func (c RemoteClient) GetUnreadUpdateFull(ctx context.Context, inboxVers InboxVers) (res UnreadUpdateFull, err error) { __arg := GetUnreadUpdateFullArg{InboxVers: inboxVers} - err = c.Cli.Call(ctx, "chat.1.remote.GetUnreadUpdateFull", []interface{}{__arg}, &res) + err = c.Cli.Call(ctx, "chat.1.remote.getUnreadUpdateFull", []interface{}{__arg}, &res) return } diff --git a/protocol/avdl/chat1/local.avdl b/protocol/avdl/chat1/local.avdl index 619bb5ed2e64..ce85e5308046 100644 --- a/protocol/avdl/chat1/local.avdl +++ b/protocol/avdl/chat1/local.avdl @@ -246,7 +246,7 @@ protocol local { } PostLocalNonblockRes postLocalNonblock(ConversationID conversationID, MessagePlaintext msg, MessageID clientPrev); - SetConversationStatusLocalRes SetConversationStatusLocal(ConversationID conversationID, ConversationStatus status); + SetConversationStatusLocalRes setConversationStatusLocal(ConversationID conversationID, ConversationStatus status); record SetConversationStatusLocalRes { array rateLimits; } diff --git a/protocol/avdl/chat1/notify.avdl b/protocol/avdl/chat1/notify.avdl index d6a176cb6f5e..d19fcbc19303 100644 --- a/protocol/avdl/chat1/notify.avdl +++ b/protocol/avdl/chat1/notify.avdl @@ -51,5 +51,5 @@ protocol NotifyChat { } @notify("") - void NewChatActivity(keybase1.UID uid, ChatActivity activity); + void newChatActivity(keybase1.UID uid, ChatActivity activity); } diff --git a/protocol/avdl/chat1/remote.avdl b/protocol/avdl/chat1/remote.avdl index 3056b9374e57..6c0a85263677 100644 --- a/protocol/avdl/chat1/remote.avdl +++ b/protocol/avdl/chat1/remote.avdl @@ -76,14 +76,14 @@ protocol remote { MarkAsReadRes markAsRead(ConversationID conversationID, MessageID msgID); - SetConversationStatusRes SetConversationStatus(ConversationID conversationID, ConversationStatus status); + SetConversationStatusRes setConversationStatus(ConversationID conversationID, ConversationStatus status); // tlfFinalize is an endpoint for kbfstlfd to notify Gregor that a TLF ID has been finalized. // Gregor keeps an internal record of these TLF IDs, so that it can always return the latest // conversation per TLF ID on GetInboxRemote. void tlfFinalize(TLFID tlfID); - UnreadUpdateFull GetUnreadUpdateFull(InboxVers inboxVers); + UnreadUpdateFull getUnreadUpdateFull(InboxVers inboxVers); // The full set of updates of all convs in a single user's inbox record UnreadUpdateFull { // Set if this update should be ignored because the requester was already up to date diff --git a/protocol/js/flow-types-chat.js b/protocol/js/flow-types-chat.js index b4a92e729406..8c8cbd320a75 100644 --- a/protocol/js/flow-types-chat.js +++ b/protocol/js/flow-types-chat.js @@ -272,7 +272,7 @@ export function localRetryPostRpcPromise (request: $Exact void} & {param: localSetConversationStatusLocalRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.local.SetConversationStatusLocal'}) + engineRpcOutgoing({...request, method: 'chat.1.local.setConversationStatusLocal'}) } export function localSetConversationStatusLocalRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: localSetConversationStatusLocalRpcParam}>): ChannelMap<*> { @@ -332,7 +332,7 @@ export function remoteGetThreadRemoteRpcPromise (request: $Exact void} & {param: remoteGetUnreadUpdateFullRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.remote.GetUnreadUpdateFull'}) + engineRpcOutgoing({...request, method: 'chat.1.remote.getUnreadUpdateFull'}) } export function remoteGetUnreadUpdateFullRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: remoteGetUnreadUpdateFullRpcParam}>): ChannelMap<*> { @@ -404,7 +404,7 @@ export function remoteS3SignRpcPromise (request: $Exact void} & {param: remoteSetConversationStatusRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.remote.SetConversationStatus'}) + engineRpcOutgoing({...request, method: 'chat.1.remote.setConversationStatus'}) } export function remoteSetConversationStatusRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: remoteSetConversationStatusRpcParam}>): ChannelMap<*> { @@ -1265,7 +1265,7 @@ export type incomingCallMapType = Exact<{ }>, response: CommonResponseHandler ) => void, - 'keybase.1.NotifyChat.NewChatActivity'?: ( + 'keybase.1.NotifyChat.newChatActivity'?: ( params: Exact<{ uid: keybase1.UID, activity: ChatActivity diff --git a/protocol/json/chat1/local.json b/protocol/json/chat1/local.json index 2ff4e992d0fe..5ec67f729767 100644 --- a/protocol/json/chat1/local.json +++ b/protocol/json/chat1/local.json @@ -1084,7 +1084,7 @@ ], "response": "PostLocalNonblockRes" }, - "SetConversationStatusLocal": { + "setConversationStatusLocal": { "request": [ { "name": "conversationID", diff --git a/protocol/json/chat1/notify.json b/protocol/json/chat1/notify.json index ccd183f212c0..dcd7c4fe155c 100644 --- a/protocol/json/chat1/notify.json +++ b/protocol/json/chat1/notify.json @@ -150,7 +150,7 @@ } ], "messages": { - "NewChatActivity": { + "newChatActivity": { "request": [ { "name": "uid", diff --git a/protocol/json/chat1/remote.json b/protocol/json/chat1/remote.json index 05dc2b54812d..45ed189c0282 100644 --- a/protocol/json/chat1/remote.json +++ b/protocol/json/chat1/remote.json @@ -369,7 +369,7 @@ ], "response": "MarkAsReadRes" }, - "SetConversationStatus": { + "setConversationStatus": { "request": [ { "name": "conversationID", @@ -391,7 +391,7 @@ ], "response": null }, - "GetUnreadUpdateFull": { + "getUnreadUpdateFull": { "request": [ { "name": "inboxVers", diff --git a/shared/constants/types/flow-types-chat.js b/shared/constants/types/flow-types-chat.js index b4a92e729406..8c8cbd320a75 100644 --- a/shared/constants/types/flow-types-chat.js +++ b/shared/constants/types/flow-types-chat.js @@ -272,7 +272,7 @@ export function localRetryPostRpcPromise (request: $Exact void} & {param: localSetConversationStatusLocalRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.local.SetConversationStatusLocal'}) + engineRpcOutgoing({...request, method: 'chat.1.local.setConversationStatusLocal'}) } export function localSetConversationStatusLocalRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: localSetConversationStatusLocalRpcParam}>): ChannelMap<*> { @@ -332,7 +332,7 @@ export function remoteGetThreadRemoteRpcPromise (request: $Exact void} & {param: remoteGetUnreadUpdateFullRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.remote.GetUnreadUpdateFull'}) + engineRpcOutgoing({...request, method: 'chat.1.remote.getUnreadUpdateFull'}) } export function remoteGetUnreadUpdateFullRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: remoteGetUnreadUpdateFullRpcParam}>): ChannelMap<*> { @@ -404,7 +404,7 @@ export function remoteS3SignRpcPromise (request: $Exact void} & {param: remoteSetConversationStatusRpcParam}>) { - engineRpcOutgoing({...request, method: 'chat.1.remote.SetConversationStatus'}) + engineRpcOutgoing({...request, method: 'chat.1.remote.setConversationStatus'}) } export function remoteSetConversationStatusRpcChannelMap (channelConfig: ChannelConfig<*>, request: $Exact void} & {param: remoteSetConversationStatusRpcParam}>): ChannelMap<*> { @@ -1265,7 +1265,7 @@ export type incomingCallMapType = Exact<{ }>, response: CommonResponseHandler ) => void, - 'keybase.1.NotifyChat.NewChatActivity'?: ( + 'keybase.1.NotifyChat.newChatActivity'?: ( params: Exact<{ uid: keybase1.UID, activity: ChatActivity