src: remove useless base model

Author: JacksonTian

app/common/base_model.js

@@ -1,20 +1,6 @@
 'use strict';
 
 const bcrypt = require('bcryptjs');
-const moment = require('moment');
-
-moment.locale('zh-cn'); // 使用中文
-
-// 格式化时间
-exports.formatDate = (date, friendly) => {
-  date = moment(date);
-
-  if (friendly) {
-    return date.fromNow();
-  }
-
-  return date.format('YYYY-MM-DD HH:mm');
-};
 
 exports.validateId = str => {
   return /^[a-zA-Z0-9\-_]+$/i.test(str);

app/common/tools.js

@@ -3,12 +3,11 @@
 const util = require('util');
 const qn = require('qn');
 
-exports = function qnUpload(options) {
+module.exports = function qnUpload(options) {
   // 7牛 client
   let qnClient;
   if (options.qn_access && options.qn_access.secretKey !== 'your secret key') {
     qnClient = qn.create(options.qn_access);
   }
-  const qnUpload = util.promisify(qnClient.upload);
-  return qnUpload;
+  return util.promisify(qnClient.upload);
 };

app/common/upload.js

@@ -3,6 +3,9 @@
 const MarkdownIt = require('markdown-it');
 const validator = require('validator');
 const jsxss = require('xss');
+const moment = require('moment');
+
+moment.locale('zh-cn'); // 使用中文
 
 // Set default options
 const md = new MarkdownIt();
@@ -90,3 +93,9 @@ exports.proxy = function(url) {
   // 当 google 和 github 封锁严重时，则需要通过服务器代理访问它们的静态资源
   // return '/agent?url=' + encodeURIComponent(url);
 };
+
+exports.ago = function(date) {
+  date = moment(date);
+
+  return date.fromNow();
+};

app/extend/helper.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const BaseModel = require('../common/base_model');
-
 module.exports = app => {
   const mongoose = app.mongoose;
   const Schema = mongoose.Schema;
@@ -17,7 +15,6 @@ module.exports = app => {
     create_at: { type: Date, default: Date.now },
   });
 
-  MessageSchema.plugin(BaseModel);
   MessageSchema.index({ master_id: 1, has_read: -1, create_at: -1 });
 
   return mongoose.model('Message', MessageSchema);

app/model/message.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const BaseModel = require('../common/base_model');
-
 module.exports = app => {
   const mongoose = app.mongoose;
   const Schema = mongoose.Schema;
@@ -21,7 +19,6 @@ module.exports = app => {
     usePushEach: true,
   });
 
-  ReplySchema.plugin(BaseModel);
   ReplySchema.index({ topic_id: 1 });
   ReplySchema.index({ author_id: 1, create_at: -1 });
 

app/model/reply.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const BaseModel = require('../common/base_model');
-
 module.exports = app => {
   const mongoose = app.mongoose;
   const Schema = mongoose.Schema;
@@ -27,7 +25,6 @@ module.exports = app => {
     deleted: { type: Boolean, default: false },
   });
 
-  TopicSchema.plugin(BaseModel);
   TopicSchema.index({ create_at: -1 });
   TopicSchema.index({ top: -1, last_reply_at: -1 });
   TopicSchema.index({ author_id: 1, create_at: -1 });

app/model/topic.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const BaseModel = require('../common/base_model');
-
 module.exports = app => {
   const mongoose = app.mongoose;
   const Schema = mongoose.Schema;
@@ -13,7 +11,6 @@ module.exports = app => {
     create_at: { type: Date, default: Date.now },
   });
 
-  TopicCollectSchema.plugin(BaseModel);
   TopicCollectSchema.index({ user_id: 1, topic_id: 1 }, { unique: true });
 
   return mongoose.model('TopicCollect', TopicCollectSchema);

app/model/topic_collect.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const utility = require('utility');
-const BaseModel = require('../common/base_model');
 
 module.exports = app => {
   const mongoose = app.mongoose;
@@ -47,8 +46,6 @@ module.exports = app => {
     accessToken: { type: String },
   });
 
-  UserSchema.plugin(BaseModel);
-
   UserSchema.index({ loginname: 1 }, { unique: true });
   UserSchema.index({ email: 1 }, { unique: true });
   UserSchema.index({ score: -1 });

app/model/user.js

@@ -7,7 +7,7 @@
 
     <div class='user_info'>
       <a class='dark reply_author' href="/user/<%= reply.author.loginname %>"><%= reply.author.loginname %></a>
-      <a class="reply_time" href="#<%= reply._id %>"><%= indexInCollection + 1 %>楼•<%= reply.create_at_ago()
+      <a class="reply_time" href="#<%= reply._id %>"><%= indexInCollection + 1 %>楼•<%= helper.ago(reply.create_at)
         %></a>
       <% if (reply.author.loginname == topic.author.loginname) { %>
         <span class="reply_by_author">作者</span>