merge: update release-v1.8 with main changes. (#581)

* fix: user search fields * fix: reset UserPassword in admin. (#572) * update dockerfile contents. * update field. * fix: reset UserPassword in admin. * refactor: improve github workflows. (#573) * update dockerfile contents. * update field. * refactor: improve github workflows. * remove en * feat: update RegisterUser use adminToken. (#574) * update dockerfile contents. * update field. * feat: update RegisterUser use adminToken. * refactor: update token logic. (#575) * update dockerfile contents. * update field. * refactor: update token logic. * remove unused ci. * fix: mobile phone number, email address, account modification verification (#578) * update gomake version * update gomake version * update version * fix: mobile phone number, email address, account modification verification * fix: assign livekit node ip (#570) * WIP:feat: update update version file workflows. (#576) * update dockerfile contents. * update field. * feat: update update version file workflows. * feat: add version file. * Update version * update log module. * refactor: update adminToken (#580) * update dockerfile contents. * update field. * refactor: update adminToken --------- Co-authored-by: withchao <[email protected]> Co-authored-by: Monet Lee <[email protected]> Co-authored-by: chao <[email protected]> Co-authored-by: blooming <[email protected]>
openimsdk · Oct 14, 2024 · f1ae650 · f1ae650
1 parent 1caea9a
commit f1ae650
Show file tree

Hide file tree

Showing 44 changed files with 653 additions and 783 deletions.
diff --git a/.github/.codecov.yml b/.github/.codecov.yml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 coverage:
   status:
     project:

diff --git a/.github/code-language-detector.yml b/.github/code-language-detector.yml
diff --git a/.github/labels.yml b/.github/labels.yml
diff --git a/.github/sync-release.yml b/.github/sync-release.yml
@@ -1,19 +1,3 @@
-# Copyright © 2023 OpenIM. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# https://github.com/BetaHuhn/repo-file-sync-action
-# Synchronization for the.github repository
 openim-sigs/openim-docker:
   - source: ./config
     dest: ./openim-chat/release/config

diff --git a/.github/weekly-digest.yml b/.github/weekly-digest.yml
diff --git a/.github/workflows/auto-assign-issue.yml b/.github/workflows/auto-assign-issue.yml
@@ -1,17 +1,3 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: Assign issue to comment author
 on:
   issue_comment:
@@ -20,24 +6,24 @@ jobs:
   assign-issue:
     if: |
       contains(github.event.comment.body, '/assign') || contains(github.event.comment.body, '/accept') &&
-      !contains(github.event.comment.user.login, 'openimbot') &&
-      !contains(github.event.comment.user.login, 'kubbot')
+      !contains(github.event.comment.user.login, 'openim-robot')
     runs-on: ubuntu-latest
     permissions:
       issues: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Assign the issue
         run: |
           export LETASE_MILESTONES=$(curl 'https://api.github.com/repos/$OWNER/$PEPO/milestones' | jq -r 'last(.[]).title')
           gh issue edit ${{ github.event.issue.number }} --add-assignee "${{ github.event.comment.user.login }}"
-          gh issue edit ${{ github.event.issue.number }} --add-label "triage/accepted"
-          gh issue edit ${{ github.event.issue.number }} --milestone "$LETASE_MILESTONES"
+          gh issue edit ${{ github.event.issue.number }} --add-label "accepted"
           gh issue comment $ISSUE --body "@${{ github.event.comment.user.login }} Glad to see you accepted this issue🤲, this issue has been assigned to you. I set the milestones for this issue to [$LETASE_MILESTONES](https://github.com/$OWNER/$PEPO/milestones), We are looking forward to your PR!"
+
+        # gh issue edit ${{ github.event.issue.number }} --milestone "$LETASE_MILESTONES"
         env:
-          GH_TOKEN: ${{ secrets.REDBOT_GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.BOT_TOKEN }}
           ISSUE: ${{ github.event.issue.html_url }}
           OWNER: ${{ github.repository_owner }}
-          REPO: ${{ github.event.repository.name }}
+          REPO: ${{ github.event.repository.name }}
diff --git a/.github/workflows/auto-gh-pr.yml b/.github/workflows/auto-gh-pr.yml
diff --git a/.github/workflows/auto-invite-comment.yml b/.github/workflows/auto-invite-comment.yml
@@ -0,0 +1,39 @@
+name: Invite users to join OpenIM Community.
+on:
+  issue_comment:
+    types:
+      - created
+jobs:
+  issue_comment:
+    name: Invite users to join OpenIM Community
+    if: ${{ github.event.comment.body == '/invite' || github.event.comment.body == '/close' || github.event.comment.body == '/comment' }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+
+      - name: Invite user to join OpenIM Community
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          token: ${{ secrets.BOT_GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            We value close connections with our users, developers, and contributors here at Open-IM-Server. With a large community and maintainer team, we're always here to help and support you. Whether you're looking to join our community or have any questions or suggestions, we welcome you to get in touch with us.
+
+            Our most recommended way to get in touch is through [Slack](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q). Even if you're in China, Slack is usually not blocked by firewalls, making it an easy way to connect with us. Our Slack community is the ideal place to discuss and share ideas and suggestions with other users and developers of Open-IM-Server. You can ask technical questions, seek help, or share your experiences with other users of Open-IM-Server.
+            
+            In addition to Slack, we also offer the following ways to get in touch:
+            
+            + <a href="https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q" target="_blank"><img src="https://img.shields.io/badge/Slack-OpenIM%2B-blueviolet?logo=slack&amp;logoColor=white"></a> We also have Slack channels for you to communicate and discuss. To join, visit https://slack.com/ and join our [👀 Open-IM-Server slack](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q) team channel.
+            + <a href="https://mail.google.com/mail/u/0/?fs=1&tf=cm&[email protected]" target="_blank"><img src="https://img.shields.io/badge/gmail-%40OOpenIMSDKCore?style=social&logo=gmail"></a> Get in touch with us on [Gmail](https://mail.google.com/mail/u/0/?fs=1&tf=cm&[email protected]). If you have any questions or issues that need resolving, or any suggestions and feedback for our open source projects, please feel free to contact us via email.
+            + <a href="https://doc.rentsoft.cn/" target="_blank"><img src="https://img.shields.io/badge/%E5%8D%9A%E5%AE%A2-%40OpenIMSDKCore-blue?style=social&logo=Octopus%20Deploy"></a> Read our [blog](https://doc.rentsoft.cn/). Our blog is a great place to stay up-to-date with Open-IM-Server projects and trends. On the blog, we share our latest developments, tech trends, and other interesting information.
+            + <a href="https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg" target="_blank"><img src="https://img.shields.io/badge/%E5%BE%AE%E4%BF%A1-OpenIMSDKCore-brightgreen?logo=wechat&style=flat-square"></a> Add [Wechat](https://github.com/OpenIMSDK/OpenIM-Docs/blob/main/docs/images/WechatIMG20.jpeg) and indicate that you are a user or developer of Open-IM-Server. We will process your request as soon as possible.
+
+      # - name: Close Issue
+      #   uses: peter-evans/close-issue@v3
+      #   with:
+      #     token: ${{ secrets.BOT_GITHUB_TOKEN }}
+      #     issue-number: ${{ github.event.issue.number }}
+      #     comment: 🤖 Auto-closing issue, if you still need help please reopen the issue or ask for help in the community above
+      #     labels: |
+      #       accepted
diff --git a/.github/workflows/auto-tag.yml b/.github/workflows/auto-tag.yml
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -1,17 +1,3 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: Publish Docker image
 
 on:

diff --git a/.github/workflows/chatci.yml b/.github/workflows/chatci.yml
@@ -1,16 +1,3 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 name: OpenIM CI Auto Build
 
 on: 
@@ -45,11 +32,11 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
-    environment:
-      name: openim
+    # environment:
+    #   name: openim
     strategy:
       matrix:
-        arch: [arm64, armv7, amd64]
+        arch: [amd64]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.github/workflows/check-coverage.yml b/.github/workflows/check-coverage.yml
@@ -1,17 +1,3 @@
-# Copyright © 2023 OpenIM open source community. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 name: Check-Coverage
 
 on: