diff --git a/QvitterPlugin.php b/QvitterPlugin.php index 78dc60a..6f7cf8a 100644 --- a/QvitterPlugin.php +++ b/QvitterPlugin.php @@ -395,6 +395,7 @@ class QvitterPlugin extends Plugin { // replies and mentions (no notifications for these if this is a repeat) else { + $reply_notification_to = false; // check for reply to insert in notifications if($notice->reply_to) { $replyparent = $notice->getParent(); diff --git a/actions/apinewnotifications.php b/actions/apinewnotifications.php index 746c487..ffe0121 100644 --- a/actions/apinewnotifications.php +++ b/actions/apinewnotifications.php @@ -55,9 +55,10 @@ class ApiNewNotificationsAction extends ApiAction { parent::handle(); - $user_id = Profile::current()->id; + $new_notifications = array(); - if($user_id) { + if(Profile::current()) { + $user_id = Profile::current()->id; $notification = new QvitterNotification(); $notification->selectAdd(); diff --git a/actions/apiqvitternotifications.php b/actions/apiqvitternotifications.php index 236304c..122cc0b 100644 --- a/actions/apiqvitternotifications.php +++ b/actions/apiqvitternotifications.php @@ -127,7 +127,11 @@ class ApiQvitterNotificationsAction extends ApiPrivateAuthAction $notices = array(); $profile = ($this->auth_user) ? $this->auth_user->getProfile() : null; - + + if(!$profile instanceof Profile) { + return false; + } + $stream = new NotificationStream($profile); $notifications = $stream->getNotifications(($this->page - 1) * $this->count, diff --git a/actions/qvitter.php b/actions/qvitter.php index 5a58759..a8bfe64 100644 --- a/actions/qvitter.php +++ b/actions/qvitter.php @@ -102,9 +102,9 @@ class QvitterAction extends ApiAction <?php print $sitetitle; ?> - + - + ; window.registrationsClosed = ; window.siteTitle = ; - window.loggedIn = ; + window.loggedIn = ; window.timeBetweenPolling = ; window.apiRoot = ''; window.avatarRoot = ''; @@ -212,9 +218,7 @@ class QvitterAction extends ApiAction
    • - Classic Quitter'; } // sry for this junk - ?>
  • +
  • العربيّة
    • @@ -232,7 +236,8 @@ class QvitterAction extends ApiAction
  • Norsk
  • Português-Brasil
  • svenska
    • - + +
    @@ -381,11 +386,11 @@ class QvitterAction extends ApiAction - - - - - + + + + + diff --git a/css/qvitter.css b/css/qvitter.css index 6507e00..0884480 100644 --- a/css/qvitter.css +++ b/css/qvitter.css @@ -89,7 +89,7 @@ button.icon.nav-search, .upload-cover-photo, button.shorten i, .reload-stream { - background-image: url("../img/sprite.png?v=5"); + background-image: url("../img/sprite.png?v=6"); background-size: 500px 1329px; } @@ -411,9 +411,9 @@ body.rtl .dropdown-menu li:not(.dropdown-caret) { } #birds-top { - background-position: -193px -3px; + background-position: -385px -5px; display: block; - height: 64px; + height: 75px; position: fixed; right: 0; width: 103px; @@ -3730,9 +3730,10 @@ body.rtl #feed { float: left; } body.rtl #birds-top { - background-position: -205px -74px; + background-position: -400px -100px; right:auto; left:-3px; + width:100px; } body.rtl .language-dropdown { float:left; diff --git a/edited-gnu-social-files/lib/apiauthaction.php b/edited-gnu-social-files/lib/apiauthaction.php index a4c19e0..672e35b 100644 --- a/edited-gnu-social-files/lib/apiauthaction.php +++ b/edited-gnu-social-files/lib/apiauthaction.php @@ -88,7 +88,7 @@ class ApiAuthAction extends ApiAction // qvitterfix, accepts regular login session if ($this->scoped) { - $this->auth_user = $this->scoped; + $this->auth_user = $this->scoped->getUser(); $this->access = self::READ_WRITE; } diff --git a/js/dom-functions.js b/js/dom-functions.js index 941cf5c..ca62d34 100644 --- a/js/dom-functions.js +++ b/js/dom-functions.js @@ -933,7 +933,7 @@ function expand_queet(q,doScrolling) { getFromAPI("attachment/" + attachmentId + ".json",function(data){ if(data) { console.log(data); - q.children('.queet').find('.queet-text').html($.trim(data.replace(/@/gi,'').replace(/@/gi,'').replace(/!/gi,'').replace(/#/gi,''))); + q.children('.queet').find('.queet-text').html($.trim(data.replace(/@/gi,'').replace(/!/gi,'').replace(/#/gi,'').replace(/@/gi,'').replace(/@/gi,'').replace(/!/gi,'').replace(/#/gi,''))); } }); } diff --git a/js/qvitter.js b/js/qvitter.js index 2d17e36..8f9f432 100644 --- a/js/qvitter.js +++ b/js/qvitter.js @@ -427,16 +427,6 @@ function keyupSetBGColor(hex) { } -// go to standard settingspage -$('body').on('click','#moresettings',function(){ - $(document.body).append('