Changeset 563ece2

Timestamp:

08/22/10 21:29:27 (3 years ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Branches:

master

Children:

67c3cdb

Parents:

5d836bd

git-author:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/22/10 21:29:27)

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (08/22/10 21:29:27)

Message:

Add support for marking messages read

Closes #13

Signed-off-by: Antti-Juhani Kaijanaho <antti-juhani@…>

Files:

• db/FORMAT.txt (modified) (1 diff)
• db/db.cc (modified) (1 diff)
• db/user.cc (modified) (2 diffs)
• db/user.hh (modified) (2 diffs)
• http/article.cc (modified) (2 diffs)
• http/markread.cc (added)
• nntp/article.cc (modified) (2 diffs)
• tlate/msg_value.cc (modified) (1 diff)

db/FORMAT.txt

@@ -45 +45 @@
   - delivery_email_cookie (string)
   - allow_cleartext_password ("yes" / "no")
+  - has_read (string: msgid)
+  - has_not_read (string: msgid)
 
 If the userid doesn't yet exist, it is created with the given

db/db.cc

@@ -165 +165 @@
                         else if (key == "allow_cleartext_password")
                                 u->do_allow_cleartext_password = line == "yes";
+                        else if (key == "has_read")
+                                u->read_msgids.insert(line);
+                        else if (key == "has_not_read")
+                                u->read_msgids.erase(line);
                         else if (key == "allow_posting")
                         {

db/user.cc

@@ -190 +190 @@
                    << "USER ADD " + userid;
                 dbase->add_record(os.str());
-                roles.insert(r);
-                r->users.insert(shared_from_this());
+                BOOST_ASSERT(roles.find(r) != roles.end());
+                BOOST_ASSERT(r->users.find(shared_from_this())!=r->users.end());
         }
 
@@ -203 +203 @@
                    << "USER DEL " + userid;
                 dbase->add_record(os.str());
-                roles.erase(r);
-                r->users.erase(shared_from_this());
+                BOOST_ASSERT(roles.find(r) == roles.end());
+                BOOST_ASSERT(r->users.find(shared_from_this())==r->users.end());
+        }
+
+        void user::mark_read(std::string msgid)
+        {
+                if (has_read(msgid)) return;
+                std::ostringstream os;
+                os << "USER " << userid << "\r\n"
+                   << "has_read " << msgid;
+                dbase->add_record(os.str());
+                BOOST_ASSERT(has_read(msgid));
+        }
+        void user::unmark_read(std::string msgid)
+        {
+                if (!has_read(msgid)) return;
+                std::ostringstream os;
+                os << "USER " << userid << "\r\n"
+                   << "has_not_read " << msgid;
+                dbase->add_record(os.str());
+                BOOST_ASSERT(!has_read(msgid));
         }
 

db/user.hh

@@ -51 +51 @@
                 std::set< boost::shared_ptr<role> > roles;
 
+                std::set<std::string> read_msgids;
+
                 friend class db;
         public:
@@ -100 +102 @@
                 void delete_role(boost::shared_ptr<role> r);
 
+                bool has_read(std::string msgid) const {
+                        return read_msgids.find(msgid) != read_msgids.end();
+                }
+                void mark_read(std::string msgid);
+                void unmark_read(std::string msgid);
+
                 static std::string passwd_problems(std::string pw) {
                         std::string err;

http/article.cc

@@ -1 +1 @@
 /*  This file is part of Alue, the multiprotocol Internet discussion daemon
 
-    Copyright © 2009 Antti-Juhani Kaijanaho
+    Copyright © 2009, 2010 Antti-Juhani Kaijanaho
 
     Alue is free software: you can redistribute it and/or modify it
@@ -94 +94 @@
 
                 boost::shared_ptr<db::user> u = req->get_user();
+
+                if (is_single && u) u->mark_read(art->msgid());
                 
                 db::thread_node::ptr tn = 

nntp/article.cc

@@ -22 +22 @@
 
 #include "../db/db.hh"
+#include "../db/user.hh"
 #include "../msg/msg.hh"
 
@@ -138 +139 @@
 
                 std::string msgparm = msgnum + " " + message->msgid();
+
+                if (c.identity() && (cmd == ARTICLE || cmd == BODY))
+                        c.identity()->mark_read(message->msgid());
                                 
                 switch (cmd) {

tlate/msg_value.cc

@@ -278 +278 @@
                         rv.reset(new sv(boost::lexical_cast<std::string>
                                         (tn->cardinality())));
+                else if (u && var == "marked_read" && u->has_read(msgid))
+                        rv.reset(new empty_value);
                 return rv;
         }