Changeset 1336

Timestamp:

03/20/11 19:44:26 (2 years ago)

Author:

Torben Brodt

Message:

start with twitter 2.2.0, better modeling and event api

Location:

twitter

Files:

• files/lib/data/twitter/TwitterMessage.class.php (added)
• files/lib/data/twitter/TwitterMessageEditor.class.php (added)
• files/lib/data/twitter/ViewableTwitterMessage.class.php (modified) (3 diffs)
• files/lib/system/cronjob/TwitterUpdateJob.class.php (modified) (1 diff)
• package.xml (modified) (1 diff)

twitter/files/lib/data/twitter/ViewableTwitterMessage.class.php

@@ -1 +1 @@
 <?php
 // wcf imports
-require_once(WCF_DIR.'lib/data/DatabaseObject.class.php');
+require_once(WCF_DIR.'lib/data/twitter/TwitterMessage.class.php');
 require_once(WCF_DIR.'lib/data/user/UserProfile.class.php');
 
@@ -12 +12 @@
  * @package     de.easy-coding.wcf.twitter
  */
-class ViewableTwitterMessage extends DatabaseObject {
+class ViewableTwitterMessage extends TwitterMessage {
 
         /**
          * owner object
          *
-         * @var TwitterOwner
+         * @var UserProfile
          */
         protected $user = null;
-
-        /**
-         * Creates a new ViewableTwitter object.
-         *
-         * @param       integer         $messageID
-         * @param       array<mixed>    $row
-         */
-        public function __construct($messageID, $row = null) {
-                DatabaseObject::__construct($row);
-        }
         
         /**
@@ -65 +55 @@
          */
         public function __toString() {
-                return "".$this->title;
+                return "".$this->message;
         }
         
+        /**
+         * @return      UserProfile
+         */
         public function getUser() {
                 return $this->user;

twitter/files/lib/system/cronjob/TwitterUpdateJob.class.php

@@ -118 +118 @@
 
                         $this->updateAccount($message->user);
-
-                        // create message
-                        $sql = 'INSERT INTO 
-                                        wcf'.WCF_N.'_twitter_message
-                                        (tweetID, accountID, username, message, time)
-                                VALUES ('.intval($message->id).', '.intval($message->user->id).', 
-                                        "'.escapeString($message->user->screen_name).'", "'.escapeString($message->text).'", 
-                                        '.intval(strtotime($message->created_at)).')';
-
-                        try  {
-                                WCF::getDB()->sendQuery($sql);
-                                $messageID = WCF::getDB()->getInsertID("wcf".WCF_N."_twitter_message", 'messageID');
-
-                        } catch(Exception $e) {
+                        
+                        $entry = TwitterMessageEditor::create($message);
+                        
+                        if($entry) {
+                                $messageID = $entry->messageID;
+                        } else {
                                 $sql = 'SELECT  messageID
                                         FROM    wcf'.WCF_N.'_twitter_message

twitter/package.xml

@@ -4 +4 @@
                 <packagename><![CDATA[Twitter (WCF)]]></packagename>
                 <packagedescription><![CDATA[Twitter is a service for friends, family, and co–workers to communicate and stay connected through the exchange of quick, frequent answers to one simple question: What are you doing?]]></packagedescription>
-                <version>2.1.0</version>
+                <version>2.2.0</version>
                 <date>DATE</date>
                 <isunique>1</isunique>