aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-17 16:50:32 -0800
committerfriendica <info@friendica.com>2013-11-17 16:50:32 -0800
commit06e0272db873ad0b7dbc96596e92b8c635f940a2 (patch)
treecc9c69c446e13de010baa4fe2dcd2c401aef4f94 /mod
parent28b0eb9c330261ea6a8cd36248c194b6b153f5e6 (diff)
downloadvolse-hubzilla-06e0272db873ad0b7dbc96596e92b8c635f940a2.tar.gz
volse-hubzilla-06e0272db873ad0b7dbc96596e92b8c635f940a2.tar.bz2
volse-hubzilla-06e0272db873ad0b7dbc96596e92b8c635f940a2.zip
populate some posts when somebody is granted "read stream" permission
Diffstat (limited to 'mod')
-rw-r--r--mod/connections.php3
-rw-r--r--mod/follow.php2
-rw-r--r--mod/zotfeed.php4
3 files changed, 7 insertions, 2 deletions
diff --git a/mod/connections.php b/mod/connections.php
index 1ad9fedbc..a40a8fa90 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -133,6 +133,9 @@ function connections_post(&$a) {
// friends in general or this friend in particular aren't hidden)
// and send out a new friend activity
// TODO
+
+ // pull in a bit of content if there is any to pull in
+ proc_run('php','include/onepoll.php',$contact_id);
}
// Refresh the structure in memory with the new data
diff --git a/mod/follow.php b/mod/follow.php
index 9f5a8183b..1d29dab2e 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -15,7 +15,7 @@ function follow_init(&$a) {
$confirm = intval($_REQUEST['confirm']);
$result = new_contact($uid,$url,$a->get_channel(),true,$confirm);
-
+
if($result['success'] == false) {
if($result['message'])
notice($result['message']);
diff --git a/mod/zotfeed.php b/mod/zotfeed.php
index 2ca049563..6d84a5a1e 100644
--- a/mod/zotfeed.php
+++ b/mod/zotfeed.php
@@ -21,7 +21,7 @@ function zotfeed_init(&$a) {
$channel_address = ((argc() > 1) ? argv(1) : '');
if($channel_address) {
- $r = q("select channel_id from channel where channel_address = '%s' limit 1",
+ $r = q("select channel_id, channel_name from channel where channel_address = '%s' limit 1",
dbesc(argv(1))
);
}
@@ -30,6 +30,8 @@ function zotfeed_init(&$a) {
json_return_and_die($result);
}
+ logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG);
+
$result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],$mindate);
$result['success'] = true;
json_return_and_die($result);