clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #440 from annando/twitter-280 

Twitter just went to the 280 character limit.
This commit is contained in:
Hypolite Petovan 2017-11-07 17:48:10 -05:00 committed by GitHub
parent c3e93f1ed9 2effabed63
commit 13de70c40b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buffer/buffer.php
View File

@ -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;

6
twitter/twitter.php
View File

@ -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"];