friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge https://github.com/friendica/friendica-addons into apull

pull/141/merge
friendica 2013-07-08 17:42:26 -07:00
parent 26e302cdc3 7964aaeef3
commit 3b104218cf
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
twitter/twitter.php
View File

@ -421,11 +421,22 @@ function twitter_shortenmsg($b) {
if ((strlen(trim($origmsg)) <= ($max_char - 3)) AND strpos($origmsg, $msglink))
return(trim($origmsg));
if (strlen($msglink) > 20)
$msglink = short_link($msglink);
// Preserve the unshortened link
$orig_link = $msglink;
if (strlen(trim($msg." ".$msglink)) > ($max_char - 3)) {
$msg = substr($msg, 0, ($max_char - 3) - (strlen($msglink)));
//if (strlen($msglink) > 20)
// $msglink = short_link($msglink);
//
//if (strlen(trim($msg." ".$msglink)) > ($max_char - 3)) {
// $msg = substr($msg, 0, ($max_char - 3) - (strlen($msglink)));
// Just replace the message link with a 15 character long string
// Twitter shortens it anyway to this length
if (trim($msglink) <> '')
$msglink = "123456789012345";
if (strlen(trim($msg." ".$msglink)) > ($max_char)) {
$msg = substr($msg, 0, ($max_char) - (strlen($msglink)));
$lastchar = substr($msg, -1);
$msg = substr($msg, 0, -1);
$pos = strrpos($msg, "\n");
@ -440,7 +451,8 @@ function twitter_shortenmsg($b) {
while (strpos($msg, " ") !== false)
$msg = str_replace(" ", " ", $msg);
return(trim($msg." ".$msglink));
//return(trim($msg." ".$msglink));
return(trim($msg." ".$orig_link));
}
function twitter_post_hook(&$a,&$b) {

2
webrtc/README.md
View File

@ -19,6 +19,6 @@ question).
If the test is successful then proceed with copying the webrtc instance you
would like to use and place it in the config window and save. Now when you
opent he app it will load the webrtc instance for you to use.
open the app it will load the webrtc instance for you to use.
[1]: https://en.wikipedia.org/wiki/WebRTC