reset convs avdl

Jenkinsfile

@@ -506,7 +506,7 @@ def testGoBuilds(prefix, packagesToTest) {
           timeout(activity: true, time: 180, unit: 'SECONDS') {
           // Ignore the `dokan` directory since it contains lots of c code.
           // Ignore the `protocol` directory, autogeneration has some critques
-          sh 'go list -f "{{.Dir}}" ./...  | fgrep -v dokan | xargs realpath --relative-to=. | xargs golangci-lint run --deadline 5m0s'
+          sh 'go list -f "{{.Dir}}" ./...  | fgrep -v dokan | xargs realpath --relative-to=. | xargs golangci-lint run --deadline 10m0s'
           }
         }
       }
@@ -517,7 +517,7 @@ def testGoBuilds(prefix, packagesToTest) {
       fetchChangeTarget()
       def BASE_COMMIT_HASH = getBaseCommitHash()
       timeout(activity: true, time: 720, unit: 'SECONDS') {
-        sh "go list -f '{{.Dir}}' ./...  | fgrep -v kbfs | fgrep -v protocol | xargs realpath --relative-to=. | xargs golangci-lint run --new-from-rev ${BASE_COMMIT_HASH} --deadline 5m0s"
+        sh "go list -f '{{.Dir}}' ./...  | fgrep -v kbfs | fgrep -v protocol | xargs realpath --relative-to=. | xargs golangci-lint run --new-from-rev ${BASE_COMMIT_HASH} --deadline 10m0s"
       }
     } else {
       println("Running golangci-lint on all non-KBFS code")

go/chat/server.go

@@ -1895,31 +1895,23 @@ func (h *Server) GetAllResetConvMembers(ctx context.Context) (res chat1.GetAllRe
 	ctx = globals.ChatCtx(ctx, h.G(), keybase1.TLFIdentifyBehavior_CHAT_GUI, nil, h.identNotifier)
 	defer h.Trace(ctx, func() error { return err }, "GetAllResetConvMembers")()
 	defer func() { h.setResultRateLimit(ctx, &res) }()
-	uid, err := utils.AssertLoggedInUID(ctx, h.G())
-	if err != nil {
+	if _, err := utils.AssertLoggedInUID(ctx, h.G()); err != nil {
 		return res, err
 	}
-	ib, err := h.G().InboxSource.ReadUnverified(ctx, uid, types.InboxSourceDataSourceAll, nil)
+	resetConvs, err := h.remoteClient().GetResetConversations(ctx)
 	if err != nil {
 		return res, err
 	}
-	for _, conv := range ib.ConvsUnverified {
-		switch conv.GetMembersType() {
-		case chat1.ConversationMembersType_IMPTEAMNATIVE, chat1.ConversationMembersType_IMPTEAMUPGRADE:
-		default:
-			continue
-		}
-		for _, ru := range conv.Conv.Metadata.ResetList {
-			username, err := h.G().GetUPAKLoader().LookupUsername(ctx, keybase1.UID(ru.String()))
-			if err != nil {
-				return res, err
-			}
-			res.Members = append(res.Members, chat1.ResetConvMember{
-				Uid:      ru,
-				Conv:     conv.GetConvID(),
-				Username: username.String(),
-			})
+	for _, resetMember := range resetConvs.ResetConvs {
+		username, err := h.G().GetUPAKLoader().LookupUsername(ctx, keybase1.UID(resetMember.Uid.String()))
+		if err != nil {
+			return res, err
 		}
+		res.Members = append(res.Members, chat1.ResetConvMember{
+			Uid:      resetMember.Uid,
+			Conv:     resetMember.ConvID,
+			Username: username.String(),
+		})
 	}
 	return res, nil
 }

go/kbtest/chat.go

@@ -1051,6 +1051,10 @@ func (m *ChatRemoteMock) GetLastActiveAt(ctx context.Context, arg chat1.GetLastA
 	return res, errors.New("GetLastActiveAt not mocked")
 }
 
+func (m *ChatRemoteMock) GetResetConversations(ctx context.Context) (res chat1.GetResetConversationsRes, err error) {
+	return res, errors.New("GetResetConversations not mocked")
+}
+
 func (m *ChatRemoteMock) TeamIDOfConv(ctx context.Context, convID chat1.ConversationID) (res *keybase1.TeamID, err error) {
 	return res, errors.New("TeamIDOfConv not mocked")
 }

protocol/avdl/chat1/remote.avdl

@@ -422,4 +422,15 @@ protocol remote {
     union { null, RateLimit } rateLimit;
   }
   GetLastActiveAtRes getLastActiveAt(keybase1.TeamID teamID, gregor1.UID uid);
+
+  record ResetConversationMember {
+    ConversationID convID;
+    gregor1.UID uid;
+  }
+
+  record GetResetConversationsRes {
+    array<ResetConversationMember> resetConvs;
+    union { null, RateLimit } rateLimit;
+  }
+  GetResetConversationsRes getResetConversations();
 }