Use workerqueue for mailstream jobs instead of custom table

[friendica-addons.git] / pumpio / pumpio.php

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 357f17433b1bf495eb1868760b8fc00ae124b264..5f03c6c57f499c766508af48e37a27420509b4e2 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -436,6 +436,8 @@ function pumpio_send(App $a, array &$b)
 
        Logger::log("pumpio_send: parameter ".print_r($b, true), Logger::DATA);
 
+       $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], $b['body']);
+
        if ($b['parent'] != $b['id']) {
                // Looking if its a reply to a pumpio post
                $condition = ['id' => $b['parent'], 'network' => Protocol::PUMPIO];
@@ -1300,7 +1302,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),