Skip to content

Commit ccd13e6

Browse files
rxturrxtur
committed
Facebook comments added
1 parent 035f7d5 commit ccd13e6

16 files changed

Lines changed: 128 additions & 81 deletions

File tree

‎BlogEngine/BlogEngine.Core/BlogSettings.cs‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -605,15 +605,6 @@ public bool EnablePasswordReset
605605

606606
#endregion
607607

608-
#region Thumbnail service
609-
610-
/// <summary>
611-
/// API provided by thumbnail service provider
612-
/// </summary>
613-
public string ThumbnailServiceApi { get; set; }
614-
615-
#endregion
616-
617608
#region Email
618609

619610
/// <summary>
@@ -878,16 +869,18 @@ public enum Moderation
878869
/// Comments moderated manually
879870
/// </summary>
880871
Manual = 0,
881-
882872
/// <summary>
883873
/// Comments moderated by filters
884874
/// </summary>
885875
Auto = 1,
886-
887876
/// <summary>
888877
/// Moderated by Disqus
889878
/// </summary>
890-
Disqus = 2
879+
Disqus = 2,
880+
/// <summary>
881+
/// Moderated by Facebook
882+
/// </summary>
883+
Facebook = 3
891884
}
892885

893886
#region Moderation type

‎BlogEngine/BlogEngine.Core/Data/Models/Settings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ public Settings() { }
162162
public bool EnablePingBackReceive { get; set; }
163163
public bool EnableTrackBackSend { get; set; }
164164
public bool EnableTrackBackReceive { get; set; }
165-
public string ThumbnailServiceApi { get; set; }
166165
public int CommentsPerPage { get; set; }
167166
public bool EnableCountryInComments { get; set; }
168167
public bool EnableWebsiteInComments { get; set; }
169168
public bool ShowLivePreview { get; set; }
170169

170+
public BlogSettings.Moderation ModerationType { get; set; }
171171
public bool UseDisqus { get; set; }
172172
public bool DisqusDevMode { get; set; }
173173
public bool DisqusAddCommentsToPages { get; set; }

‎BlogEngine/BlogEngine.Core/Data/Services/Avatar.cs‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace BlogEngine.Core.Data.Services
1111
public class Avatar
1212
{
1313
private static string _noAvatar = string.Format("{0}Content/images/blog/noavatar.jpg", Utils.AbsoluteWebRoot);
14-
private static string _noThumb = string.Format("{0}Content/images/blog/nothumb.jpg", Utils.AbsoluteWebRoot);
14+
private static string _pingImg = string.Format("{0}Content/images/blog/pingback.png", Utils.AbsoluteWebRoot);
1515

1616
/// <summary>
1717
/// Get avatar image source
@@ -25,7 +25,7 @@ public static string GetSrc(string email, string website = "")
2525

2626
// thumb of pingback/trackback
2727
if (email == "pingback" || email == "trackback")
28-
return Thumb(website);
28+
return _pingImg;
2929

3030
// author with profile photo
3131
src = Photo(email);
@@ -99,19 +99,6 @@ static string Photo(string email)
9999
Utils.RelativeWebRoot + "image.axd?picture=/avatars/" + img;
100100
}
101101

102-
static string Thumb(string website)
103-
{
104-
if (string.IsNullOrEmpty(website))
105-
return _noThumb;
106-
107-
var api = BlogSettings.Instance.ThumbnailServiceApi;
108-
109-
if (string.IsNullOrEmpty(api) || !api.Contains("{0}"))
110-
return _noThumb;
111-
112-
return string.Format(api, HttpUtility.UrlEncode(website.ToString()));
113-
}
114-
115102
static string GetHash(string value)
116103
{
117104
MD5 algorithm = MD5.Create();

‎BlogEngine/BlogEngine.Core/Data/SettingsRepository.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ public Settings Get()
109109
ns.EnablePingBackReceive = bs.EnablePingBackReceive;
110110
ns.EnableTrackBackSend = bs.EnableTrackBackSend;
111111
ns.EnableTrackBackReceive = bs.EnableTrackBackReceive;
112-
ns.ThumbnailServiceApi = bs.ThumbnailServiceApi;
113112
ns.CommentsPerPage = bs.CommentsPerPage;
114113
ns.EnableCountryInComments = bs.EnableCountryInComments;
115114
ns.EnableWebsiteInComments = bs.EnableWebsiteInComments;
116115
ns.ShowLivePreview = bs.ShowLivePreview;
117116

117+
ns.ModerationType = bs.ModerationType;
118118
ns.UseDisqus = bs.ModerationType == BlogSettings.Moderation.Disqus;
119119
ns.DisqusDevMode = bs.DisqusDevMode;
120120
ns.DisqusAddCommentsToPages = bs.DisqusAddCommentsToPages;
@@ -226,13 +226,13 @@ public bool Update(Settings ns)
226226
bs.EnablePingBackReceive = ns.EnablePingBackReceive;
227227
bs.EnableTrackBackSend = ns.EnableTrackBackSend;
228228
bs.EnableTrackBackReceive = ns.EnableTrackBackReceive;
229-
bs.ThumbnailServiceApi = ns.ThumbnailServiceApi;
230229
bs.CommentsPerPage = ns.CommentsPerPage;
231230
bs.EnableCountryInComments = ns.EnableCountryInComments;
232231
bs.EnableWebsiteInComments = ns.EnableWebsiteInComments;
233232
bs.ShowLivePreview = ns.ShowLivePreview;
234233

235-
bs.ModerationType = ns.UseDisqus ? BlogSettings.Moderation.Disqus : BlogSettings.Moderation.Auto;
234+
bs.ModerationType = ns.ModerationType;
235+
//bs.ModerationType = ns.UseDisqus ? BlogSettings.Moderation.Disqus : BlogSettings.Moderation.Auto;
236236
bs.DisqusDevMode = ns.DisqusDevMode;
237237
bs.DisqusAddCommentsToPages = ns.DisqusAddCommentsToPages;
238238
bs.DisqusWebsiteName = ns.DisqusWebsiteName;

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.1.2.4")]
22+
[assembly: AssemblyVersion("3.1.2.5")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.Core/Services/Syndication/SyndicationGenerator.cs‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,18 @@ private static Dictionary<string, string> SupportedMedia
195195
}
196196
}
197197

198+
private static string CommentHash
199+
{
200+
get
201+
{
202+
if (BlogSettings.Instance.ModerationType == BlogSettings.Moderation.Disqus)
203+
return "#disqus_thread";
204+
if (BlogSettings.Instance.ModerationType == BlogSettings.Moderation.Facebook)
205+
return "#facebook_thread";
206+
return "#comment";
207+
}
208+
}
209+
198210
#endregion
199211

200212
#region Public Methods
@@ -512,8 +524,7 @@ private static void WriteAtomEntry(XmlWriter writer, IPublishable publishable)
512524

513525
writer.WriteStartElement("link");
514526
writer.WriteAttributeString("rel", "related");
515-
writer.WriteAttributeString("href", String.Concat(publishable.AbsoluteLink.ToString(),
516-
BlogSettings.Instance.ModerationType == BlogSettings.Moderation.Disqus ? "#disqus_thread" : "#comment"));
527+
writer.WriteAttributeString("href", String.Concat(publishable.AbsoluteLink.ToString(), CommentHash));
517528
writer.WriteEndElement();
518529

519530
// ------------------------------------------------------------
@@ -619,8 +630,8 @@ private static void WriteAtomEntry(XmlWriter writer, IPublishable publishable)
619630
"wfw",
620631
"comment",
621632
"http://wellformedweb.org/CommentAPI/",
622-
String.Concat(publishable.AbsoluteLink.ToString(),
623-
BlogSettings.Instance.ModerationType == BlogSettings.Moderation.Disqus ? "#disqus_thread" : "#comment"));
633+
String.Concat(publishable.AbsoluteLink.ToString(),
634+
CommentHash));
624635
writer.WriteElementString(
625636
"wfw",
626637
"commentRss",
@@ -713,7 +724,7 @@ private static void WriteRssItem(XmlWriter writer, IPublishable publishable)
713724
{
714725
writer.WriteElementString(
715726
"comments", String.Concat(publishable.AbsoluteLink.ToString(),
716-
BlogSettings.Instance.ModerationType == BlogSettings.Moderation.Disqus ? "#disqus_thread" : "#comment"));
727+
CommentHash));
717728
}
718729

719730
writer.WriteElementString("guid", GetPermaLink(publishable).ToString());
@@ -807,7 +818,7 @@ private static void WriteRssItem(XmlWriter writer, IPublishable publishable)
807818
"comment",
808819
"http://wellformedweb.org/CommentAPI/",
809820
String.Concat(publishable.AbsoluteLink.ToString(),
810-
BlogSettings.Instance.ModerationType == BlogSettings.Moderation.Disqus ? "#disqus_thread" : "#comment"));
821+
CommentHash));
811822
writer.WriteElementString(
812823
"wfw",
813824
"commentRss",

‎BlogEngine/BlogEngine.Core/Web/Controls/PostViewBase.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ public virtual string AdminLinks
195195
if (Security.IsAuthorizedTo(Rights.ModerateComments))
196196
{
197197
if (this.Post.NotApprovedComments.Count > 0 &&
198-
BlogSettings.Instance.ModerationType != BlogSettings.Moderation.Disqus)
198+
BlogSettings.Instance.ModerationType != BlogSettings.Moderation.Disqus
199+
&& BlogSettings.Instance.ModerationType != BlogSettings.Moderation.Facebook)
199200
{
200201
sb.AppendFormat(
201202
CultureInfo.InvariantCulture,

‎BlogEngine/BlogEngine.NET/Content/images/blog/pingback.png‎

971 Bytes
Loading

‎BlogEngine/BlogEngine.NET/Custom/Themes/TitaniumX/PostView.ascx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
2222

2323
<%=AdminLinks %>
2424

25-
<% if (BlogEngine.Core.BlogSettings.Instance.ModerationType == BlogEngine.Core.BlogSettings.Moderation.Disqus)
26-
{ %>
25+
<% if (BlogEngine.Core.BlogSettings.Instance.ModerationType == BlogEngine.Core.BlogSettings.Moderation.Disqus) { %>
2726
<a rel="nofollow" href="<%=Post.PermaLink %>#disqus_thread"><%=Resources.labels.comments %></a>
28-
<%}
29-
else
30-
{ %>
27+
<%} else if (BlogEngine.Core.BlogSettings.Instance.ModerationType == BlogEngine.Core.BlogSettings.Moderation.Facebook) { %>
28+
<a rel="nofollow" href="<%=Post.PermaLink %>#facebook_thread"><%=Resources.labels.comments %></a>
29+
<%} else { %>
3130
<a rel="bookmark" href="<%=Post.PermaLink %>" title="<%=Server.HtmlEncode(Post.Title) %>">Permalink</a> |
3231
<a rel="nofollow" href="<%=Post.RelativeLink %>#comment"><%=Resources.labels.comments %> (<%=Post.ApprovedComments.Count %>)</a>
3332
<%} %>
34-
</div>
33+
</div>
3534
</div>

‎BlogEngine/BlogEngine.NET/Custom/Widgets/RecentPosts/widget.ascx.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,11 @@ private static string RenderPosts(List<Post> posts, StringDictionary settings)
186186
comments = string.Format(
187187
"<span><a href=\"{0}#disqus_thread\">{1}</a></span>", post.PermaLink, labels.comments);
188188
}
189+
if (BlogSettings.Instance.ModerationType == BlogSettings.Moderation.Facebook)
190+
{
191+
comments = string.Format(
192+
"<span><a href=\"{0}#facebook_thread\">{1}</a></span>", post.PermaLink, labels.comments);
193+
}
189194

190195
var rate = string.Format("<span>{0}: {1} / {2}</span>", labels.rating, rating, post.Raters);
191196

0 commit comments

Comments
 (0)