mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-02 03:55:55 +01:00
removed schema.js
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
(function (Feed) {
|
(function (Feed) {
|
||||||
var RDB = require('./redis.js'),
|
var RDB = require('./redis.js'),
|
||||||
schema = require('./schema.js'),
|
|
||||||
posts = require('./posts.js'),
|
posts = require('./posts.js'),
|
||||||
topics = require('./topics.js'),
|
topics = require('./topics.js'),
|
||||||
fs = require('fs'),
|
fs = require('fs'),
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
var RDB = require('./redis.js'),
|
var RDB = require('./redis.js'),
|
||||||
utils = require('./../public/src/utils.js'),
|
utils = require('./../public/src/utils.js'),
|
||||||
schema = require('./schema.js'),
|
|
||||||
user = require('./user.js'),
|
user = require('./user.js'),
|
||||||
topics = require('./topics.js'),
|
topics = require('./topics.js'),
|
||||||
favourites = require('./favourites.js'),
|
favourites = require('./favourites.js'),
|
||||||
@@ -445,7 +444,7 @@ var RDB = require('./redis.js'),
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Posts.getTopicPostStats = function(socket) {
|
Posts.getTopicPostStats = function() {
|
||||||
RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
|
RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
|
||||||
if (err === null) {
|
if (err === null) {
|
||||||
var stats = {
|
var stats = {
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
(function(Schema) {
|
|
||||||
|
|
||||||
|
|
||||||
Schema.global = function() {
|
|
||||||
return {
|
|
||||||
|
|
||||||
/* strings */
|
|
||||||
next_topic_id: 'next_topic_id'
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Schema.topics = function(tid) {
|
|
||||||
return {
|
|
||||||
|
|
||||||
/* sets */
|
|
||||||
read_by_uid: 'tid:' + tid + ':read_by_uid',
|
|
||||||
|
|
||||||
/* sorted sets */
|
|
||||||
recent: 'topics:recent',
|
|
||||||
|
|
||||||
/* lists */
|
|
||||||
posts: 'tid:' + tid + ':posts',
|
|
||||||
queued_tids: 'topics:queued:tid',
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Schema.categories = function(cid) {
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
Schema.users = function(uid) {
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
Schema.posts = function(pid) {
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
}(module.exports));
|
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
var RDB = require('./redis.js'),
|
var RDB = require('./redis.js'),
|
||||||
schema = require('./schema.js'),
|
|
||||||
posts = require('./posts.js'),
|
posts = require('./posts.js'),
|
||||||
utils = require('./../public/src/utils.js'),
|
utils = require('./../public/src/utils.js'),
|
||||||
user = require('./user.js'),
|
user = require('./user.js'),
|
||||||
@@ -560,7 +559,7 @@ var RDB = require('./redis.js'),
|
|||||||
|
|
||||||
Topics.markAsRead = function(tid, uid) {
|
Topics.markAsRead = function(tid, uid) {
|
||||||
|
|
||||||
RDB.sadd(schema.topics(tid).read_by_uid, uid);
|
RDB.sadd('tid:' + tid + ':read_by_uid', uid);
|
||||||
|
|
||||||
Topics.getTopicField(tid, 'cid', function(err, cid) {
|
Topics.getTopicField(tid, 'cid', function(err, cid) {
|
||||||
|
|
||||||
@@ -584,7 +583,7 @@ var RDB = require('./redis.js'),
|
|||||||
var batch = RDB.multi();
|
var batch = RDB.multi();
|
||||||
|
|
||||||
for (var i = 0, ii = tids.length; i < ii; i++) {
|
for (var i = 0, ii = tids.length; i < ii; i++) {
|
||||||
batch.sismember(schema.topics(tids[i]).read_by_uid, uid);
|
batch.sismember('tid:' + tids[i] + ':read_by_uid', uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
batch.exec(function(err, hasRead) {
|
batch.exec(function(err, hasRead) {
|
||||||
@@ -593,7 +592,7 @@ var RDB = require('./redis.js'),
|
|||||||
}
|
}
|
||||||
|
|
||||||
Topics.hasReadTopic = function(tid, uid, callback) {
|
Topics.hasReadTopic = function(tid, uid, callback) {
|
||||||
RDB.sismember(schema.topics(tid).read_by_uid, uid, function(err, hasRead) {
|
RDB.sismember('tid:' + tid + ':read_by_uid', uid, function(err, hasRead) {
|
||||||
|
|
||||||
if (err === null) {
|
if (err === null) {
|
||||||
callback(hasRead);
|
callback(hasRead);
|
||||||
@@ -691,7 +690,7 @@ var RDB = require('./redis.js'),
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RDB.incr(schema.global().next_topic_id, function(err, tid) {
|
RDB.incr('next_topic_id', function(err, tid) {
|
||||||
RDB.handle(err);
|
RDB.handle(err);
|
||||||
|
|
||||||
// Global Topics
|
// Global Topics
|
||||||
@@ -700,7 +699,7 @@ var RDB = require('./redis.js'),
|
|||||||
RDB.sadd('topics:tid', tid);
|
RDB.sadd('topics:tid', tid);
|
||||||
} else {
|
} else {
|
||||||
// need to add some unique key sent by client so we can update this with the real uid later
|
// need to add some unique key sent by client so we can update this with the real uid later
|
||||||
RDB.lpush(schema.topics().queued_tids, tid);
|
RDB.lpush('topics:queued:tid', tid);
|
||||||
}
|
}
|
||||||
|
|
||||||
var slug = tid + '/' + utils.slugify(title);
|
var slug = tid + '/' + utils.slugify(title);
|
||||||
|
|||||||
Reference in New Issue
Block a user