Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2024-11-22 13:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Diaspora: The hostname is now send, so that at Diaspora there is a line telling "via ..."

Browse source
This commit is contained in:
Michael Vogel 2014-04-22 15:28:23 +02:00
parent ce997a0367
commit a23099a6fd
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
diaspora/diasphp.php
View file

@ -61,11 +61,12 @@ class Diasphp {
return $this; return $this;
} }
function post($text) { function post($text, $provider = "diasphp") {
// post-daten vorbereiten // post-daten vorbereiten
$datatopost = json_encode(array( $datatopost = json_encode(array(
'aspect_ids' => 'public', 'aspect_ids' => 'public',
'status_message' => array('text' => $text) 'status_message' => array('text' => $text,
'provider_display_name' => $provider)
)); ));
// header vorbereiten // header vorbereiten

7
diaspora/diaspora.php
View file

@ -39,6 +39,8 @@ function diaspora_jot_nets(&$a,&$b) {
} }
function diaspora_queue_hook(&$a,&$b) { function diaspora_queue_hook(&$a,&$b) {
$hostname = $a->get_hostname();
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
dbesc(NETWORK_DIASPORA2) dbesc(NETWORK_DIASPORA2)
); );
@ -85,7 +87,7 @@ function diaspora_queue_hook(&$a,&$b) {
logger('diaspora_queue: try to log in '.$diaspora_username, LOGGER_DEBUG); logger('diaspora_queue: try to log in '.$diaspora_username, LOGGER_DEBUG);
$conn->login($diaspora_username, $diaspora_password); $conn->login($diaspora_username, $diaspora_password);
logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG); logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
$conn->post($post); $conn->post($post, $hostname);
logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG); logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
@ -233,6 +235,7 @@ function diaspora_post_local(&$a,&$b) {
function diaspora_send(&$a,&$b) { function diaspora_send(&$a,&$b) {
$hostname = $a->get_hostname();
logger('diaspora_send: invoked'); logger('diaspora_send: invoked');
@ -303,7 +306,7 @@ function diaspora_send(&$a,&$b) {
logger('diaspora_send: try to send '.$body, LOGGER_DEBUG); logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
//throw new Exception('Test'); //throw new Exception('Test');
$conn->post($body); $conn->post($body, $hostname);
logger('diaspora_send: success'); logger('diaspora_send: success');
} catch (Exception $e) { } catch (Exception $e) {

2
fbsync/fbsync.php
View file

@ -177,7 +177,7 @@ function fbsync_cron($a,$b) {
} }
} }
logger('fbsync: cron_end'); logger('fbsync_cron: cron_end');
set_config('fbsync','last_poll', time()); set_config('fbsync','last_poll', time());
} }