Merge mmn's 'nightly' changes

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

diff --git a/plugins/Favorite/FavoritePlugin.php b/plugins/Favorite/FavoritePlugin.php
index 144fef77978173c896d17dd5cbe70f10be752e85..9f2618d5821cceaa0104ba933426f55466fb1801 100644 (file)
--- a/plugins/Favorite/FavoritePlugin.php
+++ b/plugins/Favorite/FavoritePlugin.php
@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class FavoritePlugin extends ActivityHandlerPlugin
 {
+    protected $email_notify_fave = 1;
+
     public function tag()
     {
         return 'favorite';
@@ -46,6 +48,27 @@ class FavoritePlugin extends ActivityHandlerPlugin
         $schema->ensureTable('fave', Fave::schemaDef());
         return true;
     }
+
+    public function onStartUpgrade()
+    {
+        // This is a migration feature that will make sure we move
+        // certain User preferences to the Profile_prefs table.
+        // Introduced after commit b5fd2a048fc621ea05d756caba17275ab3dd0af4
+        // on Sun Jul 13 16:30:37 2014 +0200
+        $user = new User();
+        $user->whereAdd('emailnotifyfav IS NOT NULL');
+        if ($user->find()) {
+            printfnq("Detected old User table (emailnotifyfav IS NOT NULL). Moving 'emailnotifyfav' property to Profile_prefs...");
+            // Make sure we have our own tables setup properly
+            while ($user->fetch()) {
+                $user->setPref('email', 'notify_fave', $user->emailnotifyfav);
+                $orig = clone($user);
+                $user->emailnotifyfav = 'null';   // flag this preference as migrated
+                $user->update($orig);
+            }
+            printfnq("DONE.\n");
+        }
+    }
     
     public function onEndUpgrade()
     {
@@ -156,24 +179,32 @@ class FavoritePlugin extends ActivityHandlerPlugin
         if (!isset($options['created'])) {
             $options['created'] = !empty($act->time) ? common_sql_date($act->time) : common_sql_now();
         }
-        if (!isset($options['uri'])) {
-            $options['uri'] = !empty($act->id) ? $act->id : $act->selfLink;
-        }
 
         // We must have an objects[0] here because in isMyActivity we require the count to be == 1
         $actobj = $act->objects[0];
 
-        try {
-            $object = Fave::saveActivityObject($actobj, $stored);
-        } catch (ServerException $e) {
-            // Probably that the favored notice doesn't exist in our local database
-            // but may also be some missing profile or so, which we could catch in a
-            // more explicit catch-statement.
-            return null;
-        }
+        $object = Fave::saveActivityObject($actobj, $stored);
         return $object;
     }
 
+    // FIXME: Put this in lib/activityhandlerplugin.php when we're ready
+    //          with the other microapps/activityhandlers as well.
+    //          Also it should be StartNoticeAsActivity (with a prepped Activity, including ->context etc.)
+    public function onEndNoticeAsActivity(Notice $stored, Activity $act, Profile $scoped=null)
+    {
+        if (!$this->isMyNotice($stored)) {
+            return true;
+        }
+
+        common_debug('Extending activity '.$stored->id.' with '.get_called_class());
+        $this->extendActivity($stored, $act, $scoped);
+        return false;
+    }
+
+    public function extendActivity(Notice $stored, Activity $act, Profile $scoped=null)
+    {
+        Fave::extendActivity($stored, $act, $scoped);
+    }
 
     public function activityObjectFromNotice(Notice $notice)
     {
@@ -198,7 +229,7 @@ class FavoritePlugin extends ActivityHandlerPlugin
         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?
+                    && $mentioned->email && $mentioned->getPref('email', 'notify_fave', $this->email_notify_fave)) {   // do we have an email, and does user want it?
                 mail_notify_fave($mentioned, $stored->getProfile(), $stored->getParent());
             }
         }
@@ -390,6 +421,41 @@ class FavoritePlugin extends ActivityHandlerPlugin
         $supported = $supported || $cmd instanceof FavCommand;
     }
 
+    // Form stuff (settings etc.)
+
+    public function onEndEmailFormData(Action $action, Profile $scoped)
+    {
+        // getConfigData will fall back on systemwide default
+        // and we only wish to save numerical true or false.
+        $emailfave = $scoped->getPref('email', 'notify_fave', $this->email_notify_fave) ? 1 : 0;
+
+        $action->elementStart('li');
+        $action->checkbox('email-notify_fave',
+                        // TRANS: Checkbox label in e-mail preferences form.
+                        _('Send me email when someone adds my notice as a favorite.'),
+                        $emailfave);
+        $action->elementEnd('li');
+
+        return true;
+    }
+
+    public function onStartEmailSaveForm(Action $action, Profile $scoped)
+    {
+        $emailfave = $action->boolean('email-notify_fave') ? 1 : 0;
+        try {
+            if ($emailfave == $scoped->getPref('email', 'notify_fave')) {
+                // No need to update setting
+                return true;
+            }
+        } catch (NoResultException $e) {
+            // Apparently there's no previously stored setting, then continue to save it as it is now.
+        }
+
+        $scoped->setPref('email', 'notify_fave', $emailfave);
+
+        return true;
+    }
+
     // Layout stuff
 
     public function onEndPersonalGroupNav(Menu $menu, Profile $target, Profile $scoped=null)