fix posts_by_author bug, add wechat QR code on post and about page

Author: zjtang

.gitignore

@@ -8,3 +8,4 @@ static/upload/*.jpeg
 static/upload/*.git
 static/upload/*.bmp
 static/upload/*.webp
+.DS_Store

ezBlog.py

@@ -20,7 +20,7 @@
 app.config["SECRET_KEY"] = "ezBlog"  # for WTF-forms and login
 app.config["BLOGGING_URL_PREFIX"] = "/blog"
 app.config["BLOGGING_SITEURL"] = "http://traceme.space"
-app.config["BLOGGING_AUTHOR"] = "Ziv"
+app.config["BLOGGING_AUTHOR"] = "Ziv & Ada"
 app.config["BLOGGING_SITENAME"] = "ezBlog"
 app.config["FILEUPLOAD_IMG_FOLDER"] = "data/img"  #img will not upload here, i do not know why
 app.config["FILEUPLOAD_PREFIX"] = "/fileupd"
@@ -120,4 +120,4 @@ def logout():
         context = ('server.crt', 'server.key')
         app.run(debug=True, host='::', port=443, use_reloader=True, ssl_context=context)
     else:
-        app.run(debug=True, host='::', port=8000, use_reloader=True)
+        app.run(debug=True, host='::', port=80, use_reloader=True)

flask_blogging/views.py

@@ -203,16 +203,20 @@ def archives(count, page):
     all_posts = storage.get_posts(count=None, offset=None, include_draft=False,
                               tag=None, user_id=None, recent=True)
     max_posts = meta["max_posts"]
-    for post in all_posts:
-        if meta["is_user_blogger"] is False and post["public"] is 0:
-            max_posts -= 1
-    meta["max_posts"] = max_posts
     uid = None
     try:
         uid = current_user.id
     except AttributeError:
         uid = None
+    for post in all_posts:
+        if int(post["user_id"]) != uid and post["public"] is 0:
+            max_posts -= 1
+    meta["max_posts"] = max_posts
     for post in posts:
+        if int(post["user_id"]) != uid and post["public"] is 0:
+            post["display"] = False
+        else:
+            post["display"] = True
         year = post["post_date"].strftime("%Y")
         if year not in year_dict:
             year_dict[year] = []
@@ -285,7 +289,7 @@ def page_by_id(post_id, slug):
                                meta=meta, tags=tags, prev_post=prev_post,next_post=next_post)
         else:
             flash("You do not have the rights to view this post!", "warning")
-            return redirect(url_for("blogging.archives"))
+            return redirect(url_for("blogging.index"))
     else:
         flash("The page you are trying to access is not valid!", "warning")
         return redirect(url_for("blogging.index"))
@@ -348,9 +352,18 @@ def posts_by_author(user_id, count, page):
     render = config.get("BLOGGING_RENDER_TEXT", True)
     posts_by_author_fetched.send(blogging_engine.app, engine=blogging_engine,
                                  posts=posts, meta=meta)
+    uid = None
+    try:
+        uid = current_user.id
+    except AttributeError:
+        uid = None
     if len(posts):
         for post in posts:
             blogging_engine.process_post(post, render=render)
+            if int(post["user_id"]) != uid and post["public"] is 0:
+                post["display"] = False
+            else:
+                post["display"] = True
         posts_by_author_processed.send(blogging_engine.app,
                                        engine=blogging_engine, posts=posts,
                                        meta=meta)

templates/blogging/about.html

@@ -24,9 +24,19 @@ <h1 class="post-title">
           关于
         </h1>
         <div class="post-content">
-            <h4>{{config.BLOGGING_AUTHOR}}</h4>
+          <h4>Ziv</h4>
           <p>
-            程序猿一枚。主攻C、Python、Go语言
+            程序猿一枚。主攻C、Python、Go语言，目前从事SDN、NFV相关开发工作。
+            <br />
+            微信：
+            <img src="/static/upload/Wechat-ziv.png" alt="" style="width:30%">
+          </p>
+          <h4>Ada</h4>
+          <p>
+            语音处理算法工程师。熟悉Python、Shell、Kaldi。
+            <br />
+            微信：
+            <img src="/static/upload/Wechat-ada.png" alt="" style="width:30%">
           </p>
         </div>
       </div>

templates/blogging/archives.html

@@ -36,12 +36,14 @@ <h2>{{ year.year }}</h2>
         <ul class="listing">
         {% for post in year.posts %}
           {% if ((meta.is_user_blogger) or (post.public)) %}
+          {% if post.display %}
           <li>
             <span class="date">{{post.post_date.strftime('%Y.%m.%d')}}</span>
             <a href="{{post.url}}"
                title="{{post.title}}">{{post.title}}</a>
           </li>
           {% endif %}
+          {% endif %}
         {% endfor %}
         </ul>
       {% endfor %}

templates/blogging/base.html

@@ -61,9 +61,17 @@ <h1 class="hidden">ezBlog</h1>
         {% block sidebar %}
         {% endblock sidebar %}
       <div class="pure-u-1">
+        <br />
         <div id="footer">
-            Copyright © 2018 <a href="/" rel="nofollow" style="color:gray">{{config.BLOGGING_AUTHOR}}</a> |
-          <a rel="nofollow" target="_blank" href="{{config.BLOGGING_SITEURL}}" style="color:gray">Personal BLog</a>
+            Copyright © 2018
+            <a href="{{url_for("blogging.about")}}" rel="nofollow" style="color:gray">{{config.BLOGGING_AUTHOR}}</a>
+            | Powered by
+            <a href="http://flask.pocoo.org/" rel="nofollow" target="_blank" style="color:gray">flask</a>
+            &
+            <a href="https://flask-blogging.readthedocs.io/en/latest/" rel="nofollow" target="_blank" style="color:gray">flask_blogging</a>
+            &
+            <a href="http://pandao.github.io/editor.md/" rel="nofollow" target="_blank" style="color:gray">editor.md</a>
+            | Theme maupassant
           <br>
         </div>
       </div>

templates/blogging/page.html

@@ -68,6 +68,10 @@ <h1 class="post-title">
       {% endif %}
     </div>
   <hr>
+  <div style="text-align:center">
+    <p>如果你喜欢本篇文章，欢迎赞赏作者请他（她）喝杯咖啡！</p>
+    <img src="/static/upload/Wechat-zs-{{post.user_name}}.png" alt="">
+  </div>
   <nav class="page-navigator">
     {% if prev_post %}
     <a class="extend prev" rel="prev" href="{{prev_post.url}}">上一篇：{{prev_post.title}}</a>