removed schema.js

v1.18.x
Baris Usakli 11 years ago
parent 2309ab2002
commit 7d1aa02fd1

@ -1,6 +1,5 @@
(function (Feed) {
var RDB = require('./redis.js'),
schema = require('./schema.js'),
posts = require('./posts.js'),
topics = require('./topics.js'),
fs = require('fs'),

@ -1,6 +1,5 @@
var RDB = require('./redis.js'),
utils = require('./../public/src/utils.js'),
schema = require('./schema.js'),
user = require('./user.js'),
topics = require('./topics.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) {
if (err === null) {
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'),
schema = require('./schema.js'),
posts = require('./posts.js'),
utils = require('./../public/src/utils.js'),
user = require('./user.js'),
@ -560,7 +559,7 @@ var RDB = require('./redis.js'),
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) {
@ -584,7 +583,7 @@ var RDB = require('./redis.js'),
var batch = RDB.multi();
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) {
@ -593,7 +592,7 @@ var RDB = require('./redis.js'),
}
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) {
callback(hasRead);
@ -691,7 +690,7 @@ var RDB = require('./redis.js'),
return;
}
RDB.incr(schema.global().next_topic_id, function(err, tid) {
RDB.incr('next_topic_id', function(err, tid) {
RDB.handle(err);
// Global Topics
@ -700,7 +699,7 @@ var RDB = require('./redis.js'),
RDB.sadd('topics:tid', tid);
} else {
// 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);

Loading…
Cancel
Save