clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1083 from annando/post 

Pumpio: Fix unknown table field / viewsrc: increase page speed
This commit is contained in:
Hypolite Petovan 2021-03-14 14:35:55 -04:00 committed by GitHub
parent 6b558ca236 f14bbeae14
commit e119866de7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pumpio/pumpio.php
View File

@ -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),

21
viewsrc/viewsrc.php
View File

@ -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']);
}