Don't send favorite notifications unless the user wants it.

[quix0rs-gnu-social.git] / plugins / Favorite / FavoritePlugin.php

diff --git a/plugins/Favorite/FavoritePlugin.php b/plugins/Favorite/FavoritePlugin.php
index 4a0dd806cada698c8e180eaf42f932db919bc628..144fef77978173c896d17dd5cbe70f10be752e85 100644 (file)
--- a/plugins/Favorite/FavoritePlugin.php
+++ b/plugins/Favorite/FavoritePlugin.php
@@ -63,7 +63,7 @@ class FavoritePlugin extends ActivityHandlerPlugin
                                          '    modified = "%s" '.
                                          'WHERE user_id = %d '.
                                          'AND notice_id = %d',
-                                         Fave::newURI($fave->user_id, $fave->notice_id, $fave->modified),
+                                         Fave::newUri($fave->user_id, $fave->notice_id, $fave->modified),
                                          common_sql_date(strtotime($fave->modified)),
                                          $fave->user_id,
                                          $fave->notice_id));
@@ -171,7 +171,6 @@ class FavoritePlugin extends ActivityHandlerPlugin
             // more explicit catch-statement.
             return null;
         }
-        common_debug(get_called_class().' returning '.get_class($object).' object with uri: '.$object->uri);
         return $object;
     }
 
@@ -192,6 +191,19 @@ class FavoritePlugin extends ActivityHandlerPlugin
         }
     }
 
+    protected function notifyMentioned(Notice $stored, array &$mentioned_ids)
+    {
+        require_once INSTALLDIR.'/lib/mail.php';
+
+        foreach ($mentioned_ids as $id) {
+            $mentioned = User::getKV('id', $id);
+            if ($mentioned instanceof User && $mentioned->id != $stored->profile_id
+                    && $mentioned->email && $mentioned->emailnotifyfav) {   // do we have an email, and does user want it?
+                mail_notify_fave($mentioned, $stored->getProfile(), $stored->getParent());
+            }
+        }
+    }
+
     // API stuff
 
     /**