install unrestricted bots (#21880)

go/chat/server.go

@@ -3003,6 +3003,20 @@ func (h *Server) GetBotMemberSettings(ctx context.Context, arg chat1.GetBotMembe
 	return teams.GetBotSettingsByID(ctx, h.G().ExternalG(), teamID, arg.Username)
 }
 
+func (h *Server) GetTeamRoleInConversation(ctx context.Context, arg chat1.GetTeamRoleInConversationArg) (res keybase1.TeamRole, err error) {
+	ctx = globals.ChatCtx(ctx, h.G(), keybase1.TLFIdentifyBehavior_CHAT_GUI, nil, nil)
+	defer h.Trace(ctx, func() error { return err }, "GetTeamRoleInConversation")()
+	uid, err := utils.AssertLoggedInUID(ctx, h.G())
+	if err != nil {
+		return res, err
+	}
+	teamID, _, err := h.teamIDFromConvID(ctx, uid, arg.ConvID)
+	if err != nil {
+		return res, err
+	}
+	return teams.MemberRoleFromID(ctx, h.G().ExternalG(), teamID, arg.Username)
+}
+
 func (h *Server) TeamIDFromTLFName(ctx context.Context, arg chat1.TeamIDFromTLFNameArg) (res keybase1.TeamID, err error) {
 	var identBreaks []keybase1.TLFIdentifyFailure
 	ctx = globals.ChatCtx(ctx, h.G(), keybase1.TLFIdentifyBehavior_CHAT_GUI, &identBreaks, h.identNotifier)

go/teams/service_helper.go

@@ -953,6 +953,24 @@ func MemberRole(ctx context.Context, g *libkb.GlobalContext, teamname, username
 	return role, err
 }
 
+func MemberRoleFromID(ctx context.Context, g *libkb.GlobalContext, teamID keybase1.TeamID, username string) (role keybase1.TeamRole, err error) {
+	uv, err := loadUserVersionByUsername(ctx, g, username, false /* useTracking */)
+	if err != nil {
+		return keybase1.TeamRole_NONE, err
+	}
+
+	err = RetryIfPossible(ctx, g, func(ctx context.Context, _ int) error {
+		t, err := GetForTeamManagementByTeamID(ctx, g, teamID, false)
+		if err != nil {
+			return err
+		}
+		// return value assign to escape closure
+		role, err = t.MemberRole(ctx, uv)
+		return err
+	})
+	return role, err
+}
+
 func RemoveMemberByID(ctx context.Context, g *libkb.GlobalContext, teamID keybase1.TeamID, username string) error {
 	teamGetter := func() (*Team, error) {
 		return GetForTeamManagementByTeamID(ctx, g, teamID, false)

protocol/avdl/chat1/local.avdl

@@ -1245,6 +1245,7 @@ protocol local {
   void removeBotMember(ConversationID convID, string username);
   void setBotMemberSettings(ConversationID convID, string username, keybase1.TeamBotSettings botSettings);
   keybase1.TeamBotSettings getBotMemberSettings(ConversationID convID, string username);
+  keybase1.TeamRole getTeamRoleInConversation(ConversationID convID, string username);
 
   keybase1.TeamID teamIDFromTLFName(string tlfName, ConversationMembersType membersType, boolean tlfPublic);
 

protocol/bin/enabled-calls.json

@@ -22,6 +22,7 @@
   "chat.1.local.getStaticConfig": {"promise": true},
   "chat.1.local.getTLFConversationsLocal": {"promise": true},
   "chat.1.local.getTeamRetentionLocal": {"promise": true},
+  "chat.1.local.getTeamRoleInConversation": {"promise": true},
   "chat.1.local.getThreadLocal": {"promise": true},
   "chat.1.local.getThreadNonblock": {"engineSaga": true},
   "chat.1.local.getUnfurlSettings": {"promise": true},

shared/actions/chat2/index.tsx

@@ -3401,6 +3401,25 @@ const loadNextBotPage = (state: Container.TypedState, action: Chat2Gen.LoadNextB
     page: state.chat2.featuredBotsPage + 1,
   })
 
+const refreshBotRoleInConv = async (action: Chat2Gen.RefreshBotRoleInConvPayload) => {
+  let role: RPCTypes.TeamRole | undefined
+  try {
+    role = await RPCChatTypes.localGetTeamRoleInConversationRpcPromise({
+      convID: Types.keyToConversationID(action.payload.conversationIDKey),
+      username: action.payload.username,
+    })
+  } catch (err) {
+    logger.info(`refreshBotRoleInConv: failed to refresh bot team role: ${err.message}`)
+    return
+  }
+  const trole = TeamsConstants.teamRoleByEnum[role]
+  return Chat2Gen.createSetBotRoleInConv({
+    conversationIDKey: action.payload.conversationIDKey,
+    role: !trole || trole === 'none' ? null : trole,
+    username: action.payload.username,
+  })
+}
+
 const refreshBotPublicCommands = async (
   _: Container.TypedState,
   action: Chat2Gen.RefreshBotPublicCommandsPayload
@@ -3441,12 +3460,14 @@ const addBotMember = async (state: Container.TypedState, action: Chat2Gen.AddBot
   try {
     await RPCChatTypes.localAddBotMemberRpcPromise(
       {
-        botSettings: {
-          cmds: allowCommands,
-          mentions: allowMentions,
-        },
+        botSettings: action.payload.restricted
+          ? {
+              cmds: allowCommands,
+              mentions: allowMentions,
+            }
+          : null,
         convID: Types.keyToConversationID(conversationIDKey),
-        role: RPCTypes.TeamRole.restrictedbot,
+        role: action.payload.restricted ? RPCTypes.TeamRole.restrictedbot : RPCTypes.TeamRole.bot,
         username,
       },
       Constants.waitingKeyBotAdd
@@ -3605,6 +3626,7 @@ function* chat2Saga() {
   yield* Saga.chainAction2(Chat2Gen.removeBotMember, removeBotMember)
   yield* Saga.chainAction2(Chat2Gen.refreshBotSettings, refreshBotSettings)
   yield* Saga.chainAction2(Chat2Gen.findGeneralConvIDFromTeamID, findGeneralConvIDFromTeamID)
+  yield* Saga.chainAction(Chat2Gen.refreshBotRoleInConv, refreshBotRoleInConv)
 
   // On login lets load the untrusted inbox. This helps make some flows easier
   yield* Saga.chainAction2(ConfigGen.bootstrapStatusLoaded, startupInboxLoad)

shared/actions/json/chat2.json

@@ -837,7 +837,8 @@
       "conversationIDKey": "Types.ConversationIDKey",
       "allowCommands": "boolean",
       "allowMentions": "boolean",
-      "username": "string"
+      "username": "string",
+      "restricted": "boolean"
     },
     "refreshBotSettings": {
       "_description": "refresh bot settings",
@@ -880,6 +881,17 @@
       "_description": "Record teamID to general convID mapping",
       "teamID": "TeamsTypes.TeamID",
       "conversationIDKey": "Types.ConversationIDKey"
+    },
+    "refreshBotRoleInConv": {
+      "_description": "Refresh role in conversation",
+      "conversationIDKey": "Types.ConversationIDKey",
+      "username": "string"
+    },
+    "setBotRoleInConv": {
+      "_description": "Set bot role in conversation",
+      "conversationIDKey": "Types.ConversationIDKey",
+      "username": "string",
+      "role": "TeamsTypes.TeamRoleType | null"
     }
   }
 }

shared/actions/teams.tsx

@@ -580,7 +580,7 @@ function* getDetails(_: TypedState, action: TeamsGen.GetDetailsPayload, logger:
       })
     )
   } catch (e) {
-    logger.error(e)
+    logger.info(e)
   } finally {
     const loadingKey = action.payload.clearInviteLoadingKey
     if (loadingKey) {
@@ -680,7 +680,7 @@ function* getTeamPublicity(_: TypedState, action: TeamsGen.GetTeamPublicityPaylo
 
     yield Saga.put(TeamsGen.createSetTeamPublicitySettings({publicity: publicityMap, teamname}))
   } catch (e) {
-    logger.error(e.message)
+    logger.info(e.message)
   }
 }