From 53cabc0171f6628f428fbc02a6ae48dcab5e4c6d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Sun, 4 Jan 2009 23:56:03 -0500 Subject: trac750 added some output to the facebook_update.php script darcs-hash:20090105045603-7b5ce-2cef1b92d9c91b0db70269d94f42ae06076229b2.gz --- _darcs/inventory | 4 +- ...5ce-2cef1b92d9c91b0db70269d94f42ae06076229b2.gz | Bin 0 -> 254 bytes _darcs/pristine/scripts/update_facebook.php | 7 + _darcs/tentative_pristine | 241 +-------------------- scripts/update_facebook.php | 7 + 5 files changed, 24 insertions(+), 235 deletions(-) create mode 100644 _darcs/patches/20090105045603-7b5ce-2cef1b92d9c91b0db70269d94f42ae06076229b2.gz diff --git a/_darcs/inventory b/_darcs/inventory index 909443c81..8e63bf0ff 100644 --- a/_darcs/inventory +++ b/_darcs/inventory @@ -116,4 +116,6 @@ Evan Prodromou **20081230212202] [trac750 Automatically update linked Facebook users' statuses Zach Copley **20090105010407] [trac750 configurable sync flags for Facebook app (noticesync, replysync) -Zach Copley **20090105040212] \ No newline at end of file +Zach Copley **20090105040212] +[trac750 added some output to the facebook_update.php script +Zach Copley **20090105045603] \ No newline at end of file diff --git a/_darcs/patches/20090105045603-7b5ce-2cef1b92d9c91b0db70269d94f42ae06076229b2.gz b/_darcs/patches/20090105045603-7b5ce-2cef1b92d9c91b0db70269d94f42ae06076229b2.gz new file mode 100644 index 000000000..9c59202f9 Binary files /dev/null and b/_darcs/patches/20090105045603-7b5ce-2cef1b92d9c91b0db70269d94f42ae06076229b2.gz differ diff --git a/_darcs/pristine/scripts/update_facebook.php b/_darcs/pristine/scripts/update_facebook.php index 02e47cefe..15c0e49f8 100644 --- a/_darcs/pristine/scripts/update_facebook.php +++ b/_darcs/pristine/scripts/update_facebook.php @@ -48,6 +48,10 @@ $current_time = time(); $notice = get_facebook_notices(get_last_updated()); +print date('r', $current_time) . " Looking for notices to send to Facebook...\n"; + +$cnt = 0; + while($notice->fetch()) { $flink = Foreign_link::getByUserID($notice->profile_id, 2); @@ -60,12 +64,15 @@ while($notice->fetch()) { if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) || (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) { update_status($fbuid, $content); + $cnt++; } } } update_last_updated($current_time); +print "Sent $cnt notices to Facebook.\n"; + exit(0); diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine index a69792432..212e028d8 100644 --- a/_darcs/tentative_pristine +++ b/_darcs/tentative_pristine @@ -1,237 +1,10 @@ -hunk ./actions/facebookhome.php 73 -- -- # $this->set_flags($flink, $noticesync, $replysync, $friendsync); -+ $flink->set_flags(true, false, false); -hunk ./actions/facebooksettings.php 31 -- $this->display(); -+ if ($this->arg('save')) { -+ $this->save_settings(); -+ } else { -+ $this->show_form(); -+ } -hunk ./actions/facebooksettings.php 38 -- function display() -- { +hunk ./scripts/update_facebook.php 51 ++print date('r', $current_time) . " Looking for notices to send to Facebook...\n"; + -+ function save_settings() { ++$cnt = 0; + -+ $noticesync = $this->arg('noticesync'); -+ $replysync = $this->arg('replysync'); -hunk ./actions/facebooksettings.php 45 -+ $fbuid = $facebook->require_login(); +hunk ./scripts/update_facebook.php 67 ++ $cnt++; +hunk ./scripts/update_facebook.php 74 ++print "Sent $cnt notices to Facebook.\n"; + -+ $flink = Foreign_link::getByForeignID($fbuid, 2); // 2 == Facebook -+ -+ $original = clone($flink); -+ $flink->set_flags($noticesync, $replysync, false); -+ $result = $flink->update($original); -+ -+ if ($result) { -+ echo ''; -+ } -hunk ./actions/facebooksettings.php 57 -+ $this->show_form(); -+ -+ } -+ -+ function show_form() { -+ -+ $facebook = get_facebook(); -hunk ./actions/facebooksettings.php 66 -+ $flink = Foreign_link::getByForeignID($fbuid, 2); // 2 == Facebook -+ -+ $this->show_header('Settings'); -+ -hunk ./actions/facebooksettings.php 71 -- .'

Add an Identi.ca box to your profile!

' -+ .'

Add an Identi.ca box to my profile

' -hunk ./actions/facebooksettings.php 75 -- -hunk ./actions/facebooksettings.php 77 -- $this->show_header('Settings'); -+ $fbml .= '
' -+ .'

Sync preferences

' -+ .'

'; -+ -+ if ($flink->noticesync & FOREIGN_NOTICE_SEND) { -+ $fbml .= ''; -+ } else { -+ $fbml .= ''; -+ } -+ -+ $fbml .= '' -+ .'

' -+ .'

'; -+ -+ if ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) { -+ $fbml .= ''; -+ } else { -+ $fbml .= ''; -+ } -+ -+ $fbml .= '' -+ .'

' -+ .'

' -+ .'' -+ .'

' -+ .'
'; -hunk ./actions/facebooksettings.php 107 -- -hunk ./actions/twittersettings.php 254 -- $this->set_flags($flink, $noticesync, $replysync, $friendsync); -+ $flink->set_flags($noticesync, $replysync, $friendsync); -hunk ./actions/twittersettings.php 326 -- $this->set_flags($flink, $noticesync, $replysync, $friendsync); -+ $flink->set_flags($noticesync, $replysync, $friendsync); -hunk ./actions/twittersettings.php 366 -- 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; -- } -hunk ./classes/Foreign_link.php 59 -+ -+ function set_flags($noticesync, $replysync, $friendsync) -+ { -+ if ($noticesync) { -+ $this->noticesync |= FOREIGN_NOTICE_SEND; -+ } else { -+ $this->noticesync &= ~FOREIGN_NOTICE_SEND; -+ } -+ -+ if ($replysync) { -+ $this->noticesync |= FOREIGN_NOTICE_SEND_REPLY; -+ } else { -+ $this->noticesync &= ~FOREIGN_NOTICE_SEND_REPLY; -+ } -+ -+ if ($friendsync) { -+ $this->friendsync |= FOREIGN_FRIEND_RECV; -+ } else { -+ $this->friendsync &= ~FOREIGN_FRIEND_RECV; -+ } -+ -+ $this->profilesync = 0; -+ } -hunk ./lib/facebookaction.php 40 -- $style = ''; -+ $style = ''; -hunk ./lib/facebookaction.php 75 -- $html = $this->render_notice($notice); -+ $html = Facebookaction::Aender_notice($notice); -hunk ./lib/facebookaction.php 77 -- $fbml = "$content $html"; -- $fbml .= "$content $html"; -+ -+ $fbml = "$style $html"; -+ $fbml .= "$style $html"; -hunk ./lib/facebookaction.php 81 -- $fbml_main = "$content $html"; -+ $fbml_main = "$style $html"; -hunk ./scripts/update_facebook.php 55 -+ $content = $notice->content; -hunk ./scripts/update_facebook.php 57 -- update_status($fbuid, $notice); -+ if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) { -hunk ./scripts/update_facebook.php 59 -+ // If it's not a reply, or if the user WANTS to send replies... -+ if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) || -+ (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) { -+ update_status($fbuid, $content); -+ } -+ } -hunk ./scripts/update_facebook.php 73 --function update_status($fbuid, $notice) { -+function update_status($fbuid, $content) { -hunk ./scripts/update_facebook.php 77 -- -- $result = $facebook->api_client->users_setStatus($notice->content, $fbuid, false, true); -- -+ $result = $facebook->api_client->users_setStatus($content, $fbuid, false, true); -hunk ./scripts/update_facebook.php 79 -- -hunk ./scripts/update_facebook.php 81 -- diff --git a/scripts/update_facebook.php b/scripts/update_facebook.php index 02e47cefe..15c0e49f8 100755 --- a/scripts/update_facebook.php +++ b/scripts/update_facebook.php @@ -48,6 +48,10 @@ $current_time = time(); $notice = get_facebook_notices(get_last_updated()); +print date('r', $current_time) . " Looking for notices to send to Facebook...\n"; + +$cnt = 0; + while($notice->fetch()) { $flink = Foreign_link::getByUserID($notice->profile_id, 2); @@ -60,12 +64,15 @@ while($notice->fetch()) { if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) || (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) { update_status($fbuid, $content); + $cnt++; } } } update_last_updated($current_time); +print "Sent $cnt notices to Facebook.\n"; + exit(0); -- cgit v1.2.3-54-g00ecf