[ActivityPub] Move models from 'classes' to 'lib/models'

plugins/ActivityPub/ActivityPubPlugin.php

@@ -26,13 +26,14 @@
 
 defined('GNUSOCIAL') || die();
 
-// Import required files by the plugin
+// Import plugin libs
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'httpsignature.php';
+foreach (glob(__DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . '*.php') as $filename) {
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'discoveryhints.php';
+    require_once $filename;
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'explorer.php';
+}
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'postman.php';
+// Import plugin models
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'inbox_handler.php';
+foreach (glob(__DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'models' . DIRECTORY_SEPARATOR . '*.php') as $filename) {
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'activitypubqueuehandler.php';
+    require_once $filename;
+}
 
 // So that this isn't hardcoded everywhere
 define('ACTIVITYPUB_BASE_ACTOR_URI', common_root_url().'index.php/user/');

plugins/ActivityPub/lib/models/Activitypub_accept.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_accept extends Managed_DataObject
+class Activitypub_accept
 {
     /**
      * Generates an ActivityPub representation of a Accept

plugins/ActivityPub/lib/models/Activitypub_announce.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_announce extends Managed_DataObject
+class Activitypub_announce
 {
     /**
      * Generates an ActivityPub representation of a Announce

plugins/ActivityPub/lib/models/Activitypub_attachment.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_attachment extends Managed_DataObject
+class Activitypub_attachment
 {
     /**
      * Generates a pretty array from an Attachment object

plugins/ActivityPub/lib/models/Activitypub_create.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_create extends Managed_DataObject
+class Activitypub_create
 {
     /**
      * Generates an ActivityPub representation of a Create

plugins/ActivityPub/lib/models/Activitypub_delete.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_delete extends Managed_DataObject
+class Activitypub_delete
 {
     /**
      * Generates an ActivityPub representation of a Delete

plugins/ActivityPub/lib/models/Activitypub_error.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_error extends Managed_DataObject
+class Activitypub_error
 {
     /**
      * Generates a pretty error from a string

plugins/ActivityPub/lib/models/Activitypub_follow.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_follow extends Managed_DataObject
+class Activitypub_follow
 {
     /**
      * Generates an ActivityPub representation of a subscription

plugins/ActivityPub/lib/models/Activitypub_like.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_like extends Managed_DataObject
+class Activitypub_like
 {
     /**
      * Generates an ActivityPub representation of a Like

plugins/ActivityPub/lib/models/Activitypub_mention_tag.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_mention_tag extends Managed_DataObject
+class Activitypub_mention_tag
 {
     /**
      * Generates an ActivityPub representation of a Mention Tag

plugins/ActivityPub/lib/models/Activitypub_notice.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_notice extends Managed_DataObject
+class Activitypub_notice
 {
     /**
      * Generates a pretty notice from a Notice object

plugins/ActivityPub/lib/models/Activitypub_reject.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_reject extends Managed_DataObject
+class Activitypub_reject
 {
     /**
      * Generates an ActivityPub representation of a Reject

plugins/ActivityPub/lib/models/Activitypub_tag.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_tag extends Managed_DataObject
+class Activitypub_tag
 {
     /**
      * Generates a pretty tag from a Tag object

plugins/ActivityPub/lib/models/Activitypub_undo.php

@@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die();
  * @author    Diogo Cordeiro <diogo@fc.up.pt>
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Activitypub_undo extends Managed_DataObject
+class Activitypub_undo
 {
     /**
      * Generates an ActivityPub representation of a Undo