Changeset 383796fa5544ac0c42f5599e6de3d3aa06cde8bb

Timestamp:

09/26/10 20:55:45 (20 months ago)

Author:

Antti-Juhani Kaijanaho <antti-juhani@…>

Children:

4359ba90347589d94f386f25dbdfd36c039000e6

Parents:

11cf105fe323361072281747558cb61752f33fa8

git-committer:

Antti-Juhani Kaijanaho <antti-juhani@…> (09/26/10 20:55:45)

Message:

#76: Email subscription and unsubscription notifications

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

Files:

• db/group.cc (modified) (2 diffs)
• db/group.hh (modified) (2 diffs)
• http/sub.cc (modified) (2 diffs)
• tlate/group_value.cc (modified) (2 diffs)

db/group.cc

@@ -26 +26 @@
 #include "../msg/entity.hh"
 #include "../msg/multipart.hh"
+#include "../msg/lexutils.hh"
 #include "../msg/text_plain.hh"
 #include "../smtp_client/smtp_client.hh"
 #include "../tlate/data_model.hh"
 #include "../tlate/group_value.hh"
+#include "../tlate/user_value.hh"
 #include "../tlate/tlate.hh"
 
@@ -147 +149 @@
         }
 
-        void group::add_subscriber(boost::shared_ptr<user> u)
-        {
+        void group::send_submail(user::const_ptr u, const char *tln,
+                                 server::conn_cb cb)
+        {
+                std::string ton = u->get_display_name();
+                std::string to = u->get_delivery_email();
+                std::string from = 
+                        config["alue-name"].as<std::string>() +
+                        " <" +
+                        config["operator-email"].as<std::string>() +
+                        ">";
+
+                tlate::data_model::ptr mam(new tlate::data_model);
+                mam->insert("from", from);
+                mam->insert("to",
+                            ::msg::make_phrase(ton) + " <" + to + ">");
+                mam->insert("user", new tlate::user_value(u));
+                mam->insert("group",
+                            new tlate::group_value(shared_from_this(), u));
+                if (u->is_delivery_email_verified())
+                        mam->insert("verified");
+
+                boost::shared_ptr<tlate::tlate> tl = tlate::tlate::parse(tln);
+                std::ostringstream mos;
+                mos << tl->eval(mam);
+                        
+                std::list<std::string> recv;
+                recv.push_back(to);
+                                
+                cb.smtpc().send_mail(recv, mos.str());
+        }
+
+        void group::add_subscriber(boost::shared_ptr<user> u,
+                                   server::conn_cb cb)
+        {
+                BOOST_ASSERT(u);
                 ensure_subscriber_role();
                 u->add_role(subscriber_role);
-        }
-        void group::delete_subscriber(boost::shared_ptr<user> u)
+                send_submail(u, "sub.msg", cb);
+        }
+        void group::delete_subscriber(boost::shared_ptr<user> u,
+                                      server::conn_cb cb)
         {
                 ensure_subscriber_role();
                 u->delete_role(subscriber_role);
+                send_submail(u, "unsub.msg", cb);
         }
         bool group::is_subscriber(boost::shared_ptr<const user> u)

db/group.hh

@@ -98 +98 @@
                 }
 
-                void add_subscriber(boost::shared_ptr<user> u);
-                void delete_subscriber(boost::shared_ptr<user> u);
+                void add_subscriber(boost::shared_ptr<user> u,
+                                    server::conn_cb cb);
+                void delete_subscriber(boost::shared_ptr<user> u,
+                                       server::conn_cb cb);
                 bool is_subscriber(boost::shared_ptr<const user> u);
         private:
@@ -121 +123 @@
                                   const std::set<boost::shared_ptr<role> > &);
 
+                void send_submail(boost::shared_ptr<const user> u,
+                                  const char *tln,
+                                  server::conn_cb cb);
+
                 boost::shared_ptr<msg> retrieve(number n) const {
                         static boost::shared_ptr<msg> null;

http/sub.cc

@@ -98 +98 @@
                 if (sub)
                 {
-                        gr->add_subscriber(u);
+                        gr->add_subscriber(u, cb);
                         if (!u->is_delivery_email_verified())
                                 u->send_delivery_email_cookie
@@ -105 +105 @@
                 else
                 {
-                        gr->delete_subscriber(u);
+                        gr->delete_subscriber(u, cb);
                 }
                 throw resource_exception(resp);

tlate/group_value.cc

@@ -23 +23 @@
 #include "string_value.hh"
 
+#include "../config.hh"
 #include "../db/group.hh"
 #include "../html/util.hh"
@@ -49 +50 @@
                         rv.reset(new sv(boost::lexical_cast<std::string>
                                         (gr->get_count())));
+                else if (var == "post-address")
+                        rv.reset(new sv
+                                 (gr->name() + "@" +
+                                  config["canonical-name"].as<std::string>()));
                 else if (var == "reading-authorized")
                 {