#561 Improve notification management

use mentions::Mention;
use notifications::*;
use plume_common::activity_pub::{
    inbox::{AsObject, FromId},
    inbox::{AsActor, AsObject, FromId},
    Id, IntoId, PUBLIC_VISIBILITY,
};
use plume_common::utils;

@@ -157,14 +157,20 @@


    pub fn notify(&self, conn: &Connection) -> Result<()> {
        for author in self.get_post(conn)?.get_authors(conn)? {
            Notification::insert(
                conn,
                NewNotification {
                    kind: notification_kind::COMMENT.to_string(),
                    object_id: self.id,
                    user_id: author.id,
                },
            )?;
            if Mention::list_for_comment(conn, self.id)?
                .iter()
                .all(|m| m.get_mentioned(conn).map(|u| u != author).unwrap_or(true))
                && author.is_local()
            {
                Notification::insert(
                    conn,
                    NewNotification {
                        kind: notification_kind::COMMENT.to_string(),
                        object_id: self.id,
                        user_id: author.id,
                    },
                )?;
            }
        }
        Ok(())
    }

@@ -4,7 +4,7 @@


use notifications::*;
use plume_common::activity_pub::{
    inbox::{AsObject, FromId},
    inbox::{AsActor, AsObject, FromId},
    Id, IntoId, PUBLIC_VISIBILITY,
};
use posts::Post;

@@ -79,14 +79,16 @@

    pub fn notify(&self, conn: &Connection) -> Result<()> {
        let post = self.get_post(conn)?;
        for author in post.get_authors(conn)? {
            Notification::insert(
                conn,
                NewNotification {
                    kind: notification_kind::RESHARE.to_string(),
                    object_id: self.id,
                    user_id: author.id,
                },
            )?;
            if author.is_local() {
                Notification::insert(
                    conn,
                    NewNotification {
                        kind: notification_kind::RESHARE.to_string(),
                        object_id: self.id,
                        user_id: author.id,
                    },
                )?;
            }
        }
        Ok(())
    }

@@ -3,6 +3,7 @@


use comments::Comment;
use notifications::*;
use plume_common::activity_pub::inbox::AsActor;
use posts::Post;
use schema::mentions;
use users::User;

@@ -129,14 +130,18 @@


    fn notify(&self, conn: &Connection) -> Result<()> {
        let m = self.get_mentioned(conn)?;
        Notification::insert(
            conn,
            NewNotification {
                kind: notification_kind::MENTION.to_string(),
                object_id: self.id,
                user_id: m.id,
            },
        )
        .map(|_| ())
        if m.is_local() {
            Notification::insert(
                conn,
                NewNotification {
                    kind: notification_kind::MENTION.to_string(),
                    object_id: self.id,
                    user_id: m.id,
                },
            )
            .map(|_| ())
        } else {
            Ok(())
        }
    }
}

@@ -67,15 +67,18 @@

        Ok(act)
    }

    pub fn notify(&self, conn: &Connection) -> Result<Notification> {
        Notification::insert(
            conn,
            NewNotification {
                kind: notification_kind::FOLLOW.to_string(),
                object_id: self.id,
                user_id: self.following_id,
            },
        )
    pub fn notify(&self, conn: &Connection) -> Result<()> {
        if User::get(conn, self.following_id)?.is_local() {
            Notification::insert(
                conn,
                NewNotification {
                    kind: notification_kind::FOLLOW.to_string(),
                    object_id: self.id,
                    user_id: self.following_id,
                },
            )?;
        }
        Ok(())
    }

    /// from -> The one sending the follow request

@@ -4,7 +4,7 @@


use notifications::*;
use plume_common::activity_pub::{
    inbox::{AsObject, FromId},
    inbox::{AsActor, AsObject, FromId},
    Id, IntoId, PUBLIC_VISIBILITY,
};
use posts::Post;

@@ -54,14 +54,16 @@

    pub fn notify(&self, conn: &Connection) -> Result<()> {
        let post = Post::get(conn, self.post_id)?;
        for author in post.get_authors(conn)? {
            Notification::insert(
                conn,
                NewNotification {
                    kind: notification_kind::LIKE.to_string(),
                    object_id: self.id,
                    user_id: author.id,
                },
            )?;
            if author.is_local() {
                Notification::insert(
                    conn,
                    NewNotification {
                        kind: notification_kind::LIKE.to_string(),
                        object_id: self.id,
                        user_id: author.id,
                    },
                )?;
            }
        }
        Ok(())
    }

Click to load this diff.

Loading diff...

Learn more Showing 1 files with coverage changes found.

Changes in plume-models/src/lib.rs

-1

→

Loading file...

35.05% 0.00% +0.34%

don't forget to add some important file

trinity-1686a

45d2d04

CI Passed

Hiding 3 contexual commits

Pull Request Base Commit

35.05% 100.00% -6.91%

rewrite circleci config (#558)

trinity-1686a

918bda1

CI Passed

Files		•	•	•	Coverage
plume-api/src	ø	ø	ø	ø	0.00%
plume-cli/src	ø	ø	ø	ø	52.40%
plume-common/src	ø	ø	ø	ø	54.14%
plume-models/src	+9	+3	+5	+1	^-0.04% 48.00%
src	ø	ø	ø	ø	4.09%
plume-macro/src/lib.rs	ø	ø	ø	ø	87.50%
Project Totals (67 files)	7,843	2,749	762	4,332	35.05%

157	157
158	158		pub fn notify(&self, conn: &Connection) -> Result<()> {
159	159		for author in self.get_post(conn)?.get_authors(conn)? {
160		-	Notification::insert(
161		-	conn,
162		-	NewNotification {
163		-	kind: notification_kind::COMMENT.to_string(),
164		-	object_id: self.id,
165		-	user_id: author.id,
166		-	},
167		-	)?;
	160	+	if Mention::list_for_comment(conn, self.id)?
	161	+	.iter()
	162	+	.all(\|m\| m.get_mentioned(conn).map(\|u\| u != author).unwrap_or(true))
	163	+	&& author.is_local()
	164	+	{
	165	+	Notification::insert(
	166	+	conn,
	167	+	NewNotification {
	168	+	kind: notification_kind::COMMENT.to_string(),
	169	+	object_id: self.id,
	170	+	user_id: author.id,
	171	+	},
	172	+	)?;
	173	+	}
168	174		}
169	175		Ok(())
170	176		}

129	130
130	131		fn notify(&self, conn: &Connection) -> Result<()> {
131	132		let m = self.get_mentioned(conn)?;
132		-	Notification::insert(
133		-	conn,
134		-	NewNotification {
135		-	kind: notification_kind::MENTION.to_string(),
136		-	object_id: self.id,
137		-	user_id: m.id,
138		-	},
139		-	)
140		-	.map(\|_\| ())
	133	+	if m.is_local() {
	134	+	Notification::insert(
	135	+	conn,
	136	+	NewNotification {
	137	+	kind: notification_kind::MENTION.to_string(),
	138	+	object_id: self.id,
	139	+	user_id: m.id,
	140	+	},
	141	+	)
	142	+	.map(\|_\| ())
	143	+	} else {
	144	+	Ok(())
	145	+	}
141	146		}
142	147		}

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

#561 Improve notification management

Flags

Show failed CI and contexual commits `c`

4 Commits

15	15		use mentions::Mention;
16	16		use notifications::*;
17	17		use plume_common::activity_pub::{
18		-	inbox::{AsObject, FromId},
	18	+	inbox::{AsActor, AsObject, FromId},
19	19		Id, IntoId, PUBLIC_VISIBILITY,
20	20		};
21	21		use plume_common::utils;

79	79		pub fn notify(&self, conn: &Connection) -> Result<()> {
80	80		let post = self.get_post(conn)?;
81	81		for author in post.get_authors(conn)? {
82		-	Notification::insert(
83		-	conn,
84		-	NewNotification {
85		-	kind: notification_kind::RESHARE.to_string(),
86		-	object_id: self.id,
87		-	user_id: author.id,
88		-	},
89		-	)?;
	82	+	if author.is_local() {
	83	+	Notification::insert(
	84	+	conn,
	85	+	NewNotification {
	86	+	kind: notification_kind::RESHARE.to_string(),
	87	+	object_id: self.id,
	88	+	user_id: author.id,
	89	+	},
	90	+	)?;
	91	+	}
90	92		}
91	93		Ok(())
92	94		}

3	3
4	4		use comments::Comment;
5	5		use notifications::*;
	6	+	use plume_common::activity_pub::inbox::AsActor;
6	7		use posts::Post;
7	8		use schema::mentions;
8	9		use users::User;

67	67		Ok(act)
68	68		}
69	69
70		-	pub fn notify(&self, conn: &Connection) -> Result<Notification> {
71		-	Notification::insert(
72		-	conn,
73		-	NewNotification {
74		-	kind: notification_kind::FOLLOW.to_string(),
75		-	object_id: self.id,
76		-	user_id: self.following_id,
77		-	},
78		-	)
	70	+	pub fn notify(&self, conn: &Connection) -> Result<()> {
	71	+	if User::get(conn, self.following_id)?.is_local() {
	72	+	Notification::insert(
	73	+	conn,
	74	+	NewNotification {
	75	+	kind: notification_kind::FOLLOW.to_string(),
	76	+	object_id: self.id,
	77	+	user_id: self.following_id,
	78	+	},
	79	+	)?;
	80	+	}
	81	+	Ok(())
79	82		}
80	83
81	84		/// from -> The one sending the follow request

54	54		pub fn notify(&self, conn: &Connection) -> Result<()> {
55	55		let post = Post::get(conn, self.post_id)?;
56	56		for author in post.get_authors(conn)? {
57		-	Notification::insert(
58		-	conn,
59		-	NewNotification {
60		-	kind: notification_kind::LIKE.to_string(),
61		-	object_id: self.id,
62		-	user_id: author.id,
63		-	},
64		-	)?;
	57	+	if author.is_local() {
	58	+	Notification::insert(
	59	+	conn,
	60	+	NewNotification {
	61	+	kind: notification_kind::LIKE.to_string(),
	62	+	object_id: self.id,
	63	+	user_id: author.id,
	64	+	},
	65	+	)?;
	66	+	}
65	67		}
66	68		Ok(())
67	69		}

#561 Improve notification management

Flags

Show failed CI and contexual commits c 4 Commits

Show failed CI and contexual commits `c`

4 Commits