diff --git a/src/feed.js b/src/feed.js index b4a937a64a..3088c5550d 100644 --- a/src/feed.js +++ b/src/feed.js @@ -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'), diff --git a/src/posts.js b/src/posts.js index 4c428e68fc..30bd219d3b 100644 --- a/src/posts.js +++ b/src/posts.js @@ -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 = { diff --git a/src/schema.js b/src/schema.js deleted file mode 100644 index 7d5c7fc8b0..0000000000 --- a/src/schema.js +++ /dev/null @@ -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)); \ No newline at end of file diff --git a/src/topics.js b/src/topics.js index 4afd446e7f..7e21f07d78 100644 --- a/src/topics.js +++ b/src/topics.js @@ -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);