Changeset 1305

Timestamp:

02/21/11 20:23:52 (2 years ago)

Author:

Torben Brodt

Message:

• show rules to users registering with twitter
• twitter update job to fetch feeds

Location:

twitter

Files:

• de.xml (modified) (1 diff)
• eventlistener.xml (modified) (1 diff)
• files/lib/system/cronjob/TwitterUpdateJob.class.php (modified) (1 diff)
• files/lib/system/event/listener/UserLoginTwitterListener.class.php (modified) (3 diffs)
• install.sql (modified) (1 diff)
• package.xml (modified) (3 diffs)

twitter/de.xml

@@ -10 +10 @@
                 <item name="wcf.acp.option.twitter_user.description"><![CDATA[Geben Sie hier den Namen ihres Twitter Accounts ein.]]></item>
                 <item name="wcf.acp.option.twitter_consumer_key"><![CDATA[Consumer Key]]></item>
-                <item name="wcf.acp.option.twitter_consumer_key.description"><![CDATA[Geben Sie hier den Consumer Key ein, die Sie auf <a href="http://dev.twitter.com/apps">Twitter</a> erhalten haben.]]></item>
+                <item name="wcf.acp.option.twitter_consumer_key.description"><![CDATA[Geben Sie hier den Consumer Key ein, den Sie auf <a href="http://dev.twitter.com/apps">Twitter</a> erhalten haben.]]></item>
                 <item name="wcf.acp.option.twitter_consumer_secret"><![CDATA[Consumer Secret]]></item>
                 <item name="wcf.acp.option.twitter_consumer_secret.description"><![CDATA[Geben Sie hier das Consumer Secret ein, das Sie auf <a href="http://dev.twitter.com/apps">Twitter</a> erhalten haben.]]></item>

twitter/eventlistener.xml

@@ -3 +3 @@
 <data>
         <import>
+                <eventlistener>
+                        <eventclassname>SessionFactory</eventclassname>
+                        <eventname>didInit</eventname>
+                        <listenerclassfile>lib/system/event/listener/UserLoginTwitterListener.class.php</listenerclassfile>
+                </eventlistener>
                 <eventlistener>
                         <eventclassname>UserLoginForm</eventclassname>

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

@@ -11 +11 @@
  */
 class TwitterUpdateJob implements Cronjob {
-        
+
         /**
          * @see Cronjob::execute()
          */
         public function execute($data) {
-                $system_user = $this->getSystemUser();
-
-                // no system user yet?
-                if(!$system_user) {
-                        return;
-                }
+                $action = 'user_timeline';
         
-                $twitter = Twitter::getInstance();
-                
-                /*
-                        http://api.twitter.com/version/statuses/user_timeline.format
-                         * since_id
-                         * count
-                         * trim_user
-
-                        http://api.twitter.com/version/statuses/mentions.format
-                         * since_id
-                         * count
-                         * trim_user
-                         
-                        @return
-                         * text
-                         * id
-                */
-        }
-        
-        protected function getSystemUser() {
-                $sql = "SELECT          utt.*
+                $sql = "SELECT          *,
+                                        ta.screen_name = '".escapeString(TWITTER_USER)."' AS doSave
                         FROM            wcf".WCF_N."_twitter_account ta
                         INNER JOIN      wcf".WCF_N."_user_to_twitter utt ON utt.accountID = ta.accountID
-                        WHERE           ta.screen_name = '".escapeString(TWITTER_USER)."'";
-                return WCF::getDB()->getFirstRow($sql);
+                        LEFT JOIN       wcf".WCF_N."_twitter_import ti ON ti.accountID = ta.accountID
+                        WHERE           (ISNULL(ti.action) OR (ti.action = '".escapeString($action)."'))";
+
+                $result = WCF::getDB()->sendQuery($sql);
+                while ($row = WCF::getDB()->fetchArray($result)) {
+                        $this->load($row, $action);
+                }
+        }
+
+        /**
+         *
+         */
+        public function load($me, $action) {
+                $twitterObj = Twitter::getInstance();
+                $twitterObj->setToken($me['userToken'], $me['userSecret']);
+                
+                $opts = array(
+                        'since_id' => $me['since_id'],
+                        'trim_user' => 1,
+                );
+
+                $list = $twitterObj->get('/statuses/'.$action.'.json', $opts);
+                
+                foreach($list as $message) {
+                        if($me['doSave']) {
+                                // TODO: check column documentation
+                                $sql = 'INSERT IGNORE INTO twitter_message
+                                                (messageID, accountID, username, message, time)
+                                        VALUES ('.intval($message->id).', '.intval($me['accountID']).', 
+                                                "'.escapeString($me['screen_name']).'", "'.escapeString($message->text).'", 
+                                                '.intval($message->time).')';
+                                WCF::getDB()->sendQuery($sql);
+                        }
+                        
+                        // TODO: check wether the list is sorted ascending or descending
+                        // TODO: update useroption with current status
+                }
         }
 }

twitter/files/lib/system/event/listener/UserLoginTwitterListener.class.php

@@ -10 +10 @@
  */
 class UserLoginTwitterListener implements EventListener {
+        protected static $ignoreForms = array(
+                'rulesagree',
+                'userprofileedit',
+                'accountmanagement',
+        );
+        protected static $ignorePages = array(
+                'legalnotice'
+        );
 
         /**
@@ -20 +28 @@
                 
                 switch($className) {
+                        
+                        // did agree with rules?
+                        case 'SessionFactory':
+                                // didInit
+                                $this->validateRuleAgree($eventObj->session);
+                        break;
+                
                         // login or register with twitter
                         case 'UserLoginForm':
@@ -69 +84 @@
                 }
         }
+
+        /**
+         * 
+         */
+        protected function validateRuleAgree($session) {
+                
+                // if the modul deactivated, or the user must no agree the rules, we can leave the event.
+                // if we log out or on the rulesagree page, we also leave the event.
+                if (MODULE_RULE == 0 || $session->getUser()->getPermission('admin.general.canIgnoreRules')) return;
+                if ((isset($_REQUEST['action']) && strtolower($_REQUEST['action']) == 'userlogout') || (isset($_REQUEST['form']) && in_array(strtolower($_REQUEST['form']), self::$ignoreForms)) || (isset($_REQUEST['page']) && in_array(strtolower($_REQUEST['page']), self::$ignorePages))) return;
+                
+                // if the modul activate and the user is twitter user he must agree the rules after a change, and the user is not a guest.
+                if ($session->getUser()->userID && TwitterUtil::hasTwitterUser($session->getUser()->userID)) {
+                        // select all packageids of the packages where the user is agree with the rules.
+                        $packageIDs = $session->getVar('package_agrees');
+                        
+                        // if the packageid array null or the current package is not in the id, must check the agreement.
+                        if (is_null($packageIDs) || !in_array(PACKAGE_ID, $packageIDs)) {
+                                // we check the agreement, is the user agree with the rules, we put the package id in to the array and leave the event.
+                                if (Ruleset::isUserAgree($session->getUser()->userID, PACKAGE_ID)) {
+                                        if (is_null($packageIDs) || !is_array($packageIDs)) 
+                                                $packageIDs = array(PACKAGE_ID);
+                                        else $packageIDs[] = PACKAGE_ID;
+                                                $session->register('package_agrees', $packageIDs);
+                                        return;
+                                }
+                                HeaderUtil::redirect('index.php?form=RulesAgree'.SID_ARG_2ND_NOT_ENCODED, false);
+                                exit;
+                        }
+                }
+        }
 }
 ?>

twitter/install.sql

@@ -25 +25 @@
         KEY (accountID)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS wcf1_twitter_import;
+CREATE TABLE wcf1_twitter_import (
+        accountID BIGINT unsigned NOT NULL,
+        action VARCHAR(255) NULL,
+        since_id BIGINT unsigned NOT NULL,
+        UNIQUE KEY (accountID, action)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

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.0.0</version>
+                <version>2.1.0</version>
                 <date>DATE</date>
                 <isunique>1</isunique>
@@ -36 +36 @@
                 <!-- languages -->
                 <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de.xml</languages>
                 <languages languagecode="en">en.xml</languages>
+        </instructions>
+        <instructions type="update" fromversion="2.0.0">
+                <files>files.tar</files>
+                <eventlistener>eventlistener.xml</eventlistener>
+                <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de.xml</languages>
         </instructions>
         <instructions type="update" fromversion="1.1.2">
@@ -55 +62 @@
                 <!-- languages -->
                 <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de.xml</languages>
                 <languages languagecode="en">en.xml</languages>
         </instructions>