Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 06:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Preparations for the upcoming bidirectional twitter sync.

Browse source
This commit is contained in:
Michael Vogel 2013-10-12 08:29:39 +02:00
parent 370d8d7063
commit 59b64ece25
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/bbcode.php
View file

@ -349,6 +349,10 @@ function GetProfileUsername($profile, $username) {
if ($diaspora != $profile) if ($diaspora != $profile)
return($diaspora); return($diaspora);
$twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1@twitter.com", $profile);
if ($twitter != $profile)
return($twitter);
$StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile); $StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
if ($StatusnetHost != $profile) { if ($StatusnetHost != $profile) {
$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile); $StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);

3
include/contact_selectors.php
View file

@ -85,7 +85,8 @@ function network_to_name($s) {
NETWORK_MYSPACE => t('MySpace'), NETWORK_MYSPACE => t('MySpace'),
NETWORK_MAIL2 => t('Email'), NETWORK_MAIL2 => t('Email'),
NETWORK_GPLUS => t('Google+'), NETWORK_GPLUS => t('Google+'),
NETWORK_PUMPIO => t('pump.io') NETWORK_PUMPIO => t('pump.io'),
NETWORK_TWITTER => t('Twitter')
); );
call_hooks('network_to_name', $nets); call_hooks('network_to_name', $nets);