From 7b84612b042411068b9449ace71e19ea36bfe414 Mon Sep 17 00:00:00 2001 From: mountain Date: Fri, 26 Jan 2024 18:17:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=9C=EA=B5=AC=20=EC=B4=88=EB=8C=80=20?= =?UTF-8?q?=EA=B1=B0=EC=A0=88=ED=95=B4=EB=8F=84=20=EB=8B=A4=EC=8B=9C=20?= =?UTF-8?q?=EC=8B=9C=EB=8F=84=20=EA=B0=80=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/invitation.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/core/invitation.go b/core/invitation.go index b09af51..f6f1d8d 100644 --- a/core/invitation.go +++ b/core/invitation.go @@ -192,18 +192,12 @@ func (iv *invitation) AcceptInvitation(ctx wshandler.ApiCallContext) { func (iv *invitation) DenyInvitation(ctx wshandler.ApiCallContext) { invId, _ := primitive.ObjectIDFromHex(ctx.Arguments[0].(string)) - now := time.Now().UTC().Unix() var ivdoc invitationDoc - if err := iv.mongoClient.FindOneAndUpdateAs(invitation_collection_name, bson.M{ + if err := iv.mongoClient.FindOneAs(invitation_collection_name, bson.M{ "_id": invId, "to": bson.M{"$eq": ctx.CallBy.Accid}, - }, bson.M{ - "$set": bson.M{ - "denied": true, - "ts": now, - }, - }, &ivdoc, options.FindOneAndUpdate().SetReturnDocument(options.After).SetUpsert(false)); err != nil { + }, &ivdoc); err != nil { logger.Println("DenyInvitation failed. addFriend(f2) err :", err) return } @@ -213,6 +207,7 @@ func (iv *invitation) DenyInvitation(ctx wshandler.ApiCallContext) { return } + iv.mongoClient.Delete(invitation_collection_name, bson.M{"_id": invId}) iv.wsh.SendUpstreamMessage(&wshandler.UpstreamMessage{ Target: ivdoc.From.Hex(), Body: []invitationDoc{ivdoc},