summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/InfiniteScroll/infinitescroll.js2
-rw-r--r--plugins/Meteor/meteorupdater.js2
-rw-r--r--plugins/Realtime/RealtimePlugin.php13
3 files changed, 7 insertions, 10 deletions
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 0dafef6d5..0c8edce2b 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,6 +1,6 @@
jQuery(document).ready(function($){
$('notices_primary').infinitescroll({
- debug: true,
+ debug: false,
infiniteScroll : false,
nextSelector : 'body#public li.nav_next a,'+
'body#all li.nav_next a,'+
diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 9ce68775b..cdd1d63fa 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -1,6 +1,4 @@
// Update the local timeline from a Meteor server
-// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
-// Do Replies timeline.
var MeteorUpdater = function()
{
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index c5fb6de03..198cb5ad7 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -139,8 +139,8 @@ class RealtimePlugin extends Plugin
// Add to the public timeline
- if ($notice->is_local ||
- ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
+ if ($notice->is_local == Notice::LOCAL_PUBLIC ||
+ ($notice->is_local == Notice::REMOTE_OMB && !common_config('public', 'localonly'))) {
$paths[] = array('public');
}
@@ -237,7 +237,6 @@ class RealtimePlugin extends Plugin
}
$action->showContentBlock();
- $action->showScripts();
$action->elementEnd('body');
return false; // No default processing
}
@@ -247,13 +246,13 @@ class RealtimePlugin extends Plugin
// FIXME: this code should be abstracted to a neutral third
// party, like Notice::asJson(). I'm not sure of the ethics
// of refactoring from within a plugin, so I'm just abusing
- // the ApiAction method. Don't do this unless you're me!
+ // the TwitterApiAction method. Don't do this unless you're me!
- require_once(INSTALLDIR.'/lib/api.php');
+ require_once(INSTALLDIR.'/lib/twitterapi.php');
- $act = new ApiAction('/dev/null');
+ $act = new TwitterApiAction('/dev/null');
- $arr = $act->twitterStatusArray($notice, true);
+ $arr = $act->twitter_status_array($notice, true);
$arr['url'] = $notice->bestUrl();
$arr['html'] = htmlspecialchars($notice->rendered);
$arr['source'] = htmlspecialchars($arr['source']);