mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 06:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68 from globekeeper/daniel/secs2ms-multiroom

Browse source 
♻️ Milliseconds instead of seconds for MR.
This commit is contained in:
Daniel Aloni 2023-04-11 15:21:48 +03:00 committed by GitHub
parent beeb0ca8f5 cf12410d39
commit 958ab5606a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/dendrite.yml vendored
View file

@ -377,7 +377,7 @@ jobs:
# See https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md specifically GOROOT_1_17_X64 # See https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md specifically GOROOT_1_17_X64
run: | run: |
sudo apt-get update && sudo apt-get install -y libolm3 libolm-dev sudo apt-get update && sudo apt-get install -y libolm3 libolm-dev
go get -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
- name: Run actions/checkout@v3 for dendrite - name: Run actions/checkout@v3 for dendrite
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:

2
syncapi/consumers/multiroomdata.go
View file

@ -95,7 +95,7 @@ func (s *OutputMultiRoomDataConsumer) onMessage(ctx context.Context, msgs []*nat
rooms, err := s.db.SelectMultiRoomVisibilityRooms(ctx, mrd.SelectMultiRoomVisibilityRoomsParams{ rooms, err := s.db.SelectMultiRoomVisibilityRooms(ctx, mrd.SelectMultiRoomVisibilityRoomsParams{
UserID: userID, UserID: userID,
ExpireTs: time.Now().Unix(), ExpireTs: time.Now().UnixMilli(),
}) })
if err != nil { if err != nil {
sentry.CaptureException(err) sentry.CaptureException(err)

2
syncapi/storage/mrd/types.go
View file

@ -2,5 +2,5 @@ package mrd
type StateEvent struct { type StateEvent struct {
Hidden bool `json:"hidden"` Hidden bool `json:"hidden"`
ExpireTs int `json:"expire_ts"` ExpireTs int64 `json:"expire_ts"`
} }

2
syncapi/storage/postgres/multiroomcast_table.go
View file

@ -51,7 +51,7 @@ func (s *multiRoomStatements) SelectMultiRoomData(ctx context.Context, r *types.
for rows.Next() { for rows.Next() {
r := types.MultiRoomDataRow{} r := types.MultiRoomDataRow{}
err = rows.Scan(&r.UserId, &r.Type, &r.Data, &t) err = rows.Scan(&r.UserId, &r.Type, &r.Data, &t)
r.Timestamp = t.Unix() r.Timestamp = t.UnixMilli()
if err != nil { if err != nil {
return nil, fmt.Errorf("rows scan: %w", err) return nil, fmt.Errorf("rows scan: %w", err)
} }

2
syncapi/storage/shared/storage_consumer.go
View file

@ -655,7 +655,7 @@ func (d *Database) UpdateMultiRoomVisibility(ctx context.Context, event *gomatri
UserID: event.Sender(), UserID: event.Sender(),
Type: event.Type(), Type: event.Type(),
RoomID: event.RoomID(), RoomID: event.RoomID(),
ExpireTs: int64(mrdEv.ExpireTs), ExpireTs: mrdEv.ExpireTs,
}) })
if err != nil { if err != nil {
return fmt.Errorf("insert multiroom visibility failed: %w", err) return fmt.Errorf("insert multiroom visibility failed: %w", err)

2
syncapi/syncapi.go
View file

@ -56,7 +56,7 @@ func AddPublicRoutes(
go func() { go func() {
var affected int64 var affected int64
for { for {
affected, err = mrq.DeleteMultiRoomVisibilityByExpireTS(context.Background(), time.Now().Unix()) affected, err = mrq.DeleteMultiRoomVisibilityByExpireTS(context.Background(), time.Now().UnixMilli())
if err != nil { if err != nil {
logrus.WithError(err).Error("failed to expire multiroom visibility") logrus.WithError(err).Error("failed to expire multiroom visibility")
} }

4
syncapi/types/multiroom_test.go
View file

@ -14,8 +14,8 @@ func TestMarshallMultiRoom(t *testing.T) {
"@3:example.com": map[string]MultiRoomData{ "@3:example.com": map[string]MultiRoomData{
"location": { "location": {
Content: MultiRoomContent(`{"foo":"bar"}`), Content: MultiRoomContent(`{"foo":"bar"}`),
OriginServerTs: 123, OriginServerTs: 1234567890000,
}}}) }}})
is.NoErr(err) is.NoErr(err)
is.Equal(m, []byte(`{"@3:example.com":{"location":{"content":{"foo":"bar"},"origin_server_ts":123}}}`)) is.Equal(m, []byte(`{"@3:example.com":{"location":{"content":{"foo":"bar"},"origin_server_ts":1234567890000}}}`))
} }