$flink = Foreign_link::getForeignLink($user->id, 1); // 1 == Twitter
if ($flink) {
- $fuser = Foreign_user::staticGet('user_id', $flink->user_id);
+ $fuser = Foreign_user::getForeignUser($flink->foreign_id, 1);
}
$this->form_header(_('Twitter settings'), $msg, $success);
common_element('span', 'twitter_user', $fuser->nickname);
common_element('a', array('href' => $fuser->uri), $fuser->uri);
common_element('span', 'input_instructions',
- _('Current verified Twitter User'));
- common_hidden('flink_user_id', $flink->user_id);
+ _('Current verified Twitter account.'));
+ common_hidden('flink_foreign_id', $flink->foreign_id);
common_element_end('p');
common_submit('remove', _('Remove'));
} else {
common_element('h2', NULL, _('Preferences'));
+ common_checkbox('noticesync', _('Automatically send my notices to Twitter.'),
+ ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
+
+ common_checkbox('replysync', _('Send local "@" replies to Twitter.'),
+ ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
+
+ common_checkbox('friendsync', _('Subscribe to my Twitter friends here.'),
+ ($flink) ? ($flink->friendsync & FOREIGN_FRIEND_RECV) : false,
+ NULL, 'true', true);
+
if ($flink) {
- common_checkbox('noticesync', _('Automatically send my notices to Twitter.'),
- ($flink->noticesync) ? true : false);
- common_checkbox('friendsync', _('Subscribe to my Twitter friends here.'),
- ($flink->friendsync) ? true : false);
common_submit('save', _('Save'));
} else {
- common_checkbox('noticesync', _('Automatically send my notices to Twitter.'), true);
- common_checkbox('friendsync', _('Subscribe to my Twitter friends here.'), true);
common_submit('add', _('Add'));
}
$twitter_username = $this->trimmed('twitter_username');
$twitter_password = $this->trimmed('twitter_password');
$noticesync = $this->boolean('noticesync');
+ $replysync = $this->boolean('replysync');
$friendsync = $this->boolean('friendsync');
if (!Validate::string($twitter_username, array('min_length' => 1,
- 'max_length' => 64,
- 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
- $this->show_form(_('Username must have only lowercase letters and numbers and no spaces.'));
+ 'max_length' => 15,
+ 'format' => VALIDATE_NUM . VALIDATE_ALPHA . '_'))) {
+ $this->show_form(_('Username must have only numbers, upper- and lowercase letters, and underscore (_). 15 chars max.'));
return;
}
// Now that we have a valid Twitter user, we have to make another api call to
// find its Twitter ID. Dumb, but true.
- $twitter_id = $this->get_twitter_id($twitter_username);
+ $twitter_id = $this->get_twitter_id($twitter_username, $twitter_password);
if (!$twitter_id) {
$this->show_form(sprintf(_('Unable to retrieve account information for "%s" from Twitter.'), $twitter_username));
$flink->service = 1; // Twitter
$flink->credentials = $twitter_password;
$flink->created = common_sql_now();
- $flink->noticesync = ($noticesync) ? 1 : 0;
- $flink->friendsync = ($friendsync) ? 2 : 0;
- $flink->profilesync = 0; // XXX: leave as default?
+
+ $this->set_flags($flink, $noticesync, $replysync, $friendsync);
+
$flink_id = $flink->insert();
if (!$flink_id) {
// For now we assume one Twitter acct per Laconica acct
$flink = Foreign_link::getForeignLink($user->id, 1);
$fuser = Foreign_user::getForeignUser($flink->foreign_id, 1);
- $flink_user_id = $this->arg('flink_user_id');
+ $flink_foreign_id = $this->arg('flink_foreign_id');
if (!$flink) {
common_debug("couldn't get flink");
}
# Maybe an old tab open...?
- if ($flink->user_id != $flink_user_id) {
+ if ($flink->foreign_id != $flink_foreign_id) {
common_debug("flink user_id = " . $flink->user_id);
$this->show_form(_('That is not your Twitter account.'));
return;
$result = $fuser->delete();
if (!$result) {
- common_log_db_error($flink, 'DELETE', __FILE__);
+ common_log_db_error($fuser, 'DELETE', __FILE__);
$this->show_form(_('Couldn\'t remove Twitter user.'));
return;
}
function save_preferences() {
$noticesync = $this->boolean('noticesync');
$friendsync = $this->boolean('friendsync');
+ $replysync = $this->boolean('replysync');
+
$user = common_current_user();
$flink = Foreign_link::getForeignLink($user->id, 1);
return;
}
- $flink->noticesync = ($noticesync) ? 1 : 0;
- $flink->friendsync = ($friendsync) ? 2 : 0;
- // $flink->profilesync = 0; // XXX: leave as default?
- $result = $flink->update();
+ $flink->query('BEGIN');
- if (!$result) {
+ $original = clone($flink);
+
+ $this->set_flags($flink, $noticesync, $replysync, $friendsync);
+
+ $result = $flink->update($original);
+
+ if ($result === FALSE) {
common_log_db_error($flink, 'UPDATE', __FILE__);
$this->show_form(_('Couldn\'t save Twitter preferences.'));
return;
}
+ $flink->query('COMMIT');
+
$this->show_form(_('Twitter preferences saved.'));
return;
}
- function get_twitter_id($twitter_username) {
- $uri = "http://twitter.com/users/show/$twitter_username.json";
- $data = $this->get_twitter_data($uri);
+ function get_twitter_id($user, $password) {
+ $uri = "http://twitter.com/users/show/$user.json";
+ $data = $this->get_twitter_data($uri, $user, $password);
if (!$data) {
return NULL;
return $data;
}
+ function set_flags(&$flink, $noticesync, $replysync, $friendsync) {
+ if ($noticesync) {
+ $flink->noticesync |= FOREIGN_NOTICE_SEND;
+ } else {
+ $flink->noticesync &= ~FOREIGN_NOTICE_SEND;
+ }
+
+ if ($replysync) {
+ $flink->noticesync |= FOREIGN_NOTICE_SEND_REPLY;
+ } else {
+ $flink->noticesync &= ~FOREIGN_NOTICE_SEND_REPLY;
+ }
+
+ if ($friendsync) {
+ $flink->friendsync |= FOREIGN_FRIEND_RECV;
+ } else {
+ $flink->friendsync &= ~FOREIGN_FRIEND_RECV;
+ }
+
+ $flink->profilesync = 0; // XXX: leave as default?
+ }
}
\ No newline at end of file