ljydlv
/
videoplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feature-im'

This commit is contained in:
junleea 2024-10-07 17:21:48 +08:00
parent b244854f2a 3e85b9e199
commit 798dec54f6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dao/im.go
View File

@ -78,8 +78,8 @@ func GetMsgGroupByIndex(group_id, index int) ([]GroupMessage, error) {
} }
func GetGroupRequestUsers(user_id int) []GroupRequest { func GetGroupRequestUsers(user_id int) []GroupRequestUsers {
var users []GroupRequest var users []GroupRequestUsers
DB.Debug().Raw("select id,im_id,name,email,group_id FROM (SELECT im_id,from_user_id,group_id FROM (( SELECT id as im_id,from_user_id,group_id FROM messages WHERE type=? and status=? ) as m JOIN groups as g on g.id=m.group_id ) where g.auth_id=? ) as e JOIN users as u ON e.from_user_id=u.id", proto.MSG_TYPE_GROUP_ADD, 0, user_id).Scan(&users) DB.Debug().Raw("select id,im_id,name,email,group_id FROM (SELECT im_id,from_user_id,group_id FROM (( SELECT id as im_id,from_user_id,group_id FROM messages WHERE type=? and status=? ) as m JOIN groups as g on g.id=m.group_id ) where g.auth_id=? ) as e JOIN users as u ON e.from_user_id=u.id", proto.MSG_TYPE_GROUP_ADD, 0, user_id).Scan(&users)
return users return users
} }
@ -278,7 +278,7 @@ type FriendRequest struct {
Age int `json:"age"` Age int `json:"age"`
} }
type GroupRequest struct { type GroupRequestUsers struct {
FriendRequest FriendRequest
GroupID int `json:"group_id"` GroupID int `json:"group_id"`
} }

2
service/imService.go
View File

@ -317,7 +317,7 @@ func GetGroupByNameLike(name string) []dao.Group {
return groups return groups
} }
func GetGroupRequestUsers(user_id int) []dao.GroupRequest { func GetGroupRequestUsers(user_id int) []dao.GroupRequestUsers {
//获取群聊请求 //获取群聊请求
users := dao.GetGroupRequestUsers(user_id) users := dao.GetGroupRequestUsers(user_id)
return users return users