Skip to content

Commit 5c99375

Browse files
authored
Merge pull request #1534 from AppFlowy-IO/email-todo
feat: add block id to page mention notification email url link
2 parents 9a230ef + 4318c1d commit 5c99375

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

src/application.rs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -315,22 +315,24 @@ pub async fn init_state(config: &Config) -> Result<AppState, Error> {
315315
));
316316

317317
let mailer = get_mailer(&config.mailer).await?;
318-
info!("Setting up background notification worker...");
319-
let email_notification_interval = config.notification.email_notification_interval_secs;
320-
let email_notification_grace_period = config.notification.email_notification_grace_period_secs;
321-
let task_appflowy_web_url = config.appflowy_web_url.clone();
322-
let task_mailer = mailer.clone();
323-
let task_pg_pool = pg_pool.clone();
324-
tokio::spawn(async move {
325-
let email_notification_worker = EmailNotificationWorker::new(
326-
task_pg_pool,
327-
task_mailer,
328-
email_notification_interval,
329-
email_notification_grace_period,
330-
&task_appflowy_web_url,
331-
);
332-
email_notification_worker.start_task().await;
333-
});
318+
if config.notification.enable_email_notification {
319+
info!("Setting up background notification worker...");
320+
let email_notification_interval = config.notification.email_notification_interval_secs;
321+
let email_notification_grace_period = config.notification.email_notification_grace_period_secs;
322+
let task_appflowy_web_url = config.appflowy_web_url.clone();
323+
let task_mailer = mailer.clone();
324+
let task_pg_pool = pg_pool.clone();
325+
tokio::spawn(async move {
326+
let email_notification_worker = EmailNotificationWorker::new(
327+
task_pg_pool,
328+
task_mailer,
329+
email_notification_interval,
330+
email_notification_grace_period,
331+
&task_appflowy_web_url,
332+
);
333+
email_notification_worker.start_task().await;
334+
});
335+
}
334336

335337
info!("Setting up Indexer scheduler...");
336338
let (open_ai_config, azure_ai_config) = get_open_ai_config();

src/biz/notification/email.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ impl EmailNotificationWorker {
6565
.collect();
6666

6767
for mention in page_mentions {
68+
let mut page_url = format!(
69+
"{}/app/{}/{}",
70+
self.appflowy_web_url, mention.workspace_id, mention.view_id
71+
);
72+
if let Some(block_id) = mention.block_id {
73+
page_url.push_str(&format!("?blockId={}", block_id));
74+
}
75+
6876
let param = PageMentionNotificationMailerParam {
6977
workspace_name: mention.workspace_name,
7078
mentioned_page_name: mention.view_name,

0 commit comments

Comments
 (0)