Skip to content

refactor: change sync strategy of group request and friend request. #968

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.

Sign up for GitHub

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

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

refactor: change sync strategy of group request and friend request. #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1f34a1f
fix: refactor friend request and group request handling by removing l…
FGadvancer May 23, 2025
866e602
fix: refactor friend request and group request handling by removing l…
FGadvancer May 26, 2025
16bdcbb
fix: refactor friend request and group request handling by removing l…
FGadvancer May 26, 2025
d5a82d9
fix: refactor friend request and group request handling by removing l…
FGadvancer May 26, 2025
c75eb78
fix: refactor friend request and group request handling by removing l…
FGadvancer May 26, 2025
5388a83
fix: refactor friend request and group request handling by removing l…
FGadvancer May 26, 2025
f6fe300
fix: group member sync and unread trigger.
FGadvancer May 27, 2025
4783aa6
fix: message sync logic restore.
FGadvancer May 30, 2025
c89da81
refactor: change sync strategy of group request and friend request.
FGadvancer Jun 4, 2025
132f9e0
refactor: change sync strategy of group request and friend request.
FGadvancer Jun 14, 2025
5982bd8
refactor: change sync strategy of group request and friend request.
FGadvancer Jun 14, 2025
6e2ca02
Merge remote-tracking branch 'upstream/main' into main-group-request
FGadvancer Jun 17, 2025
7a47d63
fix: group member request trigger error.
FGadvancer Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/group/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (g *Group) doNotification(ctx context.Context, msg *sdkws.MsgData) error {
return err
}
if g.filter.ShouldExecute(detail.Uuid) {
g.listener().OnGroupMemberAdded(utils.StructToJsonString(
g.listener().OnGroupApplicationAdded(utils.StructToJsonString(
ServerGroupRequestToLocalGroupRequestForNotification(detail.GetGroup(), detail.GetRequest())))
}
default:
Expand Down
18 changes: 16 additions & 2 deletions internal/group/server_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,14 @@ func (g *Group) getServerSelfGroupApplication(ctx context.Context, groupIDs []st
handleResults []int32, pageNumber, showNumber int32) ([]*sdkws.GroupRequest, error) {
req := &group.GetUserReqApplicationListReq{UserID: g.loginUserID, Pagination: &sdkws.RequestPagination{PageNumber: pageNumber, ShowNumber: showNumber},
GroupIDs: groupIDs, HandleResults: handleResults}
return api.Page(ctx, req, api.GetSendGroupApplicationList.Invoke, (*group.GetUserReqApplicationListResp).GetGroupRequests)
if showNumber <= 0 {
return api.Page(ctx, req, api.GetSendGroupApplicationList.Invoke, (*group.GetUserReqApplicationListResp).GetGroupRequests)
}
resp, err := api.GetSendGroupApplicationList.Invoke(ctx, req)
if err != nil {
return nil, err
}
return resp.GetGroupRequests(), nil
}

func (g *Group) getServerJoinGroup(ctx context.Context) ([]*sdkws.GroupInfo, error) {
Expand All @@ -94,7 +101,14 @@ func (g *Group) getServerAdminGroupApplicationList(ctx context.Context, groupIDs
handleResults []int32, pageNumber, showNumber int32) ([]*sdkws.GroupRequest, error) {
req := &group.GetGroupApplicationListReq{FromUserID: g.loginUserID, Pagination: &sdkws.RequestPagination{PageNumber: pageNumber, ShowNumber: showNumber},
GroupIDs: groupIDs, HandleResults: handleResults}
return api.Page(ctx, req, api.GetRecvGroupApplicationList.Invoke, (*group.GetGroupApplicationListResp).GetGroupRequests)
if showNumber <= 0 {
return api.Page(ctx, req, api.GetRecvGroupApplicationList.Invoke, (*group.GetGroupApplicationListResp).GetGroupRequests)
}
resp, err := api.GetRecvGroupApplicationList.Invoke(ctx, req)
if err != nil {
return nil, err
}
return resp.GetGroupRequests(), nil
}

func (g *Group) getGroupsInfoFromServer(ctx context.Context, groupIDs []string) ([]*sdkws.GroupInfo, error) {
Expand Down
18 changes: 16 additions & 2 deletions internal/relation/server_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,27 @@ func (r *Relation) getDesignatedFriendsApply(ctx context.Context, req *relation.

func (r *Relation) getSelfFriendApplicationList(ctx context.Context, pageNumber, showNumber int32) ([]*sdkws.FriendRequest, error) {
req := &relation.GetPaginationFriendsApplyFromReq{UserID: r.loginUserID, Pagination: &sdkws.RequestPagination{PageNumber: pageNumber, ShowNumber: showNumber}}
return api.Page(ctx, req, api.GetSelfFriendApplicationList.Invoke, (*relation.GetPaginationFriendsApplyFromResp).GetFriendRequests)
if showNumber <= 0 {
return api.Page(ctx, req, api.GetSelfFriendApplicationList.Invoke, (*relation.GetPaginationFriendsApplyFromResp).GetFriendRequests)
}
resp, err := api.GetSelfFriendApplicationList.Invoke(ctx, req)
if err != nil {
return nil, err
}
return resp.GetFriendRequests(), nil
}

func (r *Relation) getRecvFriendApplicationList(ctx context.Context, handleResults []int32, pageNumber, showNumber int32) ([]*sdkws.FriendRequest, error) {
req := &relation.GetPaginationFriendsApplyToReq{UserID: r.loginUserID, Pagination: &sdkws.RequestPagination{PageNumber: pageNumber, ShowNumber: showNumber},
HandleResults: handleResults}
return api.Page(ctx, req, api.GetRecvFriendApplicationList.Invoke, (*relation.GetPaginationFriendsApplyToResp).GetFriendRequests)
if showNumber <= 0 {
return api.Page(ctx, req, api.GetRecvFriendApplicationList.Invoke, (*relation.GetPaginationFriendsApplyToResp).GetFriendRequests)
}
resp, err := api.GetRecvFriendApplicationList.Invoke(ctx, req)
if err != nil {
return nil, err
}
return resp.GetFriendRequests(), nil
}

func (r *Relation) getBlackList(ctx context.Context) ([]*sdkws.BlackInfo, error) {
Expand Down