Skip to content

A platform for community discussion. Free, open, simple.

DEV: Correctly handle user timezone from backend (#38801)

Jarek Radosza3f24f361834
diff --git a/frontend/discourse/app/models/user.js b/frontend/discourse/app/models/user.js
index 772e8cdf2de..3a3b50ea8ec 100644
--- a/frontend/discourse/app/models/user.js
+++ b/frontend/discourse/app/models/user.js
@@ -894,7 +894,16 @@ export default class User extends RestModel.extend(Evented) {
json.user.card_badge = Badge.create(json.user.card_badge);
}
+ const timezone = json.user.timezone;
+ delete json.user.timezone;
+
user.setProperties(json.user);
+
+ if (timezone) {
+ user.user_option ||= {};
+ user.user_option.timezone = timezone;
+ }
+
return user;
});
}
diff --git a/frontend/discourse/tests/unit/models/user-test.js b/frontend/discourse/tests/unit/models/user-test.js
index 5aef831761f..57ade174159 100644
--- a/frontend/discourse/tests/unit/models/user-test.js
+++ b/frontend/discourse/tests/unit/models/user-test.js
@@ -109,6 +109,21 @@ module("Unit | Model | user", function (hooks) {
assert.false(spyMomentGuess.called);
});
+ test("findByUsername() maps backend timezone to user_option.timezone", async function (assert) {
+ const timezone = "Europe/Warsaw";
+ PreloadStore.store("user_eviltrout", {
+ user: {
+ id: 1,
+ username: "eviltrout",
+ timezone,
+ },
+ });
+
+ const user = await User.findByUsername("eviltrout");
+
+ assert.strictEqual(user.user_option.timezone, timezone);
+ });
+
test("subsequent calls to trackStatus and stopTrackingStatus increase and decrease subscribers counter", function (assert) {
const store = getOwner(this).lookup("service:store");
const user = store.createRecord("user");