Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: the original quoted message is withdrawn and the quoted original message is displayed. #1391

Merged
merged 21 commits into from
Nov 14, 2023

Conversation

withchao
Copy link
Collaborator


🔍 What type of PR is this?

👀 What this PR does / why we need it:

  • My pull request adheres to the code style of this project
  • My code requires changes to the documentation
  • I have updated the documentation as required
  • All the tests have passed

🅰 Which issue(s) this PR fixes:

Fixes #1387

📝 Special notes for your reviewer:

🎯 Describe how to verify it

📑 Additional documentation e.g., RFC, notion, Google docs, usage docs, etc.:

withchao and others added 20 commits November 9, 2023 17:32
# Conflicts:
#	pkg/common/db/controller/msg.go
# Conflicts:
#	pkg/common/db/controller/msg.go
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 13, 2023
Copy link
Contributor

sweep-ai bot commented Nov 13, 2023

Apply Sweep Rules to your PR?

  • Apply: All new business logic should have corresponding unit tests.
  • Apply: Refactor large functions to be more modular.

FGadvancer
FGadvancer previously approved these changes Nov 13, 2023
# Conflicts:
#	pkg/common/db/controller/msg.go
@withchao withchao dismissed FGadvancer’s stale review November 13, 2023 12:41

The merge-base changed after approval.

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 13, 2023
Copy link

codecov bot commented Nov 13, 2023

Codecov Report

Merging #1391 (f6ac737) into main (2ac54e0) will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff          @@
##            main   #1391   +/-   ##
=====================================
  Coverage   4.37%   4.37%           
=====================================
  Files         49      49           
  Lines       4090    4090           
=====================================
  Hits         179     179           
  Misses      3899    3899           
  Partials      12      12           

@cubxxw
Copy link
Contributor

cubxxw commented Nov 13, 2023

make test-api error:

[success 1113 12:46:07] ==>  Operation was successful.
{
  "groupID": "30943",
  "invitedUserIDs": [
    "openIM123456",
    "openIM654321"
  ],
  "reason": "your reason"
}
+++ [1113 12:46:07] Response from user registration: {"errCode":1003,"errMsg":"DuplicateKeyError","errDlt":": 1003 DuplicateKeyError ==> github.com/openimsdk/open-im-server/v3/pkg/common/db/relation.(*ConversationGorm).Create()@42: : Error 1062 (23000): Duplicate entry 'openIM123456-sg_30943' for key 'PRIMARY'"}
!!! Error in /home/runner/work/open-im-server/open-im-server/scripts/install/test.sh:54 
  Error occurred: {"errCode":1003,"errMsg":"DuplicateKeyError","errDlt":": 1003 DuplicateKeyError ==> github.com/openimsdk/open-im-server/v3/pkg/common/db/relation.(*ConversationGorm).Create()@42: : Error 1062 (23000): Duplicate entry 'openIM123456-sg_30943' for key 'PRIMARY'"}, You can read the error code in the API documentation https://docs.openim.io/restapi/errcode
Call stack:
  1: /home/runner/work/open-im-server/open-im-server/scripts/install/test.sh:54 openim::test::check_error(...)
  2: /home/runner/work/open-im-server/open-im-server/scripts/install/test.sh:644 openim::test::invite_user_to_group(...)
  3: /home/runner/work/open-im-server/open-im-server/scripts/install/test.sh:1010 openim::test::group(...)
  4: /home/runner/work/open-im-server/open-im-server/scripts/install/test.sh:1[268](https://github.com/openimsdk/open-im-server/actions/runs/6850102108/job/18623611237?pr=1391#step:9:269) openim::test::api(...)
  5: /home/runner/work/open-im-server/open-im-server/scripts/install/test.sh:1[280](https://github.com/openimsdk/open-im-server/actions/runs/6850102108/job/18623611237?pr=1391#step:9:281) openim::test::test(...)
  6: /home/runner/work/open-im-server/open-im-server/scripts/install/test.sh:1289 main(...)
Exiting with status 1
make[1]: *** [scripts/make-rules/golang.mk:200: go.test.api] Error 1
make: *** [Makefile:172: test-api] Error 2
Error: Process completed with exit code 2.

@withchao withchao added this pull request to the merge queue Nov 14, 2023
Merged via the queue into openimsdk:main with commit 05ab3fc Nov 14, 2023
21 checks passed
@github-actions github-actions bot added this to the v3.1 milestone Nov 14, 2023
@openimsdk openimsdk locked and limited conversation to collaborators Nov 14, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Other]: the original quoted message is withdrawn and the quoted original message is displayed.
4 participants