diff --git a/cmd/resolve-state/main.go b/cmd/resolve-state/main.go index 49dfa5f7f..6ed6ebdb8 100644 --- a/cmd/resolve-state/main.go +++ b/cmd/resolve-state/main.go @@ -28,7 +28,6 @@ import ( var roomVersion = flag.String("roomversion", "5", "the room version to parse events as") var filterType = flag.String("filtertype", "", "the event types to filter on") -var difference = flag.Bool("difference", false, "whether to calculate the difference between snapshots") func main() { ctx := context.Background() @@ -65,58 +64,6 @@ func main() { RoomVersion: gomatrixserverlib.RoomVersion(*roomVersion), }) - if *difference { - if len(snapshotNIDs) != 2 { - panic("need exactly two state snapshot NIDs to calculate difference") - } - - removed, added, err := stateres.DifferenceBetweeenStateSnapshots(ctx, snapshotNIDs[0], snapshotNIDs[1]) - if err != nil { - panic(err) - } - - var eventNIDs []types.EventNID - for _, entry := range append(removed, added...) { - eventNIDs = append(eventNIDs, entry.EventNID) - } - - eventEntries, err := roomserverDB.Events(ctx, eventNIDs) - if err != nil { - panic(err) - } - - events := make(map[types.EventNID]*gomatrixserverlib.Event, len(eventEntries)) - for _, entry := range eventEntries { - events[entry.EventNID] = entry.Event - } - - if len(removed) > 0 { - fmt.Println("Removed:") - for _, r := range removed { - event := events[r.EventNID] - fmt.Println() - fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey()) - fmt.Printf(" %s\n", string(event.Content())) - } - } - - if len(removed) > 0 && len(added) > 0 { - fmt.Println() - } - - if len(added) > 0 { - fmt.Println("Added:") - for _, a := range added { - event := events[a.EventNID] - fmt.Println() - fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey()) - fmt.Printf(" %s\n", string(event.Content())) - } - } - - return - } - var stateEntries []types.StateEntry for _, snapshotNID := range snapshotNIDs { var entries []types.StateEntry