Changeset 20338

Timestamp:

10/01/08 07:41:06 (3 months ago)

Author:

anatoo

Message:

メール周り追加

Location:

events/phpframework/plain_php/trunk/model

Files:

• mail (added)
• mail/mail.php (added)
• phwittr/AcountService.php (modified) (6 diffs)
• phwittr/FriendshipService.php (modified) (1 diff)
• phwittr/PhwittrFront.php (modified) (2 diffs)
• phwittr/StatusService.php (modified) (2 diffs)
• phwittr/TimelineService.php (modified) (5 diffs)

events/phpframework/plain_php/trunk/model/phwittr/AcountService.php

@@ -3 +3 @@
 class AcountService
 {
+    /**
+     * @var PDO
+     */
     protected $pdo;
     
@@ -36 +39 @@
         $smt->bindValue(':delete_flag', $delete_flag, PDO::PARAM_INT);
         $smt->execute();
-        return $smt->rowCount() === 1 ? true : false;
+        return $smt->rowCount() === 1;
     }
     function updatePicture($user_id, $image)
@@ -50 +53 @@
         }
         $smt->execute();
-        return $smt->rowCount() === 1 ? true : false ;
+        return $smt->rowCount() === 1;
     }
     function updatePassword($user_id, $password)
@@ -61 +64 @@
         $smt->bindValue(':password', $password, PDO::PARAM_STR);
         $smt->execute();
-        return $smt->rowCount() === 1 ? true : false;
+        return $smt->rowCount() === 1;
     }
     function updateEmail($user_id, $email)
@@ -70 +73 @@
         $smt->bindValue(':email', $email, PDO::PARAM_STR);
         $smt->execute();
-        return $smt->rowCount() === 1 ? true : false;
+        return $smt->rowCount() === 1;
     }
     
@@ -94 +97 @@
         $smt->bindValue(':act_key', $act_key, PDO::PARAM_STR);
         $smt->execute();
-        return $smt->rowCount() === 1 ? true : false ;
+        return $smt->rowCount() === 1;
     }
     
     function setPrivate($user_id)
     {
-        // @todo 後で実装する
-        return true;
+        $smt = $this->pdo->prepare('
+            update users set private_flag = 1 where id = :user_id limit 1
+        ');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->execute();
+        return $smt->rowCount() === 1;
     }
     function setPublic($user_id)
     {
-        // @todo 後で実装する
+        $this->pdo->beginTransaction();
+        
+        $smt = $this->pdo->prepare('
+            update users set private_flag = 0 where id = :user_id limit 1
+        ');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->execute();
+        
+        if (!$smt->rowCount() === 1) {
+            $this->pdo->rollBack();
+            return false;
+        }
+        
+        $smt = $this->pdo->prepare('
+            select * from requests
+            where request_id = :user_id
+        ');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->execute();
+        $arr = $smt->fetchAll(PDO::FETCH_ASSOC); // $user_idをリクエストしている行列を得る
+        if ($arr == false) {
+            $this->pdo->commit();
+            return true;
+        }
+        
+        foreach ($arr as $r) {
+            $smt = $this->pdo->prepare('
+                insert into 
+                followers(user_id, follow_id, created_at) 
+                values(:user_id, :follow_id, NOW())
+            ');
+            $smt->bindValue(':user_id', $r['user_id'], PDO::PARAM_INT);
+            $smt->bindValue(':follow_id', $user_id, PDO::PARAM_INT);
+            $smt->execute();
+        }
+        
+        $smt = $this->pdo->prepare('
+            delete from requests where request_id = :user_id
+        ');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->execute();
+        
+        $this->pdo->commit();
         return true;
     }

events/phpframework/plain_php/trunk/model/phwittr/FriendshipService.php

@@ -80 +80 @@
     }
     
-    function follow($user_id, $follow_user_name)
+    function follow($user_id, $follow_user_id)
     {
         $smt = $this->pdo->prepare('
             insert into followers(user_id, follow_id, created_at) 
-            values(:user_id, (select id from users where user_name = 
-            :follow_user_name), now())');
+            values(:user_id, :follow_user_id, now())');
         $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
-        $smt->bindValue(':follow_user_name', $follow_user_name, PDO::PARAM_STR);
+        $smt->bindValue(':follow_user_id', $follow_user_id, PDO::PARAM_INT);
         $smt->execute();
     }
 
-    function unfollow($user_id, $follow_user_name)
+    function request($user_id, $request_user_id)
+    {
+        $smt = $this->pdo->prepare('
+            insert into requests(user_id, request_id, created_at) 
+            values(:user_id, :request_user_id, now())
+        ');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->bindValue(':request_user_id', $request_user_id, PDO::PARAM_INT);
+        $smt->execute();
+    }
+    
+    function accept($user_id, $accept_user_id)
+    {
+        $this->pdo->beginTransaction();
+        $this->deny($user_id, $accept_user_id);
+        $this->follow($accept_user_id, $user_id);
+        $this->pdo->commit();
+    }
+
+    function deny($user_id, $deny_user_id)
+    {
+        $smt = $this->pdo->prepare(
+            'delete from requests where user_id = :deny_user_id and ' .
+            'request_id = :user_id');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->bindValue(':deny_user_id', $deny_user_id, PDO::PARAM_INT);
+        $smt->execute();
+    }
+    
+    function unfollow($user_id, $follow_user_id)
     {
         $smt = $this->pdo->prepare(
             'delete from followers where user_id = :user_id and ' .
-            'follow_id = (select id from users where user_name = :follow_user_name)');
+            'follow_id = :follow_user_id');
         $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
-        $smt->bindValue(':follow_user_name', $follow_user_name, PDO::PARAM_STR);
+        $smt->bindValue(':follow_user_id', $follow_user_id, PDO::PARAM_INT);
         $smt->execute();
     }
     
-    
+    function isFollowing($user_id, $follow_id)
+    {
+        $smt = $this->pdo->prepare('
+            select followers.user_id 
+            from followers 
+            where user_id = :user_id and follow_id = :follow_id
+            limit 1
+        ');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->bindValue(':follow_id', $follow_id, PDO::PARAM_INT);
+        $smt->execute();
+        
+        return $smt->fetch(PDO::FETCH_ASSOC) !== false;
+    }
+    function isRequesting($user_id, $follow_id)
+    {
+        $smt = $this->pdo->prepare('
+            select requests.user_id 
+            from requests
+            where user_id = :user_id and request_id = :follow_id
+            limit 1
+        ');
+        $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
+        $smt->bindValue(':follow_id', $follow_id, PDO::PARAM_INT);
+        $smt->execute();
+        
+        return $smt->fetch(PDO::FETCH_ASSOC) !== false;
+    }
 }

events/phpframework/plain_php/trunk/model/phwittr/PhwittrFront.php

@@ -39 +39 @@
                      '/(home|replies|public_timeline)'
                         => 'TimelineAction' ,
+                     '/public_timeline/rss'
+                        => 'PublicTimelineRssAction' ,
                      '/status/update'
                         => 'StatusUpdateAction' ,
+                     '/status/update/ajax'
+                        => 'StatusUpdateAjaxAction' ,
                      '/status/delete/([0-9]+)/([[:word:]]+)'
                         => 'StatusDeleteAction' ,
@@ -51 +55 @@
                      '/friendships/create/([0-9]+)/([[:word:]]+)'
                         => 'FollowAction' ,
-                     '/friendships/delete/([0-9]+)/([[:word:]]+)'
+                     '/friendships/destroy/([0-9]+)/([[:word:]]+)'
                         => 'RemoveAction' ,
-                     '/friend_requests/accept/[0-9]+'
-                        => 'RequestAcceptAction' ,
-                     '/friend_requests/deny/[0-9]+'
-                        => 'RequestDenyAction' ,
+                     '/friend_requests/(accept|deny)/([0-9]+)/([[:word:]]+)'
+                        => 'RequestHandleAction' ,
                      '/?'
                         => 'DefaultAction' ,
                      '/([[:word:]]+)'
                         => 'UserAction',
+                     '/([[:word:]]+)/rss'
+                        => 'UserRssAction',
                      '/([[:word:]]+)/friends'
                         => 'UserFriendsAction',

events/phpframework/plain_php/trunk/model/phwittr/StatusService.php

@@ -4 +4 @@
 {
     protected $pdo;
-    function __construct(PDO $pdo)
+    function __construct(PDO $pdo, $base_url)
     {
         $this->pdo = $pdo;
+        $this->baseUrl = $base_url;
     }
     function reply($user_id, $comment, $reply_user_id)
@@ -48 +49 @@
         $smt->execute();
         
-        return $smt->fetch(PDO::FETCH_ASSOC);
+        $s = $smt->fetch(PDO::FETCH_ASSOC);
+        
+        if ($s) $s = $this->processStatus($s);
+        return $s;
     }
-        
+    protected function processStatus($status)
+    {
+        $status['title_comment'] = h($status['comment']);
+        $status['comment'] = preg_replace('#(https?://[[:alnum:]+$;?.%,!\#~*/:@&=_-]+)#', '<a href="$1">$1</a>' , h($status['comment']));
+        $status['comment'] = preg_replace('#@([[:word:]]{1,30})#', 
+                                '@<a href="' . $this->baseUrl . '/$1">$1</a>', 
+                                $status['comment']);
+        return $status;
+    }
 }
 

events/phpframework/plain_php/trunk/model/phwittr/TimelineService.php

@@ -3 +3 @@
 class TimelineService
 {
-    protected $pdo, $context;
-    function __construct(PDO $pdo, ApplicationContext $context)
+    protected $pdo, $baseUrl;
+    function __construct(PDO $pdo, $base_url)
     {
         $this->pdo = $pdo;
-        $this->context = $context;
+        $this->baseUrl = $base_url;
     }
     function fetchPublicTimeline($offset, $limit)
@@ -55 +55 @@
     {
         $smt = $this->pdo->prepare('
-            select statuses.* from statuses 
+            select statuses.*, users.user_name, users.image from statuses 
             left join users on users.id = statuses.user_id where users.id = :user_id 
             order by statuses.created_at desc 
@@ -92 +92 @@
             select count(users.id) 
                 from statuses left join users on users.id = statuses.user_id
-                     left join followers f1 on f1.user_id = users.id
-                      
-                where users.delete_flag = 0 and f1.follow_id = :user_id
-                      or users.id = :user_id');
+                              left join (select * from followers where user_id = :user_id) f1 on f1.follow_id = users.id
+                          
+                where users.delete_flag = 0 and f1.user_id = :user_id
+                      or users.id = :user_id ');
         
         $smt->bindValue(':user_id', $user_id, PDO::PARAM_INT);
@@ -105 +105 @@
             select users.user_name, users.image, statuses.* 
                 from statuses left join users on users.id = statuses.user_id
-                              left join followers f1 on f1.user_id = users.id
+                              left join (select * from followers where user_id = :user_id) f1 on f1.follow_id = users.id
                           
-                where users.delete_flag = 0 and f1.follow_id = :user_id
+                where users.delete_flag = 0 and f1.user_id = :user_id
                       or users.id = :user_id 
                        
@@ -138 +138 @@
         $status['comment'] = preg_replace('#(https?://[[:alnum:]+$;?.%,!\#~*/:@&=_-]+)#', '<a href="$1">$1</a>' , h($status['comment']));
         $status['comment'] = preg_replace('#@([[:word:]]{1,30})#', 
-                                '@<a href="' . $this->context->baseUrl . '/$1">$1</a>', 
+                                '@<a href="' . $this->baseUrl . '/$1">$1</a>', 
                                 $status['comment']);
         return $status;