fix: vendorize

Author: wilr

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "fullscreeninteractive/silverstripe-forum",
     "description": "Forum module for SilverStripe.",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "keywords": [
         "silverstripe",
         "forum"
@@ -15,6 +15,8 @@
     ],
     "require": {
         "silverstripe/cms": "^6",
+        "silverstripe/framework": "^6",
+        "silverstripe/vendor-plugin": "^2",
         "chriskonnertz/bbcode": "^1",
         "league/commonmark": "^2"
     },

src/Extensions/ForumMemberExtension.php

@@ -32,7 +32,7 @@ class ForumRole extends Extension
         'CityPublic' => 'Boolean',
         'CountryPublic' => 'Boolean',
         'EmailPublic' => 'Boolean',
-        'LastViewed' => 'SS_Datetime',
+        'LastViewed' => 'Datetime',
         'Signature' => 'Text',
         'ForumStatus' => 'Enum("Normal, Banned, Ghost", "Normal")',
         'SuspendedUntil' => 'Date'

src/Model/ForumThread.php

@@ -6,6 +6,7 @@
 use SilverStripe\ORM\DataObject;
 use FullscreenInteractive\SilverStripe\Forum\PageTypes\Forum;
 use SilverStripe\ORM\DB;
+use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\Security\Security;
 
 class ForumThread extends DataObject
@@ -27,6 +28,10 @@ class ForumThread extends DataObject
         'Posts' => Post::class
     ];
 
+    private static $cascade_deletes = [
+        'Posts'
+    ];
+
     private static $defaults = [
         'NumViews' => 0,
         'IsSticky' => false,
@@ -202,7 +207,7 @@ public function getHasSubscribed()
     {
         $member = Security::getCurrentUser();
 
-        return ($member) ? ForumThread_Subscription::already_subscribed($this->ID, $member->ID) : false;
+        return ($member) ? ForumThreadSubscription::singleton()->isSubscribed($this->ID, $member->ID) : false;
     }
 
     /**
@@ -239,92 +244,6 @@ public function onAfterWrite()
      */
     public function getEscapedTitle()
     {
-        //return DBField::create('Text', $this->dbObject('Title')->XML());
         return DBField::create_field('Text', $this->dbObject('Title')->XML());
     }
 }
-
-
-/**
- * Forum Thread Subscription: Allows members to subscribe to this thread
- * and receive email notifications when these topics are replied to.
- *
- * @package forum
- */
-class ForumThread_Subscription extends DataObject
-{
-
-    private static $db = array(
-        "LastSent" => "SS_Datetime"
-    );
-
-    private static $has_one = array(
-        "Thread" => "ForumThread",
-        "Member" => "Member"
-    );
-
-    /**
-     * Checks to see if a Member is already subscribed to this thread
-     *
-     * @param int $threadID The ID of the thread to check
-     * @param int $memberID The ID of the currently logged in member (Defaults to Member::currentUserID())
-     *
-     * @return bool true if they are subscribed, false if they're not
-     */
-    static function already_subscribed($threadID, $memberID = null)
-    {
-        if (!$memberID) {
-            $memberID = Member::currentUserID();
-        }
-        $SQL_threadID = Convert::raw2sql($threadID);
-        $SQL_memberID = Convert::raw2sql($memberID);
-
-        if ($SQL_threadID == '' || $SQL_memberID == '') {
-            return false;
-        }
-
-        return (DB::query("
-			SELECT COUNT(\"ID\")
-			FROM \"ForumThread_Subscription\"
-			WHERE \"ThreadID\" = '$SQL_threadID' AND \"MemberID\" = $SQL_memberID")->value() > 0) ? true : false;
-    }
-
-    /**
-     * Notifies everybody that has subscribed to this topic that a new post has been added.
-     * To get emailed, people subscribed to this topic must have visited the forum
-     * since the last time they received an email
-     *
-     * @param Post $post The post that has just been added
-     */
-    static function notify(Post $post)
-    {
-        $list = DataObject::get(
-            "ForumThread_Subscription",
-            "\"ThreadID\" = '" . $post->ThreadID . "' AND \"MemberID\" != '$post->AuthorID'"
-        );
-
-        if ($list) {
-            foreach ($list as $obj) {
-                $SQL_id = Convert::raw2sql((int)$obj->MemberID);
-
-                // Get the members details
-                $member = DataObject::get_one("Member", "\"Member\".\"ID\" = '$SQL_id'");
-                $adminEmail = Config::inst()->get('Email', 'admin_email');
-
-                if ($member) {
-                    $email = new Email();
-                    $email->setFrom($adminEmail);
-                    $email->setTo($member->Email);
-                    $email->setSubject(_t('Post.NEWREPLY', 'New reply for {title}', array('title' => $post->Title)));
-                    $email->setTemplate('ForumMember_TopicNotification');
-                    $email->populateTemplate($member);
-                    $email->populateTemplate($post);
-                    $email->populateTemplate(array(
-                        'UnsubscribeLink' => Director::absoluteBaseURL() . $post->Thread()->Forum()->Link() . '/unsubscribe/' . $post->ID
-                    ));
-                    $email->send();
-                }
-            }
-        }
-    }
-}

src/PageTypes/ForumController.php

@@ -197,7 +197,7 @@ public function markasspam(SS_HTTPRequest $request)
             // Suspend the member (rather than deleting him),
             // which gives him or a moderator the chance to revoke a decision.
             if ($author = $post->Author()) {
-                $author->SuspendedUntil = date('Y-m-d', strtotime('+99 years', SS_Datetime::now()->Format('U')));
+                $author->SuspendedUntil = date('Y-m-d', strtotime('+99 years', DBDatetime::now()->Format('U')));
                 $author->write();
             }