Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
2cc72de8
Commit
2cc72de8
authored
11 months ago
by
Jason Volk
Committed by
🥺
11 months ago
Browse files
Options
Downloads
Patches
Plain Diff
fix lossy origin regression
12a8c9ba
Signed-off-by:
Jason Volk
<
jason@zemos.net
>
parent
458e5681
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/api/client_server/sync.rs
+1
-0
1 addition, 0 deletions
src/api/client_server/sync.rs
src/service/pdu.rs
+2
-0
2 additions, 0 deletions
src/service/pdu.rs
src/service/rooms/timeline/mod.rs
+1
-0
1 addition, 0 deletions
src/service/rooms/timeline/mod.rs
with
4 additions
and
0 deletions
src/api/client_server/sync.rs
+
1
−
0
View file @
2cc72de8
...
@@ -304,6 +304,7 @@ async fn sync_helper(
...
@@ -304,6 +304,7 @@ async fn sync_helper(
let
event
=
PduEvent
{
let
event
=
PduEvent
{
event_id
:
EventId
::
new
(
services
()
.globals
.server_name
())
.into
(),
event_id
:
EventId
::
new
(
services
()
.globals
.server_name
())
.into
(),
sender
:
sender_user
.clone
(),
sender
:
sender_user
.clone
(),
origin
:
None
,
origin_server_ts
:
utils
::
millis_since_unix_epoch
()
origin_server_ts
:
utils
::
millis_since_unix_epoch
()
.try_into
()
.try_into
()
.expect
(
"Timestamp is valid js_int value"
),
.expect
(
"Timestamp is valid js_int value"
),
...
...
This diff is collapsed.
Click to expand it.
src/service/pdu.rs
+
2
−
0
View file @
2cc72de8
...
@@ -32,6 +32,8 @@ pub struct PduEvent {
...
@@ -32,6 +32,8 @@ pub struct PduEvent {
pub
event_id
:
Arc
<
EventId
>
,
pub
event_id
:
Arc
<
EventId
>
,
pub
room_id
:
OwnedRoomId
,
pub
room_id
:
OwnedRoomId
,
pub
sender
:
OwnedUserId
,
pub
sender
:
OwnedUserId
,
#[serde(skip_serializing_if
=
"Option::is_none"
)]
pub
origin
:
Option
<
String
>
,
pub
origin_server_ts
:
UInt
,
pub
origin_server_ts
:
UInt
,
#[serde(rename
=
"type"
)]
#[serde(rename
=
"type"
)]
pub
kind
:
TimelineEventType
,
pub
kind
:
TimelineEventType
,
...
...
This diff is collapsed.
Click to expand it.
src/service/rooms/timeline/mod.rs
+
1
−
0
View file @
2cc72de8
...
@@ -719,6 +719,7 @@ struct RoomCreate {
...
@@ -719,6 +719,7 @@ struct RoomCreate {
event_id
:
ruma
::
event_id!
(
"$thiswillbefilledinlater"
)
.into
(),
event_id
:
ruma
::
event_id!
(
"$thiswillbefilledinlater"
)
.into
(),
room_id
:
room_id
.to_owned
(),
room_id
:
room_id
.to_owned
(),
sender
:
sender
.to_owned
(),
sender
:
sender
.to_owned
(),
origin
:
None
,
origin_server_ts
:
utils
::
millis_since_unix_epoch
()
origin_server_ts
:
utils
::
millis_since_unix_epoch
()
.try_into
()
.try_into
()
.expect
(
"time is valid"
),
.expect
(
"time is valid"
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment