ayo/social
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

친구 요청 수락시 id가 안오는 문제 수정

Browse Source
This commit is contained in:
mountain
2024-01-24 17:03:05 +09:00
parent 862d5650a2
commit 2a5a016c3e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/friend.go
View File

@ -208,7 +208,7 @@ var errAddFriendFailed = errors.New("addFriend failed")
func (fs *friends) addFriend(f *friendDoc) error { func (fs *friends) addFriend(f *friendDoc) error {
_, newid, err := fs.mongoClient.Update(friends_collection_name, bson.M{ _, newid, err := fs.mongoClient.Update(friends_collection_name, bson.M{
"_id": combineObjectID(f.From, f.To), "_id": f.Id,
}, bson.M{ }, bson.M{
"$setOnInsert": f, "$setOnInsert": f,
}, options.Update().SetUpsert(true)) }, options.Update().SetUpsert(true))

2
core/invitation.go
View File

@ -156,12 +156,14 @@ func (iv *invitation) AcceptInvitation(ctx wshandler.ApiCallContext) {
now := time.Now().UTC().Unix() now := time.Now().UTC().Unix()
f1 := friendDoc{ f1 := friendDoc{
Id: combineObjectID(ivdoc.To, ivdoc.From),
From: ivdoc.To, // 수락한 나 From: ivdoc.To, // 수락한 나
To: ivdoc.From, // 상대방 To: ivdoc.From, // 상대방
ToAlias: ivdoc.FromAlias, ToAlias: ivdoc.FromAlias,
Timestamp: now, Timestamp: now,
} }
f2 := friendDoc{ f2 := friendDoc{
Id: combineObjectID(ivdoc.From, ivdoc.To),
From: ivdoc.From, // 상대방 From: ivdoc.From, // 상대방
To: ivdoc.To, // 나 To: ivdoc.To, // 나
ToAlias: ivdoc.ToAlias, ToAlias: ivdoc.ToAlias,