have fun...
This commit is contained in:
parent
b6a3471608
commit
d442bbc482
4
boot.php
4
boot.php
|
@ -215,7 +215,7 @@ define ( 'TERM_OBJ_PHOTO', 2 );
|
||||||
* various namespaces we may need to parse
|
* various namespaces we may need to parse
|
||||||
*/
|
*/
|
||||||
|
|
||||||
define ( 'NAMESPACE_ZOT', 'http://purl.org/macgirvin/zot' );
|
define ( 'NAMESPACE_ZOT', 'http://purl.org/zot' );
|
||||||
define ( 'NAMESPACE_DFRN' , 'http://purl.org/macgirvin/dfrn/1.0' );
|
define ( 'NAMESPACE_DFRN' , 'http://purl.org/macgirvin/dfrn/1.0' );
|
||||||
define ( 'NAMESPACE_THREAD' , 'http://purl.org/syndication/thread/1.0' );
|
define ( 'NAMESPACE_THREAD' , 'http://purl.org/syndication/thread/1.0' );
|
||||||
define ( 'NAMESPACE_TOMB' , 'http://purl.org/atompub/tombstones/1.0' );
|
define ( 'NAMESPACE_TOMB' , 'http://purl.org/atompub/tombstones/1.0' );
|
||||||
|
@ -250,6 +250,8 @@ define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' );
|
||||||
define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
|
define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
|
||||||
define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
|
define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
|
||||||
|
|
||||||
|
define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' );
|
||||||
|
|
||||||
define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
|
define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
|
||||||
define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' );
|
define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' );
|
||||||
define ( 'ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person' );
|
define ( 'ACTIVITY_OBJ_PERSON', NAMESPACE_ACTIVITY_SCHEMA . 'person' );
|
||||||
|
|
|
@ -162,6 +162,49 @@ function localize_item(&$item){
|
||||||
$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
|
$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
if (stristr($item['verb'],ACTIVITY_POKE)) {
|
||||||
|
$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
|
||||||
|
if(! $verb)
|
||||||
|
return;
|
||||||
|
if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
|
||||||
|
|
||||||
|
$Aname = $item['author-name'];
|
||||||
|
$Alink = $item['author-link'];
|
||||||
|
|
||||||
|
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||||
|
|
||||||
|
$obj = parse_xml_string($xmlhead.$item['object']);
|
||||||
|
$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
|
||||||
|
|
||||||
|
$Bname = $obj->title;
|
||||||
|
$Blink = ""; $Bphoto = "";
|
||||||
|
foreach ($links->link as $l){
|
||||||
|
$atts = $l->attributes();
|
||||||
|
switch($atts['rel']){
|
||||||
|
case "alternate": $Blink = $atts['href'];
|
||||||
|
case "photo": $Bphoto = $atts['href'];
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
|
||||||
|
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
|
||||||
|
if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
|
||||||
|
|
||||||
|
// we can't have a translation string with three positions but no distinguishable text
|
||||||
|
// So here is the translate string.
|
||||||
|
|
||||||
|
$txt = t('%1$s poked %2$s');
|
||||||
|
|
||||||
|
// now translate the verb
|
||||||
|
|
||||||
|
$txt = str_replace( t('poked'), t($verb), $txt);
|
||||||
|
|
||||||
|
// then do the sprintf on the translation string
|
||||||
|
|
||||||
|
$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
|
||||||
|
|
||||||
|
}
|
||||||
if ($item['verb']===ACTIVITY_TAG){
|
if ($item['verb']===ACTIVITY_TAG){
|
||||||
$r = q("SELECT * from `item`,`contact` WHERE
|
$r = q("SELECT * from `item`,`contact` WHERE
|
||||||
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
|
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
|
||||||
|
|
|
@ -706,6 +706,20 @@ function linkify($s) {
|
||||||
return($s);
|
return($s);
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
function get_poke_verbs() {
|
||||||
|
|
||||||
|
// index is present tense verb
|
||||||
|
// value is array containing past tense verb, translation of present, translation of past
|
||||||
|
|
||||||
|
$arr = array(
|
||||||
|
'poke' => array( 'poked', t('poke'), t('poked')),
|
||||||
|
'prod' => array( 'prodded', t('prod'), t('prodded')),
|
||||||
|
'slap' => array( 'slapped', t('slap'), t('slapped')),
|
||||||
|
'finger' => array( 'fingered', t('finger'), t('fingered'))
|
||||||
|
);
|
||||||
|
call_hooks('poke_verbs', $arr);
|
||||||
|
return $arr;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
149
mod/poke.php
Normal file
149
mod/poke.php
Normal file
|
@ -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'] = $target['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;
|
||||||
|
|
||||||
|
}
|
29
view/poke_content.tpl
Normal file
29
view/poke_content.tpl
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
<h3>$title</h3>
|
||||||
|
|
||||||
|
<div id="poke-desc">$desc</div>
|
||||||
|
|
||||||
|
<form action="poke" method="get">
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
|
||||||
|
<div id="poke-recip-label">$clabel</div>
|
||||||
|
<br />
|
||||||
|
<input id="recip" type="text" size="64" maxlength="255" value="" name="pokename" autocomplete="off">
|
||||||
|
<input id="recip-complete" type="hidden" value="" name="cid">
|
||||||
|
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
<div id="poke-action-label">$choice</div>
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
<select name="verb" id="poke-verb-select" >
|
||||||
|
{{ for $verbs as $v }}
|
||||||
|
<option value="$v.0">$v.1</option>
|
||||||
|
{{ endfor }}
|
||||||
|
</select>
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
|
||||||
|
<input type="submit" name="submit" value="$submit" />
|
||||||
|
</form>
|
||||||
|
|
Loading…
Reference in a new issue