aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/item.php18
-rwxr-xr-xmod/poke.php149
2 files changed, 162 insertions, 5 deletions
diff --git a/mod/item.php b/mod/item.php
index db28e255f..5c3a0d888 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -42,6 +42,19 @@ function item_post(&$a) {
logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+
+ // 'origin' (if non-zero) indicates that this network is where the message originated,
+ // for the purpose of relaying comments to other conversation members.
+ // If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset.
+ // If the API is used from another network with its own distribution
+ // and deliveries, you may wish to set origin to 0 or false and allow the other
+ // network to relay comments.
+
+ // If you are unsure, it is prudent (and important) to leave it unset.
+
+ $origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1);
+
+
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
$categories = ((x($_REQUEST['category'])) ? escape_tags($_REQUEST['category']) : '');
@@ -532,11 +545,6 @@ function item_post(&$a) {
$gravity = (($parent) ? 6 : 0 );
- // even if the post arrived via API we are considering that it
- // originated on this site by default for determining relayability.
-
- $origin = ((x($_REQUEST,'origin')) ? intval($_REQUEST['origin']) : 1);
-
$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
$uri = item_new_uri($a->get_hostname(),$profile_uid);
diff --git a/mod/poke.php b/mod/poke.php
new file mode 100755
index 000000000..8fe07b4cd
--- /dev/null
+++ b/mod/poke.php
@@ -0,0 +1,149 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function poke_init(&$a) {
+
+ if(! local_user())
+ return;
+
+ $uid = local_user();
+ $verb = notags(trim($_GET['verb']));
+
+ if(! $verb)
+ return;
+
+ $verbs = get_poke_verbs();
+
+ if(! array_key_exists($verb,$verbs))
+ return;
+
+ $activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
+
+ $contact_id = intval($_GET['cid']);
+ if(! $contact_id)
+ return;
+
+
+ logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
+
+
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d and `uid` = %d LIMIT 1",
+ intval($contact_id),
+ intval($uid)
+ );
+
+ if(! count($r)) {
+ logger('poke: no contact ' . $contact_id);
+ return;
+ }
+
+ $target = $r[0];
+
+ $poster = $a->contact;
+
+ $uri = item_new_uri($a->get_hostname(),$owner_uid);
+
+ $arr = array();
+
+ $arr['uid'] = $uid;
+ $arr['uri'] = $uri;
+ $arr['parent-uri'] = $uri;
+ $arr['type'] = 'activity';
+ $arr['wall'] = 1;
+ $arr['contact-id'] = $poster['id'];
+ $arr['owner-name'] = $poster['name'];
+ $arr['owner-link'] = $poster['url'];
+ $arr['owner-avatar'] = $poster['thumb'];
+ $arr['author-name'] = $poster['name'];
+ $arr['author-link'] = $poster['url'];
+ $arr['author-avatar'] = $poster['thumb'];
+ $arr['title'] = '';
+ $arr['allow_cid'] = $a->user['allow_cid'];
+ $arr['allow_gid'] = $a->user['allow_gid'];
+ $arr['deny_cid'] = $a->user['deny_cid'];
+ $arr['deny_gid'] = $a->user['deny_gid'];
+ $arr['last-child'] = 1;
+ $arr['visible'] = 1;
+ $arr['verb'] = $activity;
+ $arr['object-type'] = ACTIVITY_OBJ_PERSON;
+
+ $arr['origin'] = 1;
+ $arr['body'] = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
+
+ $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $a->get_baseurl() . '/contact/' . $target['id'] . '</id>';
+ $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
+
+ $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
+ $arr['object'] .= '</link></object>' . "\n";
+
+ $item_id = item_store($arr);
+ if($item_id) {
+ q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+ dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+ intval($uid),
+ intval($item_id)
+ );
+ proc_run('php',"include/notifier.php","tag","$item_id");
+ }
+
+
+ call_hooks('post_local_end', $arr);
+
+ proc_run('php',"include/notifier.php","like","$post_id");
+
+ return;
+}
+
+
+
+function poke_content(&$a) {
+
+ $base = $a->get_baseurl();
+
+ $a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+ $a->page['htmlhead'] .= <<< EOT
+
+<script>$(document).ready(function() {
+ var a;
+ a = $("#recip").autocomplete({
+ serviceUrl: '$base/acl',
+ minChars: 2,
+ width: 350,
+ onSelect: function(value,data) {
+ $("#recip-complete").val(data);
+ }
+ });
+ a.setOptions({ params: { type: 'a' }});
+
+
+});
+
+</script>
+EOT;
+
+
+ $verbs = get_poke_verbs();
+
+ $shortlist = array();
+ foreach($verbs as $k => $v)
+ $shortlist[] = array($k,$v[1]);
+
+
+ $tpl = get_markup_template('poke_content.tpl');
+
+ $o = replace_macros($tpl,array(
+ '$title' => t('Poke/Prod'),
+ '$desc' => t('poke, prod or do other things to somebody'),
+ '$clabel' => t('Recipient'),
+ '$choice' => t('Choose what you wish to do to recipient'),
+ '$verbs' => $shortlist,
+ '$submit' => t('Submit')
+ ));
+
+ return $o;
+
+} \ No newline at end of file