Persist chat mentions

2023-10-18 16:56:03 -07:00
parent 821419ee5b
commit d05404a4df
22 changed files with 402 additions and 112 deletions
@@ -17,7 +17,6 @@ async fn test_channel_buffers(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user_a".into(),
                github_user_id: 101,
-                invite_count: 0,
            },
        )
        .await
@@ -30,7 +29,6 @@ async fn test_channel_buffers(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user_b".into(),
                github_user_id: 102,
-                invite_count: 0,
            },
        )
        .await
@@ -45,7 +43,6 @@ async fn test_channel_buffers(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user_c".into(),
                github_user_id: 102,
-                invite_count: 0,
            },
        )
        .await
@@ -178,7 +175,6 @@ async fn test_channel_buffers_last_operations(db: &Database) {
            NewUserParams {
                github_login: "user_a".into(),
                github_user_id: 101,
-                invite_count: 0,
            },
        )
        .await
@@ -191,7 +187,6 @@ async fn test_channel_buffers_last_operations(db: &Database) {
            NewUserParams {
                github_login: "user_b".into(),
                github_user_id: 102,
-                invite_count: 0,
            },
        )
        .await
@@ -24,7 +24,6 @@ async fn test_channels(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user1".into(),
                github_user_id: 5,
-                invite_count: 0,
            },
        )
        .await
@@ -38,7 +37,6 @@ async fn test_channels(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user2".into(),
                github_user_id: 6,
-                invite_count: 0,
            },
        )
        .await
@@ -179,7 +177,6 @@ async fn test_joining_channels(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user1".into(),
                github_user_id: 5,
-                invite_count: 0,
            },
        )
        .await
@@ -192,7 +189,6 @@ async fn test_joining_channels(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user2".into(),
                github_user_id: 6,
-                invite_count: 0,
            },
        )
        .await
@@ -246,7 +242,6 @@ async fn test_channel_invites(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user1".into(),
                github_user_id: 5,
-                invite_count: 0,
            },
        )
        .await
@@ -259,7 +254,6 @@ async fn test_channel_invites(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user2".into(),
                github_user_id: 6,
-                invite_count: 0,
            },
        )
        .await
@@ -273,7 +267,6 @@ async fn test_channel_invites(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user3".into(),
                github_user_id: 7,
-                invite_count: 0,
            },
        )
        .await
@@ -385,7 +378,6 @@ async fn test_channel_renames(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user1".into(),
                github_user_id: 5,
-                invite_count: 0,
            },
        )
        .await
@@ -399,7 +391,6 @@ async fn test_channel_renames(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user2".into(),
                github_user_id: 6,
-                invite_count: 0,
            },
        )
        .await
@@ -444,7 +435,6 @@ async fn test_db_channel_moving(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user1".into(),
                github_user_id: 5,
-                invite_count: 0,
            },
        )
        .await
@@ -802,7 +792,6 @@ async fn test_db_channel_moving_bugs(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user1".into(),
                github_user_id: 5,
-                invite_count: 0,
            },
        )
        .await
@@ -22,7 +22,6 @@ async fn test_get_users(db: &Arc<Database>) {
                NewUserParams {
                    github_login: format!("user{i}"),
                    github_user_id: i,
-                    invite_count: 0,
                },
            )
            .await
@@ -88,7 +87,6 @@ async fn test_get_or_create_user_by_github_account(db: &Arc<Database>) {
            NewUserParams {
                github_login: "login1".into(),
                github_user_id: 101,
-                invite_count: 0,
            },
        )
        .await
@@ -101,7 +99,6 @@ async fn test_get_or_create_user_by_github_account(db: &Arc<Database>) {
            NewUserParams {
                github_login: "login2".into(),
                github_user_id: 102,
-                invite_count: 0,
            },
        )
        .await
@@ -156,7 +153,6 @@ async fn test_create_access_tokens(db: &Arc<Database>) {
            NewUserParams {
                github_login: "u1".into(),
                github_user_id: 1,
-                invite_count: 0,
            },
        )
        .await
@@ -238,7 +234,6 @@ async fn test_add_contacts(db: &Arc<Database>) {
                NewUserParams {
                    github_login: format!("user{i}"),
                    github_user_id: i,
-                    invite_count: 0,
                },
            )
            .await
@@ -400,7 +395,6 @@ async fn test_metrics_id(db: &Arc<Database>) {
            NewUserParams {
                github_login: "person1".into(),
                github_user_id: 101,
-                invite_count: 5,
            },
        )
        .await
@@ -416,7 +410,6 @@ async fn test_metrics_id(db: &Arc<Database>) {
            NewUserParams {
                github_login: "person2".into(),
                github_user_id: 102,
-                invite_count: 5,
            },
        )
        .await
@@ -445,7 +438,6 @@ async fn test_project_count(db: &Arc<Database>) {
            NewUserParams {
                github_login: "admin".into(),
                github_user_id: 0,
-                invite_count: 0,
            },
        )
        .await
@@ -457,7 +449,6 @@ async fn test_project_count(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user".into(),
                github_user_id: 1,
-                invite_count: 0,
            },
        )
        .await
@@ -539,7 +530,6 @@ async fn test_fuzzy_search_users() {
            NewUserParams {
                github_login: github_login.into(),
                github_user_id: i as i32,
-                invite_count: 0,
            },
        )
        .await
@@ -581,7 +571,6 @@ async fn test_non_matching_release_channels(db: &Arc<Database>) {
            NewUserParams {
                github_login: "admin".into(),
                github_user_id: 0,
-                invite_count: 0,
            },
        )
        .await
@@ -593,7 +582,6 @@ async fn test_non_matching_release_channels(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user".into(),
                github_user_id: 1,
-                invite_count: 0,
            },
        )
        .await
@@ -18,7 +18,6 @@ async fn test_get_user_flags(db: &Arc<Database>) {
            NewUserParams {
                github_login: format!("user1"),
                github_user_id: 1,
-                invite_count: 0,
            },
        )
        .await
@@ -32,7 +31,6 @@ async fn test_get_user_flags(db: &Arc<Database>) {
            NewUserParams {
                github_login: format!("user2"),
                github_user_id: 2,
-                invite_count: 0,
            },
        )
        .await
@@ -2,6 +2,7 @@ use crate::{
    db::{Database, MessageId, NewUserParams},
    test_both_dbs,
 };
+use channel::mentions_to_proto;
 use std::sync::Arc;
 use time::OffsetDateTime;

@@ -19,7 +20,6 @@ async fn test_channel_message_retrieval(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user".into(),
                github_user_id: 1,
-                invite_count: 0,
            },
        )
        .await
@@ -35,11 +35,18 @@ async fn test_channel_message_retrieval(db: &Arc<Database>) {
    let mut all_messages = Vec::new();
    for i in 0..10 {
        all_messages.push(
-            db.create_channel_message(channel, user, &i.to_string(), OffsetDateTime::now_utc(), i)
-                .await
-                .unwrap()
-                .0
-                .to_proto(),
+            db.create_channel_message(
+                channel,
+                user,
+                &i.to_string(),
+                &[],
+                OffsetDateTime::now_utc(),
+                i,
+            )
+            .await
+            .unwrap()
+            .0
+            .to_proto(),
        );
    }

@@ -81,7 +88,6 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user".into(),
                github_user_id: 1,
-                invite_count: 0,
            },
        )
        .await
@@ -96,19 +102,19 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
        .unwrap();

    let msg1_id = db
-        .create_channel_message(channel, user, "1", OffsetDateTime::now_utc(), 1)
+        .create_channel_message(channel, user, "1", &[], OffsetDateTime::now_utc(), 1)
        .await
        .unwrap();
    let msg2_id = db
-        .create_channel_message(channel, user, "2", OffsetDateTime::now_utc(), 2)
+        .create_channel_message(channel, user, "2", &[], OffsetDateTime::now_utc(), 2)
        .await
        .unwrap();
    let msg3_id = db
-        .create_channel_message(channel, user, "3", OffsetDateTime::now_utc(), 1)
+        .create_channel_message(channel, user, "3", &[], OffsetDateTime::now_utc(), 1)
        .await
        .unwrap();
    let msg4_id = db
-        .create_channel_message(channel, user, "4", OffsetDateTime::now_utc(), 2)
+        .create_channel_message(channel, user, "4", &[], OffsetDateTime::now_utc(), 2)
        .await
        .unwrap();

@@ -118,12 +124,12 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
 }

 test_both_dbs!(
-    test_channel_message_new_notification,
-    test_channel_message_new_notification_postgres,
-    test_channel_message_new_notification_sqlite
+    test_unseen_channel_messages,
+    test_unseen_channel_messages_postgres,
+    test_unseen_channel_messages_sqlite
 );

-async fn test_channel_message_new_notification(db: &Arc<Database>) {
+async fn test_unseen_channel_messages(db: &Arc<Database>) {
    let user = db
        .create_user(
            "user_a@example.com",
@@ -131,7 +137,6 @@ async fn test_channel_message_new_notification(db: &Arc<Database>) {
            NewUserParams {
                github_login: "user_a".into(),
                github_user_id: 1,
-                invite_count: 0,
            },
        )
        .await
@@ -143,8 +148,7 @@ async fn test_channel_message_new_notification(db: &Arc<Database>) {
            false,
            NewUserParams {
                github_login: "user_b".into(),
-                github_user_id: 1,
-                invite_count: 0,
+                github_user_id: 2,
            },
        )
        .await
@@ -152,21 +156,17 @@ async fn test_channel_message_new_notification(db: &Arc<Database>) {
        .user_id;

    let channel_1 = db.create_channel("channel", None, user).await.unwrap();
-
    let channel_2 = db.create_channel("channel-2", None, user).await.unwrap();

    db.invite_channel_member(channel_1, observer, user, false)
        .await
        .unwrap();
-
-    db.respond_to_channel_invite(channel_1, observer, true)
-        .await
-        .unwrap();
-
    db.invite_channel_member(channel_2, observer, user, false)
        .await
        .unwrap();
-
+    db.respond_to_channel_invite(channel_1, observer, true)
+        .await
+        .unwrap();
    db.respond_to_channel_invite(channel_2, observer, true)
        .await
        .unwrap();
@@ -179,17 +179,17 @@ async fn test_channel_message_new_notification(db: &Arc<Database>) {
        .unwrap();

    let _ = db
-        .create_channel_message(channel_1, user, "1_1", OffsetDateTime::now_utc(), 1)
+        .create_channel_message(channel_1, user, "1_1", &[], OffsetDateTime::now_utc(), 1)
        .await
        .unwrap();

    let (second_message, _, _) = db
-        .create_channel_message(channel_1, user, "1_2", OffsetDateTime::now_utc(), 2)
+        .create_channel_message(channel_1, user, "1_2", &[], OffsetDateTime::now_utc(), 2)
        .await
        .unwrap();

    let (third_message, _, _) = db
-        .create_channel_message(channel_1, user, "1_3", OffsetDateTime::now_utc(), 3)
+        .create_channel_message(channel_1, user, "1_3", &[], OffsetDateTime::now_utc(), 3)
        .await
        .unwrap();

@@ -198,7 +198,7 @@ async fn test_channel_message_new_notification(db: &Arc<Database>) {
        .unwrap();

    let (fourth_message, _, _) = db
-        .create_channel_message(channel_2, user, "2_1", OffsetDateTime::now_utc(), 4)
+        .create_channel_message(channel_2, user, "2_1", &[], OffsetDateTime::now_utc(), 4)
        .await
        .unwrap();

@@ -295,3 +295,129 @@ async fn test_channel_message_new_notification(db: &Arc<Database>) {
        }]
    );
 }
+
+test_both_dbs!(
+    test_channel_message_mentions,
+    test_channel_message_mentions_postgres,
+    test_channel_message_mentions_sqlite
+);
+
+async fn test_channel_message_mentions(db: &Arc<Database>) {
+    let user_a = db
+        .create_user(
+            "user_a@example.com",
+            false,
+            NewUserParams {
+                github_login: "user_a".into(),
+                github_user_id: 1,
+            },
+        )
+        .await
+        .unwrap()
+        .user_id;
+    let user_b = db
+        .create_user(
+            "user_b@example.com",
+            false,
+            NewUserParams {
+                github_login: "user_b".into(),
+                github_user_id: 2,
+            },
+        )
+        .await
+        .unwrap()
+        .user_id;
+    let user_c = db
+        .create_user(
+            "user_b@example.com",
+            false,
+            NewUserParams {
+                github_login: "user_c".into(),
+                github_user_id: 3,
+            },
+        )
+        .await
+        .unwrap()
+        .user_id;
+
+    let channel = db.create_channel("channel", None, user_a).await.unwrap();
+    db.invite_channel_member(channel, user_b, user_a, false)
+        .await
+        .unwrap();
+    db.respond_to_channel_invite(channel, user_b, true)
+        .await
+        .unwrap();
+
+    let owner_id = db.create_server("test").await.unwrap().0 as u32;
+    let connection_id = rpc::ConnectionId { owner_id, id: 0 };
+    db.join_channel_chat(channel, connection_id, user_a)
+        .await
+        .unwrap();
+
+    db.create_channel_message(
+        channel,
+        user_a,
+        "hi @user_b and @user_c",
+        &mentions_to_proto(&[(3..10, user_b.to_proto()), (15..22, user_c.to_proto())]),
+        OffsetDateTime::now_utc(),
+        1,
+    )
+    .await
+    .unwrap();
+    db.create_channel_message(
+        channel,
+        user_a,
+        "bye @user_c",
+        &mentions_to_proto(&[(4..11, user_c.to_proto())]),
+        OffsetDateTime::now_utc(),
+        2,
+    )
+    .await
+    .unwrap();
+    db.create_channel_message(
+        channel,
+        user_a,
+        "umm",
+        &mentions_to_proto(&[]),
+        OffsetDateTime::now_utc(),
+        3,
+    )
+    .await
+    .unwrap();
+    db.create_channel_message(
+        channel,
+        user_a,
+        "@user_b, stop.",
+        &mentions_to_proto(&[(0..7, user_b.to_proto())]),
+        OffsetDateTime::now_utc(),
+        4,
+    )
+    .await
+    .unwrap();
+
+    let messages = db
+        .get_channel_messages(channel, user_b, 5, None)
+        .await
+        .unwrap()
+        .into_iter()
+        .map(|m| (m.body, m.mentions))
+        .collect::<Vec<_>>();
+    assert_eq!(
+        &messages,
+        &[
+            (
+                "hi @user_b and @user_c".into(),
+                mentions_to_proto(&[(3..10, user_b.to_proto()), (15..22, user_c.to_proto())]),
+            ),
+            (
+                "bye @user_c".into(),
+                mentions_to_proto(&[(4..11, user_c.to_proto())]),
+            ),
+            ("umm".into(), mentions_to_proto(&[]),),
+            (
+                "@user_b, stop.".into(),
+                mentions_to_proto(&[(0..7, user_b.to_proto())]),
+            ),
+        ]
+    );
+}