diff --git a/src/d2m/converters/message-to-event.js b/src/d2m/converters/message-to-event.js
index 1d6288a..f494123 100644
--- a/src/d2m/converters/message-to-event.js
+++ b/src/d2m/converters/message-to-event.js
@@ -611,7 +611,7 @@ async function messageToEvent(message, guild, options = {}, di) {
const event = invite.guild_scheduled_event
if (!event) continue // the event ID provided was not valid
- const formatter = new Intl.DateTimeFormat("en-NZ", {month: "long", day: "numeric", hour: "numeric", minute: "2-digit", timeZoneName: "shortGeneric"}) // 9 June at 3:00 pm NZT
+ const formatter = new Intl.DateTimeFormat("en-NZ", {month: "long", day: "numeric", hour: "numeric", minute: "2-digit", timeZoneName: "shortGeneric", timeZone: reg.ooye.time_zone}) // 9 June at 3:00 pm NZT
const rep = new mxUtils.MatrixStringBuilder()
// Add time
diff --git a/src/d2m/converters/thread-to-announcement.js b/src/d2m/converters/thread-to-announcement.js
index 11a067f..98b8f12 100644
--- a/src/d2m/converters/thread-to-announcement.js
+++ b/src/d2m/converters/thread-to-announcement.js
@@ -32,13 +32,10 @@ async function threadToAnnouncement(parentRoomID, threadRoomID, creatorMxid, thr
const template = creatorMxid ? "started a thread:" : "Thread started:"
const via = await mxUtils.getViaServersQuery(threadRoomID, di.api)
let body = `${template} ${thread.name} https://matrix.to/#/${threadRoomID}?${via.toString()}`
- let html = `${template} ${thread.name}`
return {
msgtype,
body,
- format: "org.matrix.custom.html",
- formatted_body: html,
"m.mentions": {},
...context
}
diff --git a/src/d2m/converters/thread-to-announcement.test.js b/src/d2m/converters/thread-to-announcement.test.js
index 471cd94..3d5d1eb 100644
--- a/src/d2m/converters/thread-to-announcement.test.js
+++ b/src/d2m/converters/thread-to-announcement.test.js
@@ -55,8 +55,6 @@ test("thread2announcement: no known creator, no branched from event", async t =>
t.deepEqual(content, {
msgtype: "m.text",
body: "Thread started: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
- format: "org.matrix.custom.html",
- formatted_body: `Thread started: test thread`,
"m.mentions": {}
})
})
@@ -69,8 +67,6 @@ test("thread2announcement: known creator, no branched from event", async t => {
t.deepEqual(content, {
msgtype: "m.emote",
body: "started a thread: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
- format: "org.matrix.custom.html",
- formatted_body: `started a thread: test thread`,
"m.mentions": {}
})
})
@@ -95,8 +91,6 @@ test("thread2announcement: no known creator, branched from discord event", async
t.deepEqual(content, {
msgtype: "m.text",
body: "Thread started: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
- format: "org.matrix.custom.html",
- formatted_body: `Thread started: test thread`,
"m.mentions": {},
"m.relates_to": {
"m.in_reply_to": {
@@ -126,8 +120,6 @@ test("thread2announcement: known creator, branched from discord event", async t
t.deepEqual(content, {
msgtype: "m.emote",
body: "started a thread: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
- format: "org.matrix.custom.html",
- formatted_body: `started a thread: test thread`,
"m.mentions": {},
"m.relates_to": {
"m.in_reply_to": {
@@ -157,8 +149,6 @@ test("thread2announcement: no known creator, branched from matrix event", async
t.deepEqual(content, {
msgtype: "m.text",
body: "Thread started: test thread https://matrix.to/#/!thread?via=cadence.moe&via=matrix.org",
- format: "org.matrix.custom.html",
- formatted_body: `Thread started: test thread`,
"m.mentions": {
user_ids: ["@cadence:cadence.moe"]
},
diff --git a/src/types.d.ts b/src/types.d.ts
index 37da633..27dfddf 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -31,6 +31,7 @@ export type AppServiceRegistrationConfig = {
discord_origin?: string
discord_cdn_origin?: string,
web_password: string
+ time_zone?: string
}
old_bridge?: {
as_token: string
diff --git a/test/test.js b/test/test.js
index 3695a84..233fd94 100644
--- a/test/test.js
+++ b/test/test.js
@@ -25,6 +25,7 @@ reg.namespaces = {
aliases: [{regex: "#_ooye_.*:cadence.moe", exclusive: true}]
}
reg.ooye.bridge_origin = "https://bridge.example.org"
+reg.ooye.time_zone = "Pacific/Auckland"
const sync = new HeatSync({watchFS: false})