X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2FOStatusPlugin.php;h=03d63679d6500c50469a2d8718a5c6442bd23c88;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=86befd58cd54278c768caf9a5f65ee483585e3c3;hpb=af1b0915f48676e25fe0428b26f8987b59abb818;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 86befd58cd..03d63679d6 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -118,13 +118,16 @@ class OStatusPlugin extends Plugin // Incoming from a foreign PuSH hub $qm->connect('pushin', 'PushInQueueHandler'); + + // Re-subscribe feeds that need renewal + $qm->connect('pushrenew', 'PushRenewQueueHandler'); return true; } /** * Put saved notices into the queue for pubsub distribution. */ - function onStartEnqueueNotice($notice, &$transports) + function onStartEnqueueNotice(Notice $notice, array &$transports) { if ($notice->inScope(null)) { // put our transport first, in case there's any conflict (like OMB) @@ -237,17 +240,19 @@ class OStatusPlugin extends Plugin /* * If the field being looked for is URI look for the profile */ - function onStartProfileCompletionSearch($action, $profile, $search_engine) { + public function onStartProfileCompletionSearch(Action $action, Profile $profile, $search_engine) { if ($action->field == 'uri') { $profile->joinAdd(array('id', 'user:id')); $profile->whereAdd('uri LIKE "%' . $profile->escape($q) . '%"'); $profile->query(); + $validate = new Validate(); + if ($profile->N == 0) { try { - if (Validate::email($q)) { + if ($validate->email($q)) { $oprofile = Ostatus_profile::ensureWebfinger($q); - } else if (Validate::uri($q)) { + } else if ($validate->uri($q)) { $oprofile = Ostatus_profile::ensureProfileURL($q); } else { // TRANS: Exception in OStatus when invalid URI was entered. @@ -276,7 +281,7 @@ class OStatusPlugin extends Plugin * @param array &$mention in/out param: set of found mentions * @return boolean hook return value */ - function onEndFindMentions(Profile $sender, $text, &$mentions) + function onEndFindMentions(Profile $sender, $text, array &$mentions) { $matches = array(); @@ -292,10 +297,13 @@ class OStatusPlugin extends Plugin $oprofile = Ostatus_profile::ensureWebfinger($target); if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) { $profile = $oprofile->localProfile(); + $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target) ? + $profile->nickname : $target; $matches[$pos] = array('mentioned' => array($profile), 'type' => 'mention', - 'text' => $target, + 'text' => $text, 'position' => $pos, + 'length' => mb_strlen($target), 'url' => $profile->getUrl()); } } catch (Exception $e) { @@ -305,7 +313,7 @@ class OStatusPlugin extends Plugin } // Profile matches: @example.com/mublog/user - if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)+)!', + if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)*)!', $text, $wmatches, PREG_OFFSET_CAPTURE)) { @@ -319,10 +327,13 @@ class OStatusPlugin extends Plugin $oprofile = Ostatus_profile::ensureProfileURL($url); if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) { $profile = $oprofile->localProfile(); + $text = !empty($profile->nickname) && mb_strlen($profile->nickname) < mb_strlen($target) ? + $profile->nickname : $target; $matches[$pos] = array('mentioned' => array($profile), 'type' => 'mention', - 'text' => $target, + 'text' => $text, 'position' => $pos, + 'length' => mb_strlen($target), 'url' => $profile->getUrl()); break; } @@ -359,7 +370,7 @@ class OStatusPlugin extends Plugin * @param Profile &$profile * @return hook return code */ - function onStartCommandGetProfile($command, $arg, &$profile) + public function onStartCommandGetProfile(Command $command, $arg, Profile &$profile = null) { $oprofile = $this->pullRemoteProfile($arg); if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) { @@ -386,7 +397,7 @@ class OStatusPlugin extends Plugin * @param User_group &$group * @return hook return code */ - function onStartCommandGetGroup($command, $arg, &$group) + function onStartCommandGetGroup(Command $command, $arg, User_group &$group = null) { $oprofile = $this->pullRemoteProfile($arg); if ($oprofile instanceof Ostatus_profile && $oprofile->isGroup()) { @@ -433,6 +444,17 @@ class OStatusPlugin extends Plugin return null; } + function onEndProfileSettingsActions($out) { + $siteName = common_config('site', 'name'); + $js = 'navigator.registerContentHandler("application/vnd.mozilla.maybe.feed", "'.addslashes(common_local_url('ostatussub', null, array('profile' => '%s'))).'", "'.addslashes($siteName).'")'; + $out->elementStart('li'); + $out->element('a', + array('href' => 'javascript:'.$js), + // TRANS: Option in profile settings to add this instance to Firefox as a feedreader + _('Add to Firefox as feedreader')); + $out->elementEnd('li'); + } + /** * Make sure necessary tables are filled out. */ @@ -451,7 +473,7 @@ class OStatusPlugin extends Plugin return true; } - function onEndShowStatusNetScripts($action) { + public function onEndShowStatusNetScripts(Action $action) { $action->script($this->path('js/ostatus.js')); return true; } @@ -469,7 +491,7 @@ class OStatusPlugin extends Plugin function onStartNoticeSourceLink($notice, &$name, &$url, &$title) { // If we don't handle this, keep the event handler going - if ($notice->source != 'ostatus') { + if (!in_array($notice->source, array('ostatus', 'share'))) { return true; } @@ -509,7 +531,7 @@ class OStatusPlugin extends Plugin if ($oprofile instanceof Ostatus_profile) { $oprofile->processFeed($feed, 'push'); } else { - common_log(LOG_DEBUG, "No ostatus profile for incoming feed $feedsub->uri"); + common_debug("No ostatus profile for incoming feed $feedsub->uri"); } } @@ -1117,7 +1139,7 @@ class OStatusPlugin extends Plugin $oprofile->query(sprintf($sql, $profile->id, $profile->id)); if ($oprofile->N == 0) { - common_log(LOG_DEBUG, "No OStatus remote subscribees for $profile->nickname"); + common_debug("No OStatus remote subscribees for $profile->nickname"); return true; } @@ -1336,7 +1358,7 @@ class OStatusPlugin extends Plugin public function onGetLocalAttentions(Profile $actor, array $attention_uris, array &$mentions, array &$groups) { - list($mentions, $groups) = Ostatus_profile::filterAttention($actor, $attention_uris); + list($groups, $mentions) = Ostatus_profile::filterAttention($actor, $attention_uris); } // FIXME: Maybe this shouldn't be so authoritative that it breaks other remote profile lookups? @@ -1353,7 +1375,7 @@ class OStatusPlugin extends Plugin return true; } - public function onProfileDeleteRelated($profile, &$related) + public function onProfileDeleteRelated(Profile $profile, array &$related) { // Ostatus_profile has a 'profile_id' property, which will be used to find the object $related[] = 'Ostatus_profile'; @@ -1396,4 +1418,20 @@ class OStatusPlugin extends Plugin // Since we completed the salmon slap, we discontinue the event return false; } + + public function onCronDaily() + { + try { + $sub = FeedSub::renewalCheck(); + } catch (NoResultException $e) { + common_log(LOG_INFO, "There were no expiring feeds."); + return; + } + + $qm = QueueManager::get(); + while ($sub->fetch()) { + $item = array('feedsub_id' => $sub->id); + $qm->enqueue($item, 'pushrenew'); + } + } }