Merge remote-tracking branch 'gitea/develop' into feat/html-embed-admin

# Conflicts:
#	apps/server/src/core/workspace/services/workspace.service.ts

apps/server/src/core/workspace/dto/update-workspace.dto.ts

@@ -59,6 +59,10 @@ export class UpdateWorkspaceDto extends PartialType(CreateWorkspaceDto) {
   @IsBoolean()
   htmlEmbed: boolean;
 
+  @IsOptional()
+  @IsBoolean()
+  aiPublicShareAssistant: boolean;
+
   @IsOptional()
   @IsInt()
   @Min(1)

apps/server/src/core/workspace/services/workspace.service.ts

@@ -525,6 +525,21 @@ export class WorkspaceService {
         );
       }
 
+      if (typeof updateWorkspaceDto.aiPublicShareAssistant !== 'undefined') {
+        const prev = settingsBefore?.ai?.publicShareAssistant ?? false;
+        if (prev !== updateWorkspaceDto.aiPublicShareAssistant) {
+          before.aiPublicShareAssistant = prev;
+          after.aiPublicShareAssistant =
+            updateWorkspaceDto.aiPublicShareAssistant;
+        }
+        await this.workspaceRepo.updateAiSettings(
+          workspaceId,
+          'publicShareAssistant',
+          updateWorkspaceDto.aiPublicShareAssistant,
+          trx,
+        );
+      }
+
       delete updateWorkspaceDto.restrictApiToAdmins;
       delete updateWorkspaceDto.aiSearch;
       delete updateWorkspaceDto.generativeAi;
@@ -534,6 +549,7 @@ export class WorkspaceService {
       delete updateWorkspaceDto.aiChat;
       delete updateWorkspaceDto.aiDictation;
       delete updateWorkspaceDto.htmlEmbed;
+      delete updateWorkspaceDto.aiPublicShareAssistant;
 
       await this.workspaceRepo.updateWorkspace(
         updateWorkspaceDto,