Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / ActivitySpam / ActivitySpamPlugin.php

diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php
index 975fc6885c0c3be709c90c1b9553c8bc98b2c297..ca31c7ac8e7ea596a7d39fd6c1c3f5db39b704f8 100644 (file)
--- a/plugins/ActivitySpam/ActivitySpamPlugin.php
+++ b/plugins/ActivitySpam/ActivitySpamPlugin.php
@@ -92,38 +92,6 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Load related modules when needed
-     *
-     * @param string $cls Name of the class to be loaded
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     */
-
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'TrainAction':
-        case 'SpamAction':
-            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        case 'Spam_score':
-            include_once $dir . '/'.$cls.'.php';
-            return false;
-        case 'SpamFilter':
-        case 'SpamNoticeStream':
-        case 'TrainSpamForm':
-        case 'TrainHamForm':
-            include_once $dir . '/'.strtolower($cls).'.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     /**
      * When a notice is saved, check its spam score
      * 
@@ -132,7 +100,7 @@ class ActivitySpamPlugin extends Plugin
      * @return boolean hook value; true means continue processing, false means stop.
      */
 
-    function onEndNoticeSave($notice)
+    function onEndNoticeSave(Notice $notice)
     {
         try {
 
@@ -150,7 +118,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onNoticeDeleteRelated($notice) {
+    function onNoticeDeleteRelated(Notice $notice) {
         $score = Spam_score::getKV('notice_id', $notice->id);
         if (!empty($score)) {
             $score->delete();
@@ -158,7 +126,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onUserRightsCheck($profile, $right, &$result) {
+    function onUserRightsCheck(Profile $profile, $right, &$result) {
         switch ($right) {
         case self::REVIEWSPAM:
         case self::TRAINSPAM:
@@ -176,6 +144,9 @@ class ActivitySpamPlugin extends Plugin
 
     function onEndShowNoticeOptionItems($nli)
     {
+        // FIXME: Cannot use type-hint NoticeListItem as NoticeListItemAdapter exists, too!
+        assert(is_object($nli));
+
         $profile = Profile::current();
 
         if (!empty($profile) && $profile->hasRight(self::TRAINSPAM)) {
@@ -207,12 +178,12 @@ class ActivitySpamPlugin extends Plugin
     /**
      * Map URLs to actions
      *
-     * @param Net_URL_Mapper $m path-to-action mapper
+     * @param URLMapper $m path-to-action mapper
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
 
-    function onRouterInitialized($m)
+    public function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/train/spam',
                     array('action' => 'train', 'category' => 'spam'));
@@ -223,7 +194,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onEndShowStyles($action)
+    function onEndShowStyles(Action $action)
     {
         $action->element('style', null,
                          '.form-train-spam input.submit { background: url('.$this->path('icons/bullet_black.png').') no-repeat 0px 0px } ' . "\n" .
@@ -231,7 +202,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onEndPublicGroupNav($nav)
+    function onEndPublicGroupNav(Menu $nav)
     {
         $user = common_current_user();
 
@@ -247,10 +218,10 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ActivitySpam',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:ActivitySpam',
                             'description' =>
@@ -258,7 +229,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onEndNoticeInScope($notice, $profile, &$bResult)
+    function onEndNoticeInScope(Notice $notice, Profile $profile, &$bResult)
     {
         if ($this->hideSpam) {
             if ($bResult) {
@@ -281,12 +252,9 @@ class ActivitySpamPlugin extends Plugin
     /**
      * Pre-cache our spam scores if needed.
      */
-    function onEndNoticeListPrefill(&$notices, &$profiles, $avatarSize) {
+    function onEndNoticeListPrefill(array &$notices, array &$profiles, array $notice_ids, Profile $scoped=null) {
         if ($this->hideSpam) {
-            foreach ($notices as $notice) {
-                $ids[] = $notice->id;
-            }
-            Memcached_DataObject::multiGet('Spam_score', 'notice_id', $ids);
+            Spam_score::multiGet('notice_id', $notice_ids);
         }
         return true;
     }