Feature redact raw (#182)

* update * update * update * update * update * update * update * update * update * update * update * update Co-authored-by: chenzr <[email protected]>
finogeeks · Nov 8, 2021 · 3907f98 · 3907f98
1 parent c667624
commit 3907f98
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 16 deletions.
diff --git a/clientapi/api/api.go b/clientapi/api/api.go
@@ -133,6 +133,7 @@ func init() {
 	apiconsumer.SetAPIProcessor(ReqPutRoomStateWidthType{})
 	apiconsumer.SetAPIProcessor(ReqPutRoomStateWidthTypeAndKey{})
 	apiconsumer.SetAPIProcessor(ReqPutRoomRedact{})
+	apiconsumer.SetAPIProcessor(ReqPutRoomRawRedact{})
 	apiconsumer.SetAPIProcessor(ReqPutRoomRedactWithTxnID{})
 	apiconsumer.SetAPIProcessor(ReqPutRoomUpdate{})
 	apiconsumer.SetAPIProcessor(ReqPutRoomUpdateWithTxnID{})
@@ -505,6 +506,50 @@ func (ReqPutRoomRedact) Process(consumer interface{}, msg core.Coder, device *au
 	)
 }
 
+type ReqPutRoomRawRedact struct{}
+
+func (ReqPutRoomRawRedact) GetRoute() string       { return "/rooms/{roomID}/rawredact/{eventId}" }
+func (ReqPutRoomRawRedact) GetMetricsName() string { return "raw_redact_event" }
+func (ReqPutRoomRawRedact) GetMsgType() int32      { return internals.MSG_PUT_ROOM_RAW_REDACT }
+func (ReqPutRoomRawRedact) GetAPIType() int8       { return apiconsumer.APITypeAuth }
+func (ReqPutRoomRawRedact) GetMethod() []string {
+	return []string{http.MethodPut, http.MethodPost, http.MethodOptions}
+}
+func (ReqPutRoomRawRedact) GetTopic(cfg *config.Dendrite) string { return getProxyRpcTopic(cfg) }
+func (ReqPutRoomRawRedact) NewRequest() core.Coder {
+	return new(external.PutRedactEventRequest)
+}
+func (ReqPutRoomRawRedact) FillRequest(coder core.Coder, req *http.Request, vars map[string]string) error {
+	msg := coder.(*external.PutRedactEventRequest)
+	if vars != nil {
+		msg.EventID = vars["eventId"]
+		msg.RoomID = vars["roomID"]
+	}
+	data, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		return err
+	}
+	if err := json.Unmarshal(data, msg); err != nil {
+		return err
+	}
+	msg.Content = data
+	return nil
+}
+func (ReqPutRoomRawRedact) NewResponse(code int) core.Coder {
+	return new(external.PutRedactEventResponse)
+}
+func (ReqPutRoomRawRedact) GetPrefix() []string { return []string{"r0", "v1", "inr0"} }
+func (ReqPutRoomRawRedact) Process(consumer interface{}, msg core.Coder, device *authtypes.Device) (int, core.Coder) {
+	c := consumer.(*InternalMsgConsumer)
+	req := msg.(*external.PutRedactEventRequest)
+	userID := device.UserID
+	deviceID := device.ID
+	return routing.RedactEvent(
+		context.Background(), req.Content, userID, deviceID, req.RoomID,
+		nil, nil, c.Cfg, c.localcache, c.rsRpcCli, req.EventID, "m.room.rawredact", c.idg,
+	)
+}
+
 type ReqPutRoomRedactWithTxnID struct{}
 
 func (ReqPutRoomRedactWithTxnID) GetRoute() string {

diff --git a/clientapi/routing/redactevent.go b/clientapi/routing/redactevent.go
@@ -25,11 +25,11 @@ import (
 	"github.com/finogeeks/ligase/common/jsonerror"
 	"github.com/finogeeks/ligase/common/uid"
 	"github.com/finogeeks/ligase/core"
-	"github.com/finogeeks/ligase/skunkworks/gomatrixserverlib"
 	"github.com/finogeeks/ligase/model/roomservertypes"
 	"github.com/finogeeks/ligase/model/service"
 	"github.com/finogeeks/ligase/model/service/roomserverapi"
 	"github.com/finogeeks/ligase/plugins/message/external"
+	"github.com/finogeeks/ligase/skunkworks/gomatrixserverlib"
 
 	log "github.com/finogeeks/ligase/skunkworks/log"
 )
@@ -84,17 +84,21 @@ func RedactEvent(
 		EventID: redacts,
 		RoomID:  roomID,
 	}
+	log.Infof("RedactEvent type:%s event_id:%s room_id:%s", eventType, redacts, roomID)
+
 	var queryRoomEventByIDResponse roomserverapi.QueryRoomEventByIDResponse
 
 	if err := rsRpcCli.QueryRoomEventByID(ctx, &queryRoomEventByIDRequest, &queryRoomEventByIDResponse); err != nil {
+		log.Errorf("RedactEvent rsRpcCli.QueryRoomEventByID event_id:%s room_id:%s err:%s", redacts, roomID, err.Error())
 		return 404, jsonerror.Unknown(err.Error())
 	}
 
 	if queryRoomEventByIDResponse.Event == nil {
+		log.Errorf("RedactEvent rsRpcCli.QueryRoomEventByID event_id:%s room_id:%s not found", redacts, roomID)
 		return 404, jsonerror.NotFound("can't find original event")
 	}
 
-	log.Infof("------------------------RedactEvent get target ev %s sender %v", queryRoomEventByIDResponse.Event, queryRoomEventByIDResponse.Event.Sender())
+	log.Infof("------------------------RedactEvent get target event_id:%s room_id:%s ev %v sender %v", queryRoomEventByIDResponse.Event.EventID(), queryRoomEventByIDResponse.Event.RoomID(), queryRoomEventByIDResponse.Event, queryRoomEventByIDResponse.Event.Sender())
 
 	builder := gomatrixserverlib.EventBuilder{
 		Sender:        userID,

diff --git a/clientapi/routing/userinfo.go b/clientapi/routing/userinfo.go
@@ -225,7 +225,7 @@ func SetUserInfo(
 		Landline:  r.Landline,
 		Email:     r.Email,
 		State:     r.State,
-		//Presence:        "online",
+		Presence:  "online",
 		CurrentlyActive: true,
 		UserID:          userID,
 		LastActiveAgo:   0,

diff --git a/clientapi/rpc/grpc_server.go b/clientapi/rpc/grpc_server.go
@@ -121,7 +121,7 @@ func (s *Server) UpdateProfile(ctx context.Context, req *pb.UpdateProfileReq) (r
 	if oldUserInfo != nil {
 		if oldUserInfo.UserName == req.UserName && oldUserInfo.JobNumber == req.JobNumber &&
 			oldUserInfo.Mobile == req.Mobile && oldUserInfo.Landline == req.Landline &&
-			oldUserInfo.Email == req.Email {
+			oldUserInfo.Email == req.Email && oldUserInfo.State == int(req.State) {
 			upUserInfo = false
 		}
 	}

diff --git a/plugins/message/internals/msgdef.go b/plugins/message/internals/msgdef.go
@@ -91,6 +91,7 @@ const (
 	MSG_PUT_ROOM_REDACT_WITH_TXNID int32 = 0x00090002
 	MSG_PUT_ROOM_UPDATE            int32 = 0x00090003
 	MSG_PUT_ROOM_UPDATE_WITH_TXNID int32 = 0x00090004
+	MSG_PUT_ROOM_RAW_REDACT        int32 = 0x00090005
 
 	MSG_POST_CREATEROOM int32 = 0x000a0002
 

diff --git a/roomserver/processors/roomQryProcessor.go b/roomserver/processors/roomQryProcessor.go
@@ -24,9 +24,9 @@ import (
 	"math"
 
 	"github.com/finogeeks/ligase/common/config"
-	"github.com/finogeeks/ligase/skunkworks/gomatrixserverlib"
 	"github.com/finogeeks/ligase/model/repos"
 	"github.com/finogeeks/ligase/model/service/roomserverapi"
+	"github.com/finogeeks/ligase/skunkworks/gomatrixserverlib"
 	"github.com/finogeeks/ligase/storage/model"
 
 	log "github.com/finogeeks/ligase/skunkworks/log"
@@ -132,15 +132,18 @@ func (s *RoomQryProcessor) QueryRoomEventByID(
 ) error {
 	response.EventID = request.EventID
 	response.RoomID = request.RoomID
+	log.Infof("############## begin QueryRoomEventByID, eventID: %s, roomID: %s", response.EventID, response.RoomID)
 
 	eventNID, err := s.DB.EventNID(ctx, request.EventID)
 	if err != nil {
+		log.Errorf("############## QueryRoomEventByID from db nid, eventID: %s, roomID: %s,  err:%s", response.EventID, response.RoomID, err.Error())
 		return err
 	}
-	log.Infof("############## QueryRoomEventByID, EventNID: %d, eventID: %d, roomID: %d", eventNID, response.EventID, response.RoomID)
+	log.Infof("############## after QueryRoomEventByID, EventNID: %d, eventID: %s, roomID: %s", eventNID, response.EventID, response.RoomID)
 
 	evs, _, err := s.DB.Events(ctx, []int64{eventNID})
 	if err != nil {
+		log.Errorf("############## QueryRoomEventByID from db event, eventID: %s, roomID: %s,  err:%s", response.EventID, response.RoomID, err.Error())
 		return err
 	}
 

diff --git a/rpc/grpc/client.go b/rpc/grpc/client.go
@@ -866,11 +866,13 @@ func (r *Client) QueryRoomEventByID(ctx context.Context, req *roomserverapi.Quer
 	cl := newCallLog("QueryRoomEventByID", req)
 	conn, err := r.connGetter.GetConn(r.connMgr, &r.cfg.Rpc.RoomServer, 0)
 	if err != nil {
+		log.Errorf("QueryRoomEventByID get conn err:%s", err.Error())
 		return nil, err
 	}
 	c := pb.NewRoomServerClient(conn)
 	resp, err := c.QueryRoomEventByID(ctx, &pb.QueryRoomEventByIDReq{EventID: req.EventID, RoomID: req.RoomID})
 	if err != nil {
+		log.Errorf("QueryRoomEventByID query err:%s", err.Error())
 		return nil, err
 	}
 	cl.end(resp)

diff --git a/skunkworks/gomatrixserverlib/eventauth.go b/skunkworks/gomatrixserverlib/eventauth.go
@@ -58,6 +58,7 @@ const (
 	// channel archive
 	MRoomArchive = "m.room.archive"
 	MRoomUpdate  = "m.room.update"
+	MRoomRawRedact = "m.room.rawredact"
 	MRoomMessage = "m.room.message"
 )
 
@@ -349,7 +350,7 @@ func Allowed(event Event, authEvents AuthEventProvider) error {
 		return memberEventAllowed(event, authEvents)
 	case MRoomPowerLevels:
 		return powerLevelsEventAllowed(event, authEvents)
-	case MRoomRedaction, MRoomUpdate:
+	case MRoomRedaction, MRoomUpdate, MRoomRawRedact:
 		return redactEventAllowed(event, authEvents)
 	default:
 		if event.Type() == MRoomMessage {

diff --git a/syncaggregate/consumers/profile.go b/syncaggregate/consumers/profile.go
@@ -153,12 +153,12 @@ func (s *ProfileConsumer) onMessage(output *types.ProfileStreamUpdate) {
 			log.Errorf("ProfileConsumer onMessage panic recovered err %#v", e)
 		}
 	}()
-	log.Infof("recv Profile update, user:%s presence:%v", output.UserID, output.Presence.Presence)
+	log.Infof("recv Profile update, user:%s presence:%v", output.UserID, output.Presence)
 
 	if !s.checkUpdate(output) {
 		return
 	}
-	log.Infof("do Profile update, user:%s presence:%v", output.UserID, output.Presence.Presence)
+	log.Infof("do Profile update, user:%s presence:%v", output.UserID, output.Presence)
 	event := &gomatrixserverlib.ClientEvent{}
 	event.Type = "m.presence"
 	event.Sender = output.UserID

diff --git a/syncaggregate/sync/syncMng.go b/syncaggregate/sync/syncMng.go
@@ -954,7 +954,7 @@ func (sm *SyncMng) addOneTimeKeyCountInfo(req *request, res *syncapitypes.Respon
 func (sm *SyncMng) addPresence(req *request, response *syncapitypes.Response) {
 	maxPos := int64(-1)
 	if sm.presenceStreamRepo.ExistsPresence(req.device.UserID, req.marks.preRecv) {
-		log.Debugf("add presence for %s", req.device.UserID)
+		log.Infof("add presence for %s", req.device.UserID)
 		friendShipMap := sm.userTimeLine.GetFriendShip(req.device.UserID, true)
 		if friendShipMap != nil {
 			var presenceEvent gomatrixserverlib.ClientEvent
@@ -969,7 +969,7 @@ func (sm *SyncMng) addPresence(req *request, response *syncapitypes.Response) {
 
 					response.Presence.Events = append(response.Presence.Events, presenceEvent)
 					data, _ := json.Marshal(presenceEvent)
-					log.Debugf("add presence for %s %d %d %s", req.device.UserID, feed.GetOffset(), req.marks.preRecv, data)
+					log.Infof( "add presence for %s %d %d %s", req.device.UserID, feed.GetOffset(), req.marks.preRecv, data)
 
 					if maxPos < feed.GetOffset() {
 						maxPos = feed.GetOffset()
@@ -985,7 +985,7 @@ func (sm *SyncMng) addPresence(req *request, response *syncapitypes.Response) {
 	}
 
 	req.marks.preProcess = maxPos
-	log.Debugf("process precense user:%s cur:%d", req.device.UserID, req.marks.preProcess)
+	log.Infof("process precense user:%s cur:%d", req.device.UserID, req.marks.preProcess)
 	return
 }
 

diff --git a/syncserver/consumers/feedserver.go b/syncserver/consumers/feedserver.go
@@ -244,6 +244,9 @@ func (s *RoomEventFeedConsumer) processRedactEv(ev *gomatrixserverlib.ClientEven
 		redactEv.Content = empty
 		redactEv.Hint = fmt.Sprintf("%s撤回了一条消息", extra.GetDisplayName(s.displayNameRepo, ev.Sender))
 		unsigned.RedactedBecause = ev
+	} else if ev.Type == "m.room.rawredact" {
+		redactEv.Hint = "该消息已被撤回"
+		unsigned.RedactedBecause = ev
 	} else {
 		redactEv.Content = ev.Content
 		unsigned.UpdatedBecause = ev
@@ -546,7 +549,7 @@ func (s *RoomEventFeedConsumer) onNewRoomEvent(
 
 	if common.IsStateClientEv(&ev) == true { //state ev
 		ev, _ = s.processStateEv(&ev)
-	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.update" {
+	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.rawredact" || ev.Type == "m.room.update" {
 		s.processRedactEv(&ev)
 	}
 	log.Debugf("feedserver onNewRoomEvent update unsigned roomID:%s eventID:%s sender:%s type:%s eventoffset:%d", ev.RoomID, ev.EventID, ev.Sender, ev.Type, ev.EventOffset)
@@ -776,7 +779,7 @@ func (s *RoomEventFeedConsumer) onBackFillEvent(
 	if common.IsStateClientEv(&ev) {
 		ev, _ = s.processStateEv(&ev)
 		s.roomStateTimeLine.AddBackfillEv(&ev, ev.EventOffset, true)
-	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.update" {
+	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.rawredact" || ev.Type == "m.room.update" {
 		s.processRedactEv(&ev)
 	}
 	if ev.Type == "m.room.message" || ev.Type == "m.room.encrypted" {

diff --git a/syncwriter/consumers/consumer.go b/syncwriter/consumers/consumer.go
@@ -210,6 +210,9 @@ func (s *RoomEventConsumer) processRedactEv(ev *gomatrixserverlib.ClientEvent) {
 		redactEv.Hint = fmt.Sprintf("%s撤回了一条消息", extra.GetDisplayName(s.displayNameRepo, ev.Sender))
 		log.Infof("syncwrite, edactEv.Hint: %s", redactEv.Hint)
 		unsigned.RedactedBecause = ev
+	} else if ev.Type == "m.room.rawredact" {
+		redactEv.Hint = "该消息已被撤回"
+		unsigned.RedactedBecause = ev
 	} else {
 		redactEv.Content = ev.Content
 		unsigned.UpdatedBecause = ev
@@ -518,7 +521,7 @@ func (s *RoomEventConsumer) onNewRoomEvent(
 
 	if common.IsStateClientEv(&ev) == true { //state ev
 		ev, _ = s.processStateEv(&ev)
-	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.update" {
+	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.rawredact" || ev.Type == "m.room.update" {
 		s.processRedactEv(&ev)
 	}
 
@@ -598,7 +601,7 @@ func (s *RoomEventConsumer) onBackFillEvent(
 
 	if common.IsStateClientEv(&ev) == true { //state ev
 		ev, _ = s.processStateEv(&ev)
-	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.update" {
+	} else if ev.Type == "m.room.redaction" || ev.Type == "m.room.rawredact" || ev.Type == "m.room.update" {
 		s.processRedactEv(&ev)
 	}