Index: twitter/twitterbot.pl
===================================================================
--- twitter/twitterbot.pl	(revision f3ef4f6728c7e6bfbd340eadb7baef02f20d4697)
+++ twitter/twitterbot.pl	(revision 567a134d7d421d2c54b5fff0ed25d9a5514d2285)
@@ -156,7 +156,9 @@
                     status_id   => $res->{id},
                     text        => $res->{text},
+                    user_id     => $res->{user}{id},
                 };
                 if ($res->{retweeted_status}) {
-                    $id->{type} = 'retweet';
+                    $id->{retweet_of}   = $res->{retweeted_status}{id};
+                    $id->{type}         = 'retweet';
                 }
                 else {
@@ -207,4 +209,5 @@
                     text        => $_->{text},
                     type        => 'mention',
+                    user_id     => $_->{user}{id},
                 }
             } @{$res}