From dc8b86ae8158936704f8c4603b8cf7dc635f4ac4 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 17 May 2013 08:12:38 +0200 Subject: [PATCH 1/3] pumpio: Added README Twitter: Changed the behaviour with the maximum length of posts --- pumpio/README | 5 +++++ twitter/twitter.php | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 pumpio/README diff --git a/pumpio/README b/pumpio/README new file mode 100644 index 000000000..f658d52ca --- /dev/null +++ b/pumpio/README @@ -0,0 +1,5 @@ +To let the connector work properly you should define an application name in the .htconfig: + +$a->config['pumpio']['application_name'] = "Name of you site"; + +This name appears at pump.io and is mportant for not mirroring back posts that came from friendica. diff --git a/twitter/twitter.php b/twitter/twitter.php index 21dbc0ba2..223f69bd7 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -286,7 +286,7 @@ function twitter_shortenmsg($b) { require_once("include/bbcode.php"); require_once("include/html2plain.php"); - $max_char = 130; + $max_char = 140; // Looking for the first image $image = ''; @@ -389,15 +389,20 @@ function twitter_shortenmsg($b) { if (($msglink == "") and strlen($msg) > $max_char) $msglink = $b["plink"]; - // If the message is short enough then don't modify it. (if the link exists in the original message) - if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == ""))) + // If the message is short enough then don't modify it. + if ((strlen(trim($origmsg)) <= $max_char) AND ($msglink == "")) + return(trim($origmsg)); + + // If the message is short enough and the link exists in the original message don't modify it as well + // -3 because of the bad shortener of twitter + if ((strlen(trim($origmsg)) <= ($max_char - 3)) AND strpos($origmsg, $msglink)) return(trim($origmsg)); if (strlen($msglink) > 20) $msglink = short_link($msglink); - if (strlen(trim($msg." ".$msglink)) > $max_char) { - $msg = substr($msg, 0, $max_char - (strlen($msglink))); + if (strlen(trim($msg." ".$msglink)) > ($max_char - 3)) { + $msg = substr($msg, 0, ($max_char - 3) - (strlen($msglink))); $lastchar = substr($msg, -1); $msg = substr($msg, 0, -1); $pos = strrpos($msg, "\n"); From bd92ac02e15b27b16d1be7a52729a6f4e07bf38f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 25 May 2013 00:22:08 +0200 Subject: [PATCH 2/3] gpluspost: There is a new option to suppress posts without links. --- gpluspost/gpluspost.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php index db240aa3e..352784959 100644 --- a/gpluspost/gpluspost.php +++ b/gpluspost/gpluspost.php @@ -51,6 +51,9 @@ function gpluspost_settings(&$a,&$s) { $noloop_enabled = get_pconfig(local_user(),'gpluspost','no_loop_prevention'); $noloop_checked = (($noloop_enabled) ? ' checked="checked" ' : ''); + $skip_enabled = get_pconfig(local_user(),'gpluspost','skip_without_link'); + $skip_checked = (($skip_enabled) ? ' checked="checked" ' : ''); + $s .= '
'; $s .= '

' . t('Google+ Post Settings') . '

'; $s .= '
'; @@ -68,6 +71,11 @@ function gpluspost_settings(&$a,&$s) { $s .= ''; $s .= '
'; + $s .= '
'; + /* provide a submit button */ $s .= '
'; @@ -81,6 +89,7 @@ function gpluspost_settings_post(&$a,&$b) { set_pconfig(local_user(),'gpluspost','post',intval($_POST['gpluspost'])); set_pconfig(local_user(),'gpluspost','post_by_default',intval($_POST['gpluspost_bydefault'])); set_pconfig(local_user(),'gpluspost','no_loop_prevention',intval($_POST['gpluspost_noloopprevention'])); + set_pconfig(local_user(),'gpluspost','skip_without_link',intval($_POST['gpluspost_skipwithoutlink'])); } } @@ -286,7 +295,7 @@ function gpluspost_feeditem($pid, $uid) { require_once('include/bbcode.php'); require_once("include/html2plain.php"); - $max_char = 140; + $skipwithoutlink = get_pconfig($uid,'gpluspost','skip_without_link'); $items = q("SELECT `uri`, `plink`, `author-link`, `author-name`, `created`, `edited`, `id`, `title`, `body` from `item` WHERE id=%d", intval($pid)); foreach ($items AS $item) { @@ -349,7 +358,9 @@ function gpluspost_feeditem($pid, $uid) { else if ($image != "") $msglink = $image; - if ($msglink == "") + if (($msglink == "") AND $skipwithoutlink) + continue; + else if ($msglink == "") $msglink = $item["plink"]; // Fetching the title - or the first line From ff8146c51e91c07e31070ad3311a3f8de34c576f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 8 Jun 2013 12:29:16 +0200 Subject: [PATCH 3/3] fromgplus: double descriptions are now suppressed. --- fromgplus/fromgplus.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 05cc8ec23..5d0e86c3d 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -212,7 +212,7 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) { return($cleaned); } -function fromgplus_handleattachments($item) { +function fromgplus_handleattachments($item, $displaytext) { $post = ""; $quote = ""; @@ -251,7 +251,7 @@ function fromgplus_handleattachments($item) { elseif ($images["full"] != "") $post .= "\n[img]".$images["full"]."[/img]\n"; - if ($attachment->displayName != "") + if (($attachment->displayName != "") AND ($attachment->displayName != $displaytext)) $post .= fromgplus_html2bbcode($attachment->displayName)."\n"; break; @@ -319,7 +319,7 @@ function fromgplus_fetch($a, $uid) { $post = fromgplus_html2bbcode($item->object->content); if (is_array($item->object->attachments)) - $post .= fromgplus_handleattachments($item); + $post .= fromgplus_handleattachments($item, $item->object->content); // geocode, placeName if (isset($item->address)) @@ -346,7 +346,7 @@ function fromgplus_fetch($a, $uid) { $post .= fromgplus_html2bbcode($item->object->content); if (is_array($item->object->attachments)) - $post .= "\n".trim(fromgplus_handleattachments($item)); + $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content)); $post .= "[/share]"; } else { @@ -355,7 +355,7 @@ function fromgplus_fetch($a, $uid) { $post .= fromgplus_html2bbcode($item->object->content); if (is_array($item->object->attachments)) - $post .= "\n".trim(fromgplus_handleattachments($item)); + $post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content)); } if (isset($item->address))