Merge remote-tracking branch 'origin/3.8.3-patch' into 3.8.3-patch

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

@@ -15,12 +15,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: "recursive"
 
       # Step 2: Set up Git with official account
       - name: Set up Git
         run: |
-          git config user.name "github-actions[bot]"
+          git config --global user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
       # Step 3: Check and delete existing tag
       - name: Check and delete existing tag
@@ -33,7 +34,8 @@ jobs:
       # Step 4: Update version file
       - name: Update version file
         run: |
-          echo "${{ env.TAG_VERSION }}" > version/version
+          mkdir -p version
+          echo -n "${{ env.TAG_VERSION }}" > version/version
 
       # Step 5: Commit and push changes
       - name: Commit and push changes
@@ -42,43 +44,56 @@ jobs:
         run: |
           git add version/version
           git commit -m "Update version to ${{ env.TAG_VERSION }}"
-          git push origin HEAD:${{ github.ref }}
 
-      # Step 6: Create and push tag
+      # Step 6: Update tag
-      - name: Create and push tag
+      - name: Update tag
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git tag ${{ env.TAG_VERSION }}
+          git tag -fa ${{ env.TAG_VERSION }} -m "Update version to ${{ env.TAG_VERSION }}"
-          git push origin ${{ env.TAG_VERSION }}
+          git push origin ${{ env.TAG_VERSION }} --force
 
       # Step 7: Find and Publish Draft Release
       - name: Find and Publish Draft Release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            // Get the list of releases
+            const { owner, repo } = context.repo;
-            const releases = await github.rest.repos.listReleases({
+            const tagName = process.env.TAG_VERSION;
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
 
-            // Find the draft release where the title and tag_name are the same
+            try {
-            const draftRelease = releases.data.find(release => 
+              let release;
-              release.draft && release.name === release.tag_name
+              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}`);
+                }
+              }
               
-            if (draftRelease) {
-              // Publish the draft release using the release_id
               await github.rest.repos.updateRelease({
-                owner: context.repo.owner,
+                owner,
-                repo: context.repo.repo,
+                repo,
-                release_id: draftRelease.id,  // Use release_id
+                release_id: release.id,
-                draft: false
+                draft: false,
+                prerelease: release.prerelease
               });
               
-              core.info(`Draft Release ${draftRelease.tag_name} published successfully.`);
+              const status = release.draft ? "was draft" : "was already published";
-            } else {
+              core.info(`Release ${tagName} ensured to be published (${status}).`);
-              core.info("No matching draft release found.");
+              
+            } catch (error) {
+              core.warning(`Could not find or update release for tag ${tagName}: ${error.message}`);
             }

Dockerfile

@@ -43,7 +43,7 @@ COPY --from=builder $SERVER_DIR/start-config.yml $SERVER_DIR/
 COPY --from=builder $SERVER_DIR/go.mod $SERVER_DIR/
 COPY --from=builder $SERVER_DIR/go.sum $SERVER_DIR/
 
-RUN go get github.com/openimsdk/gomake@v0.0.14-alpha.5
+RUN go get github.com/openimsdk/gomake@v0.0.15-alpha.5
 
 # Set the command to run when the container starts
 ENTRYPOINT ["sh", "-c", "mage start && tail -f /dev/null"]

internal/rpc/relation/friend.go

@@ -103,22 +103,24 @@ 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: controller.NewFriendDatabase(
+		db: database,
-			friendMongoDB,
-			friendRequestMongoDB,
-			redis.NewFriendCacheRedis(rdb, &config.LocalCacheConfig, friendMongoDB, redis.GetRocksCacheOptions()),
-			mgocli.GetTx(),
-		),
 		blackDatabase: controller.NewBlackDatabase(
 			blackMongoDB,
 			redis.NewBlackCacheRedis(rdb, &config.LocalCacheConfig, blackMongoDB, redis.GetRocksCacheOptions()),

version/version.go

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