summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/twittersettings.php68
-rw-r--r--lib/common.php7
-rw-r--r--lib/util.php17
3 files changed, 46 insertions, 46 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index d37c042ac..fc89ca2ad 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -69,21 +69,19 @@ class TwittersettingsAction extends SettingsAction {
common_element('h2', NULL, _('Preferences'));
- if ($flink) {
- common_checkbox('noticesync', _('Automatically send my notices to Twitter.'),
- ($flink->noticesync > 0) ? true : false);
+ common_checkbox('noticesync', _('Automatically send my notices to Twitter.'),
+ ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
- common_checkbox('replysync', _('Don\'t send local "@" replies to Twitter.'),
- ($flink->noticesync == 3) ? true : false, NULL, 'true');
+ common_checkbox('replysync', _('Send local "@" replies to Twitter.'),
+ ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : false);
- common_checkbox('friendsync', _('Subscribe to my Twitter friends here.'),
- ($flink->friendsync) ? true : false, NULL, 'true', true);
+ common_checkbox('friendsync', _('Subscribe to my Twitter friends here.'),
+ ($flink) ? ($flink->friendsync & FOREIGN_FRIEND_RECV) : false,
+ NULL, 'true', true);
+ if ($flink) {
common_submit('save', _('Save'));
} else {
- common_checkbox('noticesync', _('Automatically send my notices to Twitter.'), true);
- common_checkbox('replysync', _('Don\'t send local "@" replies to Twitter.'), false, NULL, 'true');
- common_checkbox('friendsync', _('Subscribe to my Twitter friends here.'), false, NULL, 'true', true);
common_submit('add', _('Add'));
}
@@ -163,18 +161,8 @@ class TwittersettingsAction extends SettingsAction {
$flink->credentials = $twitter_password;
$flink->created = common_sql_now();
- if ($noticesync) {
- if ($replysync) {
- $flink->noticesync = 3;
- } else {
- $flink->noticesync = 1;
- }
- } else {
- $flink->noticesync = 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) {
@@ -241,19 +229,8 @@ class TwittersettingsAction extends SettingsAction {
$flink->query('BEGIN');
$original = clone($flink);
-
- if ($noticesync) {
- if ($replysync) {
- $flink->noticesync = 3;
- } else {
- $flink->noticesync = 1;
- }
- } else {
- $flink->noticesync = 0;
- }
-
- $flink->friendsync = ($friendsync) ? 2 : 0;
- // $flink->profilesync = 0; // XXX: leave as default?
+
+ $this->set_flags($flink, $noticesync, $replysync, $friendsync);
$result = $flink->update($original);
@@ -335,4 +312,25 @@ class TwittersettingsAction extends SettingsAction {
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
diff --git a/lib/common.php b/lib/common.php
index 60c820ee6..015ecd639 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -28,6 +28,13 @@ define('MAX_AVATAR_SIZE', 256 * 1024);
define('NOTICES_PER_PAGE', 20);
+define('FOREIGN_NOTICE_SEND', 1);
+define('FOREIGN_NOTICE_RECV', 2);
+define('FOREIGN_NOTICE_SEND_REPLY', 4);
+
+define('FOREIGN_FRIEND_SEND', 1);
+define('FOREIGN_FRIEND_RECV', 2);
+
define_syslog_variables();
# append our extlib dir as the last-resort place to find libs
diff --git a/lib/util.php b/lib/util.php
index a45f4a214..901e3ac46 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1110,17 +1110,12 @@ function common_broadcast_notice($notice, $remote=false) {
// Check to see if notice should go to Twitter
$flink = Foreign_link::getForeignLink($notice->profile_id, 1); // 1 == Twitter
- if ($flink->noticesync >= 1) {
- $ok_to_send = true;
-
- // Check to see whether user wants to filter @-replies
- if ($flink->noticesync == 3) {
- if (preg_match('/(?:^|\s)@([A-Za-z0-9_\-\.]{1,64})/', $notice->content)) {
- $ok_to_send = false;
- }
- }
-
- if ($ok_to_send) {
+ if ($flink->noticesync & FOREIGN_NOTICE_SEND) {
+
+ // If it's not a reply, or if the user WANTS to send replies...
+
+ if (!$notice->reply_to || ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
+
$result = common_twitter_broadcast($notice, $flink);
if (!$result) {