Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
This commit is contained in:
Evan Prodromou
commit
180ac80d4e
|
|
@ -107,7 +107,7 @@ class Design extends Memcached_DataObject
|
|||
|
||||
static function toWebColor($color)
|
||||
{
|
||||
if (is_null($color)) {
|
||||
if ($color == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ class Design extends Memcached_DataObject
|
|||
return new WebColor($color);
|
||||
} catch (WebColorException $e) {
|
||||
// This shouldn't happen
|
||||
common_log(LOG_ERR, "Unable to create color for design $id.",
|
||||
common_log(LOG_ERR, "Unable to create web color for $color",
|
||||
__FILE__);
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
13
doc-src/im
13
doc-src/im
|
|
@ -32,4 +32,15 @@ currently-implemented commands:
|
|||
you subscribe to.
|
||||
* **off**: Turn off notifications. You'll no longer receive Jabber
|
||||
notifications.
|
||||
|
||||
* **stop**: Same as 'off'
|
||||
* **quit**: Same as 'off'
|
||||
* **help**: Show this help. List available Jabber/XMPP commands
|
||||
* **follow <nickname>**: Subscribe to <nickname>
|
||||
* **sub <nickname>**: Same as follow
|
||||
* **leave <nickname>**: Subscribe to <nickname>
|
||||
* **unsub <nickname>**: Same as leave
|
||||
* **d <nickname> <text>**: Send direct message to <nickname> with message body <text>
|
||||
* **get <nickname>**: Get last notice from <nickname>
|
||||
* **last <nickname>**: Same as 'get'
|
||||
* **whois <nickname>**: Get Profile info on <nickname>
|
||||
* **fav <nickname>**: Add user's last notice as a favorite
|
||||
19
index.php
19
index.php
|
|
@ -107,6 +107,25 @@ function checkMirror($action_obj)
|
|||
|
||||
function main()
|
||||
{
|
||||
// fake HTTP redirects using lighttpd's 404 redirects
|
||||
if (strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') !== false) {
|
||||
$_lighty_url = $base_url.$_SERVER['REQUEST_URI'];
|
||||
$_lighty_url = @parse_url($_lighty_url);
|
||||
|
||||
if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') {
|
||||
$_lighty_path = preg_replace('/^'.preg_quote(common_config('site','path')).'\//', '', substr($_lighty_url['path'], 1));
|
||||
$_SERVER['QUERY_STRING'] = 'p='.$_lighty_path;
|
||||
if ($_lighty_url['query'])
|
||||
$_SERVER['QUERY_STRING'] .= '&'.$_lighty_url['query'];
|
||||
parse_str($_lighty_url['query'], $_lighty_query);
|
||||
foreach ($_lighty_query as $key => $val) {
|
||||
$_GET[$key] = $_REQUEST[$key] = $val;
|
||||
}
|
||||
$_GET['p'] = $_REQUEST['p'] = $_lighty_path;
|
||||
}
|
||||
}
|
||||
$_SERVER['REDIRECT_URL'] = preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']);
|
||||
|
||||
// quick check for fancy URL auto-detection support in installer.
|
||||
if (isset($_SERVER['REDIRECT_URL']) && (preg_replace("/^\/$/","",(dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') === $_SERVER['REDIRECT_URL']) {
|
||||
die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ E_O_T;
|
|||
function updateStatus($status, $error=false)
|
||||
{
|
||||
?>
|
||||
<li <?php echo ($error) ? 'class="error"': ''; ?>><?print $status;?></li>
|
||||
<li <?php echo ($error) ? 'class="error"': ''; ?>><?php echo $status;?></li>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,13 +27,14 @@ $(document).ready(function() {
|
|||
}
|
||||
}
|
||||
|
||||
/* rgb2hex written by R0bb13 <robertorebollo@gmail.com> */
|
||||
function rgb2hex(rgb) {
|
||||
rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
|
||||
function hex(x) {
|
||||
hexDigits = new Array("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F");
|
||||
return isNaN(x) ? "00" : hexDigits[(x - x % 16) / 16] + hexDigits[x % 16];
|
||||
}
|
||||
return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
|
||||
return '#' + dec2hex(rgb[1]) + dec2hex(rgb[2]) + dec2hex(rgb[3]);
|
||||
}
|
||||
function dec2hex(x) {
|
||||
hexDigits = new Array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
|
||||
return isNaN(x) ? '00' : hexDigits[(x - x % 16) / 16] + hexDigits[x % 16];
|
||||
}
|
||||
|
||||
function UpdateColors(S) {
|
||||
|
|
|
|||
15
js/util.js
15
js/util.js
|
|
@ -25,7 +25,7 @@ $(document).ready(function(){
|
|||
var counter = $("#notice_text-count");
|
||||
counter.text(remaining);
|
||||
|
||||
if (remaining <= 0) {
|
||||
if (remaining < 0) {
|
||||
$("#form_notice").addClass("warning");
|
||||
} else {
|
||||
$("#form_notice").removeClass("warning");
|
||||
|
|
@ -244,7 +244,7 @@ function NoticeReply() {
|
|||
$('#content .notice').each(function() {
|
||||
var notice = $(this)[0];
|
||||
$($('.notice_reply', notice)[0]).click(function() {
|
||||
var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname');
|
||||
var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
|
||||
NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
|
||||
return false;
|
||||
});
|
||||
|
|
@ -256,10 +256,15 @@ function NoticeReplySet(nick,id) {
|
|||
rgx_username = /^[0-9a-zA-Z\-_.]*$/;
|
||||
if (nick.match(rgx_username)) {
|
||||
replyto = "@" + nick + " ";
|
||||
if ($("#notice_data-text").length) {
|
||||
$("#notice_data-text").val(replyto);
|
||||
var text = $("#notice_data-text");
|
||||
if (text.length) {
|
||||
text.val(replyto + text.val());
|
||||
$("#form_notice input#notice_in-reply-to").val(id);
|
||||
$("#notice_data-text").focus();
|
||||
if (text.get(0).setSelectionRange) {
|
||||
var len = text.val().length;
|
||||
text.get(0).setSelectionRange(len,len);
|
||||
text.get(0).focus();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ function getFacebook()
|
|||
$facebook = new Facebook($apikey, $secret);
|
||||
}
|
||||
|
||||
if (!$facebook) {
|
||||
if (empty($facebook)) {
|
||||
common_log(LOG_ERR, 'Could not make new Facebook client obj!',
|
||||
__FILE__);
|
||||
}
|
||||
|
|
@ -44,71 +44,37 @@ function getFacebook()
|
|||
return $facebook;
|
||||
}
|
||||
|
||||
function updateProfileBox($facebook, $flink, $notice) {
|
||||
$fbaction = new FacebookAction($output='php://output', $indent=true, $facebook, $flink);
|
||||
$fbaction->updateProfileBox($notice);
|
||||
}
|
||||
|
||||
function isFacebookBound($notice, $flink) {
|
||||
|
||||
if (empty($flink)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Avoid a loop
|
||||
|
||||
if ($notice->source == 'Facebook') {
|
||||
common_log(LOG_INFO, "Skipping notice $notice->id because its " .
|
||||
'source is Facebook.');
|
||||
return false;
|
||||
}
|
||||
|
||||
// If the user does not want to broadcast to Facebook, move along
|
||||
|
||||
if (!($flink->noticesync & FOREIGN_NOTICE_SEND == FOREIGN_NOTICE_SEND)) {
|
||||
common_log(LOG_INFO, "Skipping notice $notice->id " .
|
||||
'because user has FOREIGN_NOTICE_SEND bit off.');
|
||||
return false;
|
||||
}
|
||||
|
||||
$success = false;
|
||||
// If it's not a reply, or if the user WANTS to send @-replies,
|
||||
// then, yeah, it can go to Facebook.
|
||||
|
||||
// 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', $notice->content) ||
|
||||
($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
|
||||
|
||||
$success = true;
|
||||
|
||||
// The two condition below are deal breakers:
|
||||
|
||||
// Avoid a loop
|
||||
if ($notice->source == 'Facebook') {
|
||||
common_log(LOG_INFO, "Skipping notice $notice->id because its " .
|
||||
'source is Facebook.');
|
||||
$success = false;
|
||||
}
|
||||
|
||||
$facebook = getFacebook();
|
||||
$fbuid = $flink->foreign_id;
|
||||
|
||||
try {
|
||||
|
||||
// Check to see if the user has given the FB app status update perms
|
||||
$result = $facebook->api_client->
|
||||
users_hasAppPermission('publish_stream', $fbuid);
|
||||
|
||||
if ($result != 1) {
|
||||
$result = $facebook->api_client->
|
||||
users_hasAppPermission('status_update', $fbuid);
|
||||
}
|
||||
if ($result != 1) {
|
||||
$user = $flink->getUser();
|
||||
$msg = "Not sending notice $notice->id to Facebook " .
|
||||
"because user $user->nickname hasn't given the " .
|
||||
'Facebook app \'status_update\' or \'publish_stream\' permission.';
|
||||
common_debug($msg);
|
||||
$success = false;
|
||||
}
|
||||
|
||||
} catch(FacebookRestClientException $e){
|
||||
common_log(LOG_ERR, $e->getMessage());
|
||||
$success = false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return $success;
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -119,88 +85,65 @@ function facebookBroadcastNotice($notice)
|
|||
|
||||
if (isFacebookBound($notice, $flink)) {
|
||||
|
||||
// Okay, we're good to go, update the FB status
|
||||
|
||||
$status = null;
|
||||
$fbuid = $flink->foreign_id;
|
||||
|
||||
$user = $flink->getUser();
|
||||
|
||||
// Get the status 'verb' (prefix) the user has set
|
||||
$attachments = $notice->attachments();
|
||||
|
||||
try {
|
||||
$prefix = $facebook->api_client->
|
||||
data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $fbuid);
|
||||
|
||||
// Get the status 'verb' (prefix) the user has set
|
||||
|
||||
// XXX: Does this call count against our per user FB request limit?
|
||||
// If so we should consider storing verb elsewhere or not storing
|
||||
|
||||
$prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX,
|
||||
$fbuid);
|
||||
|
||||
$status = "$prefix $notice->content";
|
||||
|
||||
} catch(FacebookRestClientException $e) {
|
||||
common_log(LOG_WARNING, $e->getMessage());
|
||||
common_log(LOG_WARNING,
|
||||
'Unable to get the status verb setting from Facebook ' .
|
||||
"for $user->nickname (user id: $user->id).");
|
||||
}
|
||||
$can_publish = $facebook->api_client->users_hasAppPermission('publish_stream',
|
||||
$fbuid);
|
||||
|
||||
// Okay, we're good to go, update the FB status
|
||||
$can_update = $facebook->api_client->users_hasAppPermission('status_update',
|
||||
$fbuid);
|
||||
|
||||
try {
|
||||
$result = $facebook->api_client->
|
||||
users_hasAppPermission('publish_stream', $fbuid);
|
||||
if($result == 1){
|
||||
// authorized to use the stream api, so use it
|
||||
$fbattachment = null;
|
||||
$attachments = $notice->attachments();
|
||||
if($attachments){
|
||||
$fbattachment=array();
|
||||
$fbattachment['media']=array();
|
||||
//facebook only supports one attachment per item
|
||||
$attachment = $attachments[0];
|
||||
$fbmedia=array();
|
||||
if(strncmp($attachment->mimetype,'image/',strlen('image/'))==0){
|
||||
$fbmedia['type']='image';
|
||||
$fbmedia['src']=$attachment->url;
|
||||
$fbmedia['href']=$attachment->url;
|
||||
$fbattachment['media'][]=$fbmedia;
|
||||
/* Video doesn't seem to work. The notice never makes it to facebook, and no error is reported.
|
||||
}else if(strncmp($attachment->mimetype,'video/',strlen('image/'))==0 || $attachment->mimetype="application/ogg"){
|
||||
$fbmedia['type']='video';
|
||||
$fbmedia['video_src']=$attachment->url;
|
||||
// http://wiki.developers.facebook.com/index.php/Attachment_%28Streams%29
|
||||
// says that preview_img is required... but we have no value to put in it
|
||||
// $fbmedia['preview_img']=$attachment->url;
|
||||
if($attachment->title){
|
||||
$fbmedia['video_title']=$attachment->title;
|
||||
}
|
||||
$fbmedia['video_type']=$attachment->mimetype;
|
||||
$fbattachment['media'][]=$fbmedia;
|
||||
*/
|
||||
}else if($attachment->mimetype=='audio/mpeg'){
|
||||
$fbmedia['type']='mp3';
|
||||
$fbmedia['src']=$attachment->url;
|
||||
$fbattachment['media'][]=$fbmedia;
|
||||
}else if($attachment->mimetype=='application/x-shockwave-flash'){
|
||||
$fbmedia['type']='flash';
|
||||
// http://wiki.developers.facebook.com/index.php/Attachment_%28Streams%29
|
||||
// says that imgsrc is required... but we have no value to put in it
|
||||
// $fbmedia['imgsrc']='';
|
||||
$fbmedia['swfsrc']=$attachment->url;
|
||||
$fbattachment['media'][]=$fbmedia;
|
||||
}else{
|
||||
$fbattachment['name']=($attachment->title?$attachment->title:$attachment->url);
|
||||
$fbattachment['href']=$attachment->url;
|
||||
}
|
||||
}
|
||||
$facebook->api_client->stream_publish($status, $fbattachment, null, null, $fbuid);
|
||||
}else{
|
||||
if (!empty($attachments) && $can_publish == 1) {
|
||||
$fbattachment = format_attachments($attachments);
|
||||
$facebook->api_client->stream_publish($status, $fbattachment,
|
||||
null, null, $fbuid);
|
||||
common_log(LOG_INFO,
|
||||
"Posted notice $notice->id w/attachment " .
|
||||
"to Facebook user's stream (fbuid = $fbuid).");
|
||||
} elseif ($can_update == 1 || $can_publish == 1) {
|
||||
$facebook->api_client->users_setStatus($status, $fbuid, false, true);
|
||||
common_log(LOG_INFO,
|
||||
"Posted notice $notice->id to Facebook " .
|
||||
"as a status update (fbuid = $fbuid).");
|
||||
} else {
|
||||
$msg = "Not sending notice $notice->id to Facebook " .
|
||||
"because user $user->nickname hasn't given the " .
|
||||
'Facebook app \'status_update\' or \'publish_stream\' permission.';
|
||||
common_log(LOG_WARNING, $msg);
|
||||
}
|
||||
} catch(FacebookRestClientException $e) {
|
||||
|
||||
// Finally, attempt to update the user's profile box
|
||||
|
||||
if ($can_publish == 1 || $can_update == 1) {
|
||||
updateProfileBox($facebook, $flink, $notice);
|
||||
}
|
||||
|
||||
} catch (FacebookRestClientException $e) {
|
||||
|
||||
$code = $e->getCode();
|
||||
|
||||
common_log(LOG_ERR, 'Facebook returned error code ' .
|
||||
$code . ': ' . $e->getMessage());
|
||||
common_log(LOG_ERR,
|
||||
'Unable to update Facebook status for ' .
|
||||
"$user->nickname (user id: $user->id)!");
|
||||
common_log(LOG_WARNING, 'Facebook returned error code ' .
|
||||
$code . ': ' . $e->getMessage());
|
||||
common_log(LOG_WARNING,
|
||||
'Unable to update Facebook status for ' .
|
||||
"$user->nickname (user id: $user->id)!");
|
||||
|
||||
if ($code == 200 || $code == 250) {
|
||||
|
||||
|
|
@ -209,25 +152,62 @@ function facebookBroadcastNotice($notice)
|
|||
// see: http://wiki.developers.facebook.com/index.php/Users.setStatus#Example_Return_XML
|
||||
|
||||
remove_facebook_app($flink);
|
||||
|
||||
} else {
|
||||
|
||||
// Try sending again later.
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Now try to update the profile box
|
||||
|
||||
try {
|
||||
updateProfileBox($facebook, $flink, $notice);
|
||||
} catch(FacebookRestClientException $e) {
|
||||
common_log(LOG_ERR, 'Facebook returned error code ' .
|
||||
$e->getCode() . ': ' . $e->getMessage());
|
||||
common_log(LOG_WARNING,
|
||||
'Unable to update Facebook profile box for ' .
|
||||
"$user->nickname (user id: $user->id).");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
function updateProfileBox($facebook, $flink, $notice) {
|
||||
$fbaction = new FacebookAction($output = 'php://output',
|
||||
$indent = true, $facebook, $flink);
|
||||
$fbaction->updateProfileBox($notice);
|
||||
}
|
||||
|
||||
function format_attachments($attachments)
|
||||
{
|
||||
$fbattachment = array();
|
||||
$fbattachment['media'] = array();
|
||||
|
||||
// Facebook only supports one attachment per item
|
||||
|
||||
$attachment = $attachments[0];
|
||||
$fbmedia = array();
|
||||
|
||||
if (strncmp($attachment->mimetype, 'image/', strlen('image/')) == 0) {
|
||||
$fbmedia['type'] = 'image';
|
||||
$fbmedia['src'] = $attachment->url;
|
||||
$fbmedia['href'] = $attachment->url;
|
||||
$fbattachment['media'][] = $fbmedia;
|
||||
} else if ($attachment->mimetype == 'audio/mpeg') {
|
||||
$fbmedia['type'] = 'mp3';
|
||||
$fbmedia['src'] = $attachment->url;
|
||||
$fbattachment['media'][] = $fbmedia;
|
||||
}else if ($attachment->mimetype == 'application/x-shockwave-flash') {
|
||||
$fbmedia['type'] = 'flash';
|
||||
|
||||
// http://wiki.developers.facebook.com/index.php/Attachment_%28Streams%29
|
||||
// says that imgsrc is required... but we have no value to put in it
|
||||
// $fbmedia['imgsrc']='';
|
||||
|
||||
$fbmedia['swfsrc'] = $attachment->url;
|
||||
$fbattachment['media'][] = $fbmedia;
|
||||
}else{
|
||||
$fbattachment['name'] = ($attachment->title ?
|
||||
$attachment->title : $attachment->url);
|
||||
$fbattachment['href'] = $attachment->url;
|
||||
}
|
||||
|
||||
return $fbattachment;
|
||||
}
|
||||
|
||||
function remove_facebook_app($flink)
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ class ProfileSection extends Section
|
|||
$this->out->elementEnd('a');
|
||||
$this->out->elementEnd('span');
|
||||
$this->out->elementEnd('td');
|
||||
if ($profile->value) {
|
||||
if (isset($profile->value)) {
|
||||
$this->out->element('td', 'value', $profile->value);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
# Add this line to lighttpd.conf to enable pseudo-rewrites using 404s
|
||||
server.error-handler-404 = "/index.php"
|
||||
|
|
@ -235,9 +235,6 @@ opacity:0.4;
|
|||
.notices li:hover div.notice-options {
|
||||
opacity:1;
|
||||
}
|
||||
div.entry-content {
|
||||
color:#333333;
|
||||
}
|
||||
div.notice-options a,
|
||||
div.notice-options input {
|
||||
font-family:sans-serif;
|
||||
|
|
|
|||
|
|
@ -235,9 +235,6 @@ opacity:0.4;
|
|||
.notices li:hover div.notice-options {
|
||||
opacity:1;
|
||||
}
|
||||
div.entry-content {
|
||||
color:#333333;
|
||||
}
|
||||
div.notice-options a,
|
||||
div.notice-options input {
|
||||
font-family:sans-serif;
|
||||
|
|
|
|||
Loading…
Reference in New Issue