Update version to v3.8.3-patch.5

.github/workflows/update-version-file-on-release.yml

@@ -8,40 +8,19 @@ jobs:
   update-version:
     runs-on: ubuntu-latest
     env:
-      TAG_VERSION: ${{ github.event.release.tag_name }}
+      TAG_VERSION: ${{ github.event.release.tag_name }} 
     steps:
       # Step 1: Checkout the original repository's code
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          # submodules: "recursive"
-
-      - name: Safe submodule initialization
-        run: |
-          echo "Checking for submodules..."
-          if [ -f .gitmodules ]; then
-            if [ -s .gitmodules ]; then
-              echo "Initializing submodules..."
-              if git submodule sync --recursive 2>/dev/null; then
-                git submodule update --init --force --recursive || {
-                  echo "Warning: Some submodules failed to initialize, continuing anyway..."
-                }
-              else
-                echo "Warning: Submodule sync failed, continuing without submodules..."
-              fi
-            else
-              echo ".gitmodules exists but is empty, skipping submodule initialization"
-            fi
-          else
-            echo "No .gitmodules file found, no submodules to initialize"
-          fi
 
       # Step 2: Set up Git with official account
       - name: Set up Git
         run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
 
       # Step 3: Check and delete existing tag
       - name: Check and delete existing tag
@@ -54,8 +33,7 @@ jobs:
       # Step 4: Update version file
       - name: Update version file
         run: |
-          mkdir -p version
-          echo -n "${{ env.TAG_VERSION }}" > version/version
+          echo "${{ env.TAG_VERSION }}" > version/version
 
       # Step 5: Commit and push changes
       - name: Commit and push changes
@@ -64,56 +42,43 @@ jobs:
         run: |
           git add version/version
           git commit -m "Update version to ${{ env.TAG_VERSION }}"
+          git push origin HEAD:${{ github.ref }}
 
-      # Step 6: Update tag
-      - name: Update tag
+      # Step 6: Create and push tag
+      - name: Create and push tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git tag -fa ${{ env.TAG_VERSION }} -m "Update version to ${{ env.TAG_VERSION }}"
-          git push origin ${{ env.TAG_VERSION }} --force
+          git tag ${{ env.TAG_VERSION }}
+          git push origin ${{ env.TAG_VERSION }}
 
       # Step 7: Find and Publish Draft Release
       - name: Find and Publish Draft Release
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const { owner, repo } = context.repo;
-            const tagName = process.env.TAG_VERSION;
+            // Get the list of releases
+            const releases = await github.rest.repos.listReleases({
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            });
 
-            try {
-              let release;
-              try {
-                const response = await github.rest.repos.getReleaseByTag({
-                  owner,
-                  repo,
-                  tag: tagName
-                });
-                release = response.data;
-              } catch (tagError) {
-                core.info(`Release not found by tag, searching all releases...`);
-                const releases = await github.rest.repos.listReleases({
-                  owner,
-                  repo,
-                  per_page: 100
-                });
-                
-                release = releases.data.find(r => r.draft && r.tag_name === tagName);            
-                if (!release) {
-                  throw new Error(`No release found with tag ${tagName}`);
-                }
-              }
-              
+            // Find the draft release where the title and tag_name are the same
+            const draftRelease = releases.data.find(release => 
+              release.draft && release.name === release.tag_name
+            );
+
+            if (draftRelease) {
+              // Publish the draft release using the release_id
               await github.rest.repos.updateRelease({
-                owner,
-                repo,
-                release_id: release.id,
-                draft: false,
-                prerelease: release.prerelease
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                release_id: draftRelease.id,  // Use release_id
+                draft: false
               });
-              
-              const status = release.draft ? "was draft" : "was already published";
-              core.info(`Release ${tagName} ensured to be published (${status}).`);
-              
-            } catch (error) {
-              core.warning(`Could not find or update release for tag ${tagName}: ${error.message}`);
-            }
+
+              core.info(`Draft Release ${draftRelease.tag_name} published successfully.`);
+            } else {
+              core.info("No matching draft release found.");
+            }

internal/rpc/relation/friend.go

@@ -103,24 +103,22 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 	}
 	userClient := rpcli.NewUserClient(userConn)
 
-	database := controller.NewFriendDatabase(
-		friendMongoDB,
-		friendRequestMongoDB,
-		redis.NewFriendCacheRedis(rdb, &config.LocalCacheConfig, friendMongoDB, redis.GetRocksCacheOptions()),
-		mgocli.GetTx(),
-	)
 	// Initialize notification sender
 	notificationSender := NewFriendNotificationSender(
 		&config.NotificationConfig,
 		rpcli.NewMsgClient(msgConn),
 		WithRpcFunc(userClient.GetUsersInfo),
-		WithFriendDB(database),
 	)
 	localcache.InitLocalCache(&config.LocalCacheConfig)
 
 	// Register Friend server with refactored MongoDB and Redis integrations
 	relation.RegisterFriendServer(server, &friendServer{
-		db: database,
+		db: controller.NewFriendDatabase(
+			friendMongoDB,
+			friendRequestMongoDB,
+			redis.NewFriendCacheRedis(rdb, &config.LocalCacheConfig, friendMongoDB, redis.GetRocksCacheOptions()),
+			mgocli.GetTx(),
+		),
 		blackDatabase: controller.NewBlackDatabase(
 			blackMongoDB,
 			redis.NewBlackCacheRedis(rdb, &config.LocalCacheConfig, blackMongoDB, redis.GetRocksCacheOptions()),

internal/rpc/third/third.go

@@ -17,11 +17,8 @@ package third
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
-	"github.com/openimsdk/tools/s3/aws"
-	"github.com/openimsdk/tools/s3/disable"
+	"time"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/redis"
@@ -93,10 +90,6 @@ func Start(ctx context.Context, config *Config, client discovery.SvcDiscoveryReg
 		o, err = oss.NewOSS(*config.RpcConfig.Object.Oss.Build())
 	case "kodo":
 		o, err = kodo.NewKodo(*config.RpcConfig.Object.Kodo.Build())
-	case "aws":
-		o, err = aws.NewAws(*config.RpcConfig.Object.Aws.Build())
-	case "":
-		o = disable.NewDisable()
 	default:
 		err = fmt.Errorf("invalid object enable: %s", enable)
 	}

version/version

@@ -1 +1 @@
-v3.8.3-patch.6
+v3.8.3-patch.5

version/version.go

@@ -1,14 +1,6 @@
 package version
 
-import (
-	_ "embed"
-	"strings"
-)
+import _ "embed"
 
 //go:embed version
 var Version string
-
-func init() {
-	Version = strings.Trim(Version, "\n")
-	Version = strings.TrimSpace(Version)
-}