aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-19 14:36:08 -0700
committerFriendika <info@friendika.com>2011-08-19 14:36:08 -0700
commit6aa633efc829d4d3e9ccba4f6fb4d555f3c968ca (patch)
tree7bf9ea4cda139676b1114e9dc923de8652d76e06
parent8e24db3ef5c0bd15aba50aa48fd4745fe7191dbb (diff)
parenta66f063e68c90aa66495cb56e074d03e00d742db (diff)
downloadvolse-hubzilla-6aa633efc829d4d3e9ccba4f6fb4d555f3c968ca.tar.gz
volse-hubzilla-6aa633efc829d4d3e9ccba4f6fb4d555f3c968ca.tar.bz2
volse-hubzilla-6aa633efc829d4d3e9ccba4f6fb4d555f3c968ca.zip
Merge branch 'pull'
-rw-r--r--include/api.php237
-rw-r--r--include/message.php96
-rw-r--r--mod/message.php104
-rw-r--r--view/api_friends_xml.tpl5
4 files changed, 339 insertions, 103 deletions
diff --git a/include/api.php b/include/api.php
index 7a44cf023..aa42313b2 100644
--- a/include/api.php
+++ b/include/api.php
@@ -196,6 +196,7 @@
$user = null;
$extra_query = "";
+
if(!is_null($contact_id)){
$user=$contact_id;
$extra_query = "AND `contact`.`id` = %d ";
@@ -332,7 +333,7 @@
'notifications' => false,
'following' => '', #XXX: fix me
'verified' => true, #XXX: fix me
- #'status' => null
+ 'status' => array()
);
return $ret;
@@ -352,11 +353,15 @@
return api_get_user($a,$a->contacts[$normalised]['id']);
}
// We don't know this person directly.
+
+ list($nick, $name) = array_map("trim",explode("(",$item['author-name']));
+ $name=str_replace(")","",$name);
+
$ret = array(
'uid' => 0,
'id' => 0,
- 'name' => $item['author-name'],
- 'screen_name' => $item['author_name'],
+ 'name' => $name,
+ 'screen_name' => $nick,
'location' => '', //$uinfo[0]['default-location'],
'profile_image_url' => $item['author-avatar'],
'url' => $item['author-link'],
@@ -385,7 +390,7 @@
'notifications' => false,
'verified' => true, #XXX: fix me
'followers' => '', #XXX: fix me
- #'status' => null
+ 'status' => array()
);
return $ret;
@@ -607,10 +612,17 @@
*/
function api_statuses_home_timeline(&$a, $type){
if (local_user()===false) return false;
-
+
$user_info = api_get_user($a);
// get last newtork messages
-// $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+
+ // params
+ $count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+ if ($page<0) $page=0;
+ $since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+
+ $start = $page*$count;
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -622,9 +634,11 @@
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
+ AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']),
- 0,20
+ intval($since_id),
+ intval($start), intval($count)
);
$ret = api_format_items($r,$user_info);
@@ -649,7 +663,15 @@
$user_info = api_get_user($a);
// get last newtork messages
-// $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+
+ // params
+ $count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+ if ($page<0) $page=0;
+ $since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+
+ $start = $page*$count;
+
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -662,9 +684,11 @@
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
+ AND `item`.`id`>%d
ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']),
- 0,20
+ intval($since_id),
+ intval($start), intval($count)
);
$ret = api_format_items($r,$user_info);
@@ -688,7 +712,13 @@
$user_info = api_get_user($a);
// get last newtork messages
-// $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+
+ // params
+ $count = (x($_GET,'count')?$_GET['count']:20);
+ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+ if ($page<0) $page=0;
+
+ $start = $page*$count;
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@@ -703,7 +733,7 @@
$sql_extra
ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
intval($user_info['uid']),
- 0,20
+ intval($start), intval($count)
);
$ret = api_format_items($r,$user_info);
@@ -735,8 +765,8 @@
$status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
$status = array(
'created_at'=> api_date($item['created']),
- 'published' => datetime_convert('UTC','UTC',$item['created'],ATOM_TIME),
- 'updated' => datetime_convert('UTC','UTC',$item['edited'],ATOM_TIME),
+ 'published' => api_date($item['created']),
+ 'updated' => api_date($item['edited']),
'id' => intval($item['id']),
'message_id' => $item['uri'],
'text' => strip_tags(bbcode($item['body'])),
@@ -780,6 +810,58 @@
}
api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true);
+ /**
+ * https://dev.twitter.com/docs/api/1/get/statuses/friends
+ * This function is deprecated by Twitter
+ * returns: json, xml
+ **/
+ function api_statuses_f(&$a, $type, $qtype) {
+ if (local_user()===false) return false;
+ $user_info = api_get_user($a);
+
+ if (x($_GET,'cursor') && $_GET['cursor']=='undefined'){
+ /* this is to stop Hotot to load friends multiple times
+ * I'm not sure if I'm missing return something or
+ * is a bug in hotot. Workaround, meantime
+ */
+
+ $ret=Array();
+ $data = array('$users' => $ret);
+ return api_apply_template("friends", $type, $data);
+ }
+
+ if($qtype == 'friends')
+ $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
+ if($qtype == 'followers')
+ $sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
+
+ $r = q("SELECT id FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
+ intval(local_user())
+ );
+
+ $ret = array();
+ foreach($r as $cid){
+ $ret[] = api_get_user($a, $cid['id']);
+ }
+
+
+ $data = array('$users' => $ret);
+ return api_apply_template("friends", $type, $data);
+
+ }
+ function api_statuses_friends(&$a, $type){
+ return api_statuses_f($a,$type,"friends");
+ }
+ function api_statuses_followers(&$a, $type){
+ return api_statuses_f($a,$type,"followers");
+ }
+ api_register_func('api/statuses/friends','api_statuses_friends',true);
+ api_register_func('api/statuses/followers','api_statuses_followers',true);
+
+
+
+
+
function api_statusnet_config(&$a,$type) {
$name = $a->config['sitename'];
@@ -808,7 +890,6 @@
}
api_register_func('api/statusnet/config','api_statusnet_config',false);
-
function api_statusnet_version(&$a,$type) {
// liar
@@ -869,3 +950,131 @@
api_register_func('api/friends/ids','api_friends_ids',true);
api_register_func('api/followers/ids','api_followers_ids',true);
+
+ function api_direct_messages_new(&$a, $type) {
+ if (local_user()===false) return false;
+
+ if (!x($_POST, "text") || !x($_POST,"screen_name")) return;
+
+ $sender = api_get_user($a);
+
+ $r = q("SELECT `id` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
+ intval(local_user()),
+ dbesc($_POST['screen_name']));
+
+ $recipient = api_get_user($a, $r[0]['id']);
+
+
+ require_once("include/message.php");
+ $sub = ( (strlen($_POST['text'])>10)?substr($_POST['text'],0,10)."...":$_POST['text']);
+ $id = send_message($recipient['id'], $_POST['text'], $sub);
+
+
+ if ($id>-1) {
+ $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id));
+ $item = $r[0];
+ $ret=Array(
+ 'id' => $item['id'],
+ 'created_at'=> api_date($item['created']),
+ 'sender_id'=> $sender['id'] ,
+ 'sender_screen_name'=> $sender['screen_name'],
+ 'sender'=> $sender,
+ 'recipient_id'=> $recipient['id'],
+ 'recipient_screen_name'=> $recipient['screen_name'],
+ 'recipient'=> $recipient,
+
+ 'text'=> $item['title']."\n".strip_tags(bbcode($item['body'])) ,
+
+ );
+
+ } else {
+ $ret = array("error"=>$id);
+ }
+
+ $data = Array('$messages'=>$ret);
+
+ switch($type){
+ case "atom":
+ case "rss":
+ $data = api_rss_extra($a, $data, $user_info);
+ }
+
+ return api_apply_template("direct_messages", $type, $data);
+
+ }
+ api_register_func('api/direct_messages/new','api_direct_messages_new',true);
+
+ function api_direct_messages_box(&$a, $type, $box) {
+ if (local_user()===false) return false;
+
+ $user_info = api_get_user($a);
+
+ // params
+ $count = (x($_GET,'count')?$_GET['count']:20);
+ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+ if ($page<0) $page=0;
+
+ $start = $page*$count;
+
+
+ if ($box=="sentbox") {
+ $sql_extra = "`from-url`='%s'";
+ } else {
+ $sql_extra = "`from-url`!='%s'";
+ }
+
+ $r = q("SELECT * FROM `mail` WHERE uid=%d AND $sql_extra ORDER BY created DESC LIMIT %d,%d",
+ intval(local_user()),
+ dbesc( $a->get_baseurl() . '/profile/' . $a->user['nickname'] ),
+ intval($start), intval($count)
+ );
+
+ $ret = Array();
+ foreach($r as $item){
+ switch ($box){
+ case "inbox":
+ $recipient = $user_info;
+ $sender = api_get_user($a,$item['contact-id']);
+ break;
+ case "sentbox":
+ $recipient = api_get_user($a,$item['contact-id']);
+ $sender = $user_info;
+ break;
+ }
+
+ $ret[]=Array(
+ 'id' => $item['id'],
+ 'created_at'=> api_date($item['created']),
+ 'sender_id'=> $sender['id'] ,
+ 'sender_screen_name'=> $sender['screen_name'],
+ 'sender'=> $sender,
+ 'recipient_id'=> $recipient['id'],
+ 'recipient_screen_name'=> $recipient['screen_name'],
+ 'recipient'=> $recipient,
+
+ 'text'=> $item['title']."\n".strip_tags(bbcode($item['body'])) ,
+
+ );
+
+ }
+
+
+ $data = array('$messages' => $ret);
+ switch($type){
+ case "atom":
+ case "rss":
+ $data = api_rss_extra($a, $data, $user_info);
+ }
+
+ return api_apply_template("direct_messages", $type, $data);
+
+ }
+
+ function api_direct_messages_sentbox(&$a, $type){
+ return api_direct_messages_box($a, $type, "sentbox");
+ }
+ function api_direct_messages_inbox(&$a, $type){
+ return api_direct_messages_box($a, $type, "inbox");
+ }
+ api_register_func('api/direct_messages/sent','api_direct_messages_sentbox',true);
+ api_register_func('api/direct_messages','api_direct_messages_inbox',true);
diff --git a/include/message.php b/include/message.php
new file mode 100644
index 000000000..cca913b4e
--- /dev/null
+++ b/include/message.php
@@ -0,0 +1,96 @@
+<?php
+ // send a private message
+
+
+
+
+function send_message($recipient=0, $body='', $subject='', $replyto=''){
+ $a = get_app();
+
+ if(! $recipient) return -1;
+
+ if(! strlen($subject))
+ $subject = t('[no subject]');
+
+ $me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ intval(local_user())
+ );
+ $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($recipient),
+ intval(local_user())
+ );
+
+ if(! (count($me) && (count($contact)))) {
+ return -2;
+ }
+
+ $hash = random_string();
+ $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
+
+ if(! strlen($replyto))
+ $replyto = $uri;
+
+ $r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`,
+ `contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
+ VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
+ intval(local_user()),
+ dbesc($me[0]['name']),
+ dbesc($me[0]['thumb']),
+ dbesc($me[0]['url']),
+ intval($recipient),
+ dbesc($subject),
+ dbesc($body),
+ 1,
+ 0,
+ dbesc($uri),
+ dbesc($replyto),
+ datetime_convert()
+ );
+ $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
+ dbesc($uri),
+ intval(local_user())
+ );
+ if(count($r))
+ $post_id = $r[0]['id'];
+
+ /**
+ *
+ * When a photo was uploaded into the message using the (profile wall) ajax
+ * uploader, The permissions are initially set to disallow anybody but the
+ * owner from seeing it. This is because the permissions may not yet have been
+ * set for the post. If it's private, the photo permissions should be set
+ * appropriately. But we didn't know the final permissions on the post until
+ * now. So now we'll look for links of uploaded messages that are in the
+ * post and set them to the same permissions as the post itself.
+ *
+ */
+
+ $match = null;
+
+ if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
+ $images = $match[1];
+ if(count($images)) {
+ foreach($images as $image) {
+ if(! stristr($image,$a->get_baseurl() . '/photo/'))
+ continue;
+ $image_uri = substr($image,strrpos($image,'/') + 1);
+ $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
+ $r = q("UPDATE `photo` SET `allow_cid` = '%s'
+ WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
+ dbesc('<' . $recipient . '>'),
+ dbesc($image_uri),
+ dbesc( t('Wall Photos')),
+ intval(local_user())
+ );
+ }
+ }
+ }
+
+ if($post_id) {
+ proc_run('php',"include/notifier.php","mail","$post_id");
+ return intval($post_id);
+ } else {
+ return -3;
+ }
+
+}
diff --git a/mod/message.php b/mod/message.php
index ad598eb7d..165d63814 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,7 @@
<?php
require_once('include/acl_selectors.php');
+require_once('include/message.php');
function message_post(&$a) {
@@ -14,97 +15,22 @@ function message_post(&$a) {
$body = ((x($_POST,'body')) ? escape_tags(trim($_POST['body'])) : '');
$recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto']) : 0 );
- if(! $recipient) {
- notice( t('No recipient selected.') . EOL );
- return;
- }
-
- if(! strlen($subject))
- $subject = t('[no subject]');
-
- $me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
- intval(local_user())
- );
- $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($recipient),
- intval(local_user())
- );
-
- if(! (count($me) && (count($contact)))) {
- notice( t('Unable to locate contact information.') . EOL );
- return;
- }
-
- $hash = random_string();
- $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
-
- if(! strlen($replyto))
- $replyto = $uri;
-
- $r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`,
- `contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
- VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
- intval(local_user()),
- dbesc($me[0]['name']),
- dbesc($me[0]['thumb']),
- dbesc($me[0]['url']),
- intval($recipient),
- dbesc($subject),
- dbesc($body),
- 1,
- 0,
- dbesc($uri),
- dbesc($replyto),
- datetime_convert()
- );
- $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
- dbesc($uri),
- intval(local_user())
- );
- if(count($r))
- $post_id = $r[0]['id'];
-
- /**
- *
- * When a photo was uploaded into the message using the (profile wall) ajax
- * uploader, The permissions are initially set to disallow anybody but the
- * owner from seeing it. This is because the permissions may not yet have been
- * set for the post. If it's private, the photo permissions should be set
- * appropriately. But we didn't know the final permissions on the post until
- * now. So now we'll look for links of uploaded messages that are in the
- * post and set them to the same permissions as the post itself.
- *
- */
-
- $match = null;
-
- if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
- $images = $match[1];
- if(count($images)) {
- foreach($images as $image) {
- if(! stristr($image,$a->get_baseurl() . '/photo/'))
- continue;
- $image_uri = substr($image,strrpos($image,'/') + 1);
- $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
- $r = q("UPDATE `photo` SET `allow_cid` = '%s'
- WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
- dbesc('<' . $recipient . '>'),
- dbesc($image_uri),
- dbesc( t('Wall Photos')),
- intval(local_user())
- );
- }
- }
- }
- if($post_id) {
- proc_run('php',"include/notifier.php","mail","$post_id");
- info( t('Message sent.') . EOL );
- }
- else {
- notice( t('Message could not be sent.') . EOL );
+ $ret = send_message($recipient, $body, $subject, $replyto);
+
+ switch($ret){
+ case -1:
+ notice( t('No recipient selected.') . EOL );
+ break;
+ case -2:
+ notice( t('Unable to locate contact information.') . EOL );
+ break;
+ case -3:
+ notice( t('Message could not be sent.') . EOL );
+ default:
+ info( t('Message sent.') . EOL );
}
- return;
+
}
function message_content(&$a) {
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl
new file mode 100644
index 000000000..0ea7eb13b
--- /dev/null
+++ b/view/api_friends_xml.tpl
@@ -0,0 +1,5 @@
+<users type="array">
+ {{for $users as $user }}
+ {{inc api_user_xml.tpl }}{{endinc}}
+ {{endfor}}
+</users>