From e8ea0f20bd1cc8e15f1886aa88725e3e0d2a7a98 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 14 Mar 2021 17:39:45 +0000 Subject: [PATCH 1/2] Pumpio: Fix unknown view field "iid" --- pumpio/pumpio.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 357f1743..8e60f46d 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1300,7 +1300,7 @@ function pumpio_fetchinbox(App $a, $uid) intval($uid)); $lastitems = q("SELECT `uri` FROM `post-thread-user` - INNER JOIN `post-view` ON `post-view`.`id` = `post-thread-user`.`iid` + INNER JOIN `post-view` ON `post-view`.`id` = `post-thread-user`.`id` WHERE `post-thread-user`.`network` = '%s' AND `post-thread-user`.`uid` = %d AND `post-view`.`extid` != '' ORDER BY `post-thread-user`.`commented` DESC LIMIT 10", DBA::escape(Protocol::PUMPIO), From f14bbeae1437560b5734076a0101912c00755e54 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 14 Mar 2021 17:41:02 +0000 Subject: [PATCH 2/2] viewsrc: Improve page load speed --- viewsrc/viewsrc.php | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php index 44e92e85..445d8ee5 100644 --- a/viewsrc/viewsrc.php +++ b/viewsrc/viewsrc.php @@ -8,9 +8,6 @@ */ use Friendica\Core\Hook; use Friendica\DI; -use Friendica\Model\Item; -use Friendica\Database\DBA; -use Friendica\Model\Post; function viewsrc_install() { Hook::register('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu'); @@ -35,21 +32,5 @@ function viewsrc_item_photo_menu(&$a, &$b) return; } - if (local_user() != $b['item']['uid']) { - $item = Post::selectFirstForUser(local_user(), ['id'], ['uid' => local_user(), 'guid' => $b['item']['guid']]); - if (!DBA::isResult($item)) { - return; - } - - $item_id = $item['id']; - } else { - $item_id = $b['item']['id']; - } - - $b['menu'] = array_merge([DI::l10n()->t('View Source') => DI::baseUrl()->get() . '/viewsrc/'. $item_id], $b['menu']); - - //if((! local_user()) || (local_user() != $b['item']['uid'])) - // return; - - //$b['menu'] = array_merge(array(DI::l10n()->t('View Source') => $a->getBaseURL() . '/viewsrc/'. $b['item']['id']), $b['menu']); + $b['menu'] = array_merge([DI::l10n()->t('View Source') => DI::baseUrl()->get() . '/viewsrc/'. $b['item']['uri-id']], $b['menu']); }