swcs/OurUmbraco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spam filtering in notifications (don't send notification if topic or comment is marked as spam)

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-06-28 12:27:54 +02:00
parent e0b7c211be
commit ccef03454f
2 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Notification/NotificationTypes/NewForumTopic.cs
+19 -20
View File
@@ -22,7 +22,16 @@ namespace NotificationsCore.NotificationTypes
public override bool SendNotification(System.Xml.XmlNode details, params object[] args)
{
try
{
{
var topic = (Topic)args[0];
if (topic.IsSpam)
{
umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, string.Format("[Notifications] Topic ID {0} is marked as spam, no notification sent{0}", topic.Id));
return true;
}
SmtpClient c = new SmtpClient(details.SelectSingleNode("//smtp").InnerText);
c.Credentials = new System.Net.NetworkCredential(details.SelectSingleNode("//username").InnerText, details.SelectSingleNode("//password").InnerText);
@@ -32,39 +41,29 @@ namespace NotificationsCore.NotificationTypes
string subject = details.SelectSingleNode("//subject").InnerText;
string body = details.SelectSingleNode("//body").InnerText;
Topic t = (Topic)args[0];
Member s = (Member)args[2];
Member member = (Member)args[2];
//currently using document api instead of nodefactory
Document f = new Document(t.ParentId);
Document forum = new Document(topic.ParentId);
subject = string.Format(subject, f.Text);
subject = string.Format(subject, forum.Text);
string domain = details.SelectSingleNode("//domain").InnerText;
body = string.Format(body,
f.Text,
"http://" + domain + args[1].ToString(), s.Text, t.Title, HttpUtility.HtmlDecode(umbraco.library.StripHtml(t.Body)));
var domain = details.SelectSingleNode("//domain").InnerText;
body = string.Format(body, forum.Text, "http://" + domain + args[1], member.Text, topic.Title, HttpUtility.HtmlDecode(umbraco.library.StripHtml(topic.Body)));
SqlConnection conn = new SqlConnection(details.SelectSingleNode("//conn").InnerText);
SqlCommand comm = new SqlCommand("Select memberId from forumSubscribers where forumId = @forumId", conn);
comm.Parameters.AddWithValue("@forumId", t.ParentId);
comm.Parameters.AddWithValue("@forumId", topic.ParentId);
conn.Open();
SqlDataReader dr = comm.ExecuteReader();
while (dr.Read())
{
@@ -75,7 +74,7 @@ namespace NotificationsCore.NotificationTypes
Member m = new Member(mid);
if (m.Id != t.MemberId
if (m.Id != topic.MemberId
&& (m.getProperty("bugMeNot").Value.ToString() != "1"))
{
MailMessage mm = new MailMessage();
Notification/NotificationTypes/NewForumTopicComment.cs
+19 -21
View File
@@ -21,6 +21,13 @@ namespace NotificationsCore.NotificationTypes
{
try
{
Comment com = (Comment)args[0];
if (com.IsSpam)
{
umbraco.BusinessLogic.Log.Add(umbraco.BusinessLogic.LogTypes.Debug, -1, string.Format("[Notifications] Comment Id {{0}} is marked as spam, no notification sent{0}", com.Id));
return true;
}
SmtpClient c = new SmtpClient(details.SelectSingleNode("//smtp").InnerText);
c.Credentials = new System.Net.NetworkCredential(details.SelectSingleNode("//username").InnerText, details.SelectSingleNode("//password").InnerText);
@@ -28,28 +35,22 @@ namespace NotificationsCore.NotificationTypes
details.SelectSingleNode("//from/email").InnerText,
details.SelectSingleNode("//from/name").InnerText);
string subject = details.SelectSingleNode("//subject").InnerText;
string body = details.SelectSingleNode("//body").InnerText;
var subject = details.SelectSingleNode("//subject").InnerText;
var body = details.SelectSingleNode("//body").InnerText;
var topic = Topic.GetTopic(com.TopicId);
subject = string.Format(subject, topic.Title);
Comment com = (Comment)args[0];
Topic t = Topic.GetTopic(com.TopicId);
subject = string.Format(subject, t.Title);
Member s = (Member)args[2];
string domain = details.SelectSingleNode("//domain").InnerText;
body = string.Format(body,
t.Title,
"http://" + domain + args[1].ToString(), s.Text, HttpUtility.HtmlDecode(umbraco.library.StripHtml(com.Body)));
var member = (Member)args[2];
var domain = details.SelectSingleNode("//domain").InnerText;
body = string.Format(body, topic.Title, "http://" + domain + args[1], member.Text, HttpUtility.HtmlDecode(umbraco.library.StripHtml(com.Body)));
SqlConnection conn = new SqlConnection(details.SelectSingleNode("//conn").InnerText);
SqlCommand comm = new SqlCommand("Select memberId from forumTopicSubscribers where topicId = @topicId", conn);
comm.Parameters.AddWithValue("@topicId", t.Id);
SqlCommand comm = new SqlCommand("Select memberId from forumTopicSubscribers topicId = @topicId", conn);
comm.Parameters.AddWithValue("@topicId", topic.Id);
conn.Open();
@@ -84,9 +85,6 @@ namespace NotificationsCore.NotificationTypes
}
conn.Close();
}
catch (Exception e)
{