- Comments: akismet integration, adding a few spam related settings to the package (enablespamprotection, akismetkey etc), minor refactoring.

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041482

src/Orchard.Web/Packages/Orchard.Comments/Models/CommentSettings.cs

@@ -4,15 +4,20 @@ using Orchard.Models.Driver;
 using Orchard.Models.Records;
 
 namespace Orchard.Comments.Models {
+    public class CommentSettings : ContentPartForRecord<CommentSettingsRecord> {
+    }
+
     public class CommentSettingsRecord : ContentPartRecord {
         public virtual bool RequireLoginToAddComment { get; set; }
         public virtual bool EnableCommentsOnPages { get; set; }
         public virtual bool EnableCommentsOnPosts { get; set; }
+        public virtual bool EnableSpamProtection { get; set; }
+        public virtual string AkismetKey { get; set; }
     }
 
     public class CommentSettingsHandler : ContentHandler {
         public CommentSettingsHandler(IRepository<CommentSettingsRecord> repository) {
-            Filters.Add(new ActivatingFilter<ContentPartForRecord<CommentSettingsRecord>>("site"));
+            Filters.Add(new ActivatingFilter<CommentSettings>("site"));
             Filters.Add(new StorageFilterForRecord<CommentSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
             Filters.Add(new TemplateFilterForRecord<CommentSettingsRecord>("CommentSettings"));
         }

src/Orchard.Web/Packages/Orchard.Comments/Orchard.Comments.csproj

@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Joel.Net.Akismet, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\joel.net.akismet\Joel.Net.Akismet.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.DataAnnotations">

src/Orchard.Web/Packages/Orchard.Comments/Services/CommentValidator.cs

@@ -1,23 +1,60 @@
-using Orchard.Comments.Models;
+using System;
+using System.Web;
+using Orchard.Comments.Models;
+using Orchard.Localization;
 using Orchard.Logging;
+using Orchard.Models;
+using Orchard.Settings;
+using Orchard.UI.Notify;
+using Joel.Net;
 
 namespace Orchard.Comments.Services {
     public interface ICommentValidator : IDependency {
         bool ValidateComment(Comment comment);
     }
 
-    public class CommentValidator : ICommentValidator {
-        public CommentValidator() {
+    //This uses an akismet api implementation from http://akismetapi.codeplex.com/ 
+    //Since the implementation is trivial, it may make sense to implement it to reduce dependencies.
+    public class AkismetCommentValidator : ICommentValidator {
+        private readonly INotifier _notifer;
+        public AkismetCommentValidator(INotifier notifier) {
+            _notifer = notifier;
             Logger = NullLogger.Instance;
+            T = NullLocalizer.Instance;
         }
 
         public ILogger Logger { get; set; }
+        public Localizer T { get; set; }
+        public ISite CurrentSite { get; set; }
 
         #region Implementation of ICommentValidator
 
         public bool ValidateComment(Comment comment) {
-            //TODO: integrate spam filter.
-            return true;
+            CommentSettingsRecord commentSettingsRecord = CurrentSite.As<CommentSettings>().Record;
+            string akismetKey = commentSettingsRecord.AkismetKey;
+            bool enableSpamProtection = commentSettingsRecord.EnableSpamProtection;
+            if (enableSpamProtection == false) {
+                return true;
+            }
+            if (String.IsNullOrEmpty(akismetKey)) {
+                _notifer.Information(T("Please configure your Akismet key for spam protection"));
+                return true;
+            }
+            Akismet akismetApi = new Akismet(akismetKey, "http://www.orchardproject.net", null);
+            AkismetComment akismetComment = new AkismetComment {
+                CommentAuthor = comment.Author,
+                CommentAuthorEmail = comment.Email,
+                Blog = comment.SiteName,
+                CommentAuthorUrl = comment.SiteName,
+                CommentContent = comment.CommentText,
+                UserAgent = HttpContext.Current.Request.UserAgent,
+            };
+
+            if (akismetApi.VerifyKey()) {
+                return akismetApi.CommentCheck(akismetComment);
+            }
+
+            return false;
         }
 
         #endregion

src/Orchard.Web/Packages/Orchard.Comments/Views/Admin/Index.aspx

@@ -66,7 +66,11 @@
                                 <% else {%> Approved <% } %>
                                 </td>
                                 <td><%= commentEntry.Comment.UserName %></td>
-			                    <td><%= commentEntry.Comment.CommentText == null ? String.Empty : commentEntry.Comment.CommentText.Substring(32) %></td>
+			                    <td>
+			                    <% if (commentEntry.Comment.CommentText != null) {%>
+			                        <%= commentEntry.Comment.CommentText.Length > 23 ? commentEntry.Comment.CommentText.Substring(0, 24) : commentEntry.Comment.CommentText %>
+			                    <% } %> 
+			                    </td>
 				                <td><%= commentEntry.Comment.CommentDate %></td>
 				                <td>Link to commented item</td>
                             </tr>

src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/CommentSettingsRecord.ascx

@@ -16,4 +16,14 @@
         <%= Html.EditorFor(x=>x.EnableCommentsOnPosts) %>
         <%= Html.ValidationMessage("EnableCommentsOnPosts", "*")%>
     </li>
+    <li>
+        <%= Html.LabelFor(x=>x.EnableSpamProtection) %>
+        <%= Html.EditorFor(x=>x.EnableSpamProtection) %>
+        <%= Html.ValidationMessage("EnableSpamProtection", "*")%>
+    </li>
+     <li>
+        <%= Html.LabelFor(x=>x.AkismetKey) %>
+        <%= Html.EditorFor(x=>x.AkismetKey) %>
+        <%= Html.ValidationMessage("AkismetKey", "*")%>
+    </li>
 </ol>