Merge pull request #440 from annando/twitter-280
Twitter just went to the 280 character limit.pull/442/head
commit
13de70c40b
|
@ -295,7 +295,7 @@ function buffer_send(&$a,&$b) {
|
||||||
break;
|
break;
|
||||||
case 'twitter':
|
case 'twitter':
|
||||||
$send = ($b["extid"] != NETWORK_TWITTER);
|
$send = ($b["extid"] != NETWORK_TWITTER);
|
||||||
$limit = 140;
|
$limit = 280;
|
||||||
$markup = false;
|
$markup = false;
|
||||||
$includedlinks = true;
|
$includedlinks = true;
|
||||||
$htmlmode = 8;
|
$htmlmode = 8;
|
||||||
|
|
|
@ -232,7 +232,7 @@ function twitter_settings(&$a,&$s) {
|
||||||
/***
|
/***
|
||||||
* 1) Check that we have global consumer key & secret
|
* 1) Check that we have global consumer key & secret
|
||||||
* 2) If no OAuthtoken & stuff is present, generate button to get some
|
* 2) If no OAuthtoken & stuff is present, generate button to get some
|
||||||
* 3) Checkbox for "Send public notices (140 chars only)
|
* 3) Checkbox for "Send public notices (280 chars only)
|
||||||
*/
|
*/
|
||||||
$ckey = Config::get('twitter', 'consumerkey' );
|
$ckey = Config::get('twitter', 'consumerkey' );
|
||||||
$csecret = Config::get('twitter', 'consumersecret' );
|
$csecret = Config::get('twitter', 'consumersecret' );
|
||||||
|
@ -491,7 +491,7 @@ function twitter_post_hook(&$a,&$b) {
|
||||||
require_once('include/bbcode.php');
|
require_once('include/bbcode.php');
|
||||||
$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$max_char = 140;
|
$max_char = 280;
|
||||||
require_once("include/plaintext.php");
|
require_once("include/plaintext.php");
|
||||||
$msgarr = plaintext($a, $b, $max_char, true, 8);
|
$msgarr = plaintext($a, $b, $max_char, true, 8);
|
||||||
$msg = $msgarr["text"];
|
$msg = $msgarr["text"];
|
||||||
|
@ -729,7 +729,7 @@ function twitter_prepare_body(&$a,&$b) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if ($b["preview"]) {
|
if ($b["preview"]) {
|
||||||
$max_char = 140;
|
$max_char = 280;
|
||||||
require_once("include/plaintext.php");
|
require_once("include/plaintext.php");
|
||||||
$item = $b["item"];
|
$item = $b["item"];
|
||||||
$item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
|
$item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
|
||||||
|
|
Loading…
Reference in New Issue