wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Followup fix for ticket 1672: Twitter bridge !group->#hash conversion will now happen regardless of whether account was configured with oauth or basic auth (previously applied only on the oauth path)

Browse Source
This commit is contained in:
Brion Vibber 2009-12-18 09:36:30 -05:00
parent c9d64c3489
commit 8632974131
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/TwitterBridge/twitter.php
View File

@ -170,8 +170,6 @@ function broadcast_twitter($notice)
function broadcast_oauth($notice, $flink) { function broadcast_oauth($notice, $flink) {
$user = $flink->getUser(); $user = $flink->getUser();
$statustxt = format_status($notice); $statustxt = format_status($notice);
// Convert !groups to #hashes
$statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt);
$token = TwitterOAuthClient::unpackToken($flink->credentials); $token = TwitterOAuthClient::unpackToken($flink->credentials);
$client = new TwitterOAuthClient($token->key, $token->secret); $client = new TwitterOAuthClient($token->key, $token->secret);
$status = null; $status = null;
@ -290,7 +288,12 @@ function process_error($e, $flink, $notice)
function format_status($notice) function format_status($notice)
{ {
// XXX: Hack to get around PHP cURL's use of @ being a a meta character // XXX: Hack to get around PHP cURL's use of @ being a a meta character
return preg_replace('/^@/', ' @', $notice->content); $statustxt = preg_replace('/^@/', ' @', $notice->content);
// Convert !groups to #hashes
$statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt);
return $statustxt;
} }
function remove_twitter_link($flink) function remove_twitter_link($flink)