Xfmg/init

Controller/Conversation.php

@@ -115,7 +115,7 @@ public function actionPostAttachments()
         $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
         $tempHash = $attachmentPlugin->getAttachmentTempHash($contentData);
 
-        return $attachmentPlugin->doUpload($tempHash, 'conversation_message', $contentData);
+        return $attachmentPlugin->doUploadAndRespond($tempHash, 'conversation_message', $contentData);
     }
 
     protected function assertViewableConversation($conversationId, array $extraWith = [])

Controller/ConversationMessage.php

@@ -208,7 +208,7 @@ public function actionPostAttachments()
         $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
         $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
 
-        return $attachmentPlugin->doUpload($tempHash, 'conversation_message', $context);
+        return $attachmentPlugin->doUploadAndRespond($tempHash, 'conversation_message', $context);
     }
 
     public function actionPostReport(ParameterBag $params)

Controller/Post.php

@@ -278,7 +278,7 @@ public function actionPostAttachments()
         $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
         $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
 
-        return $attachmentPlugin->doUpload($tempHash, 'post', $context);
+        return $attachmentPlugin->doUploadAndRespond($tempHash, 'post', $context);
     }
 
     public function actionGetLikes(ParameterBag $params)

Controller/Thread.php

@@ -203,7 +203,7 @@ public function actionPostAttachments()
         $attachmentPlugin = $this->plugin('Xfrocks\Api:Attachment');
         $tempHash = $attachmentPlugin->getAttachmentTempHash($context);
 
-        return $attachmentPlugin->doUpload($tempHash, 'post', $context);
+        return $attachmentPlugin->doUploadAndRespond($tempHash, 'post', $context);
     }
 
     public function actionGetFollowers(ParameterBag $params)

ControllerPlugin/Attachment.php

@@ -45,7 +45,15 @@ public function doUpload($hash, $contentType, $context, $formField = 'file')
         if (!$attachment) {
             throw $this->controller->exception($this->controller->noPermission($error));
         }
+        return $attachment;
+    }
+
+    public function doUploadAndRespond($hash, $contentType, $context, $formField = 'file')
+    {
+        $attachment = $this->doUpload($hash, $contentType, $context, $formField);
 
+        /** @var AbstractController $controller */
+        $controller = $this->controller;
         $lazyTransformer = $controller->transformEntityLazily($attachment);
         $lazyTransformer->addCallbackPreTransform(function ($context) use ($hash) {
             /** @var TransformContext $context */
@@ -64,10 +72,9 @@ public function getAttachmentTempHash(array $contentData = [])
         $params = $controller->params();
 
         $prefix = '';
-        $inputHash = $params['attachment_hash'];
 
-        if (!empty($inputHash)) {
-            $prefix = sprintf('hash%s', $inputHash);
+        if (!empty($params['attachment_hash'])) {
+            $prefix = sprintf('hash%s', $params['attachment_hash']);
         } elseif (!empty($contentData['post_id'])) {
             $prefix = sprintf('post%d', $contentData['post_id']);
         } elseif (!empty($contentData['thread_id'])) {
@@ -80,6 +87,10 @@ public function getAttachmentTempHash(array $contentData = [])
             $prefix = sprintf('message%d', $contentData['message_id']);
         } elseif (!empty($contentData['conversation_id'])) {
             $prefix = sprintf('conversation%d', $contentData['conversation_id']);
+        } elseif (!empty($contentData['media_album_id'])) {
+            $prefix = sprintf('media_album%d', $contentData['media_album_id']);
+        } elseif (!empty($contentData['media_category_id'])) {
+            $prefix = sprintf('media_category%d', $contentData['media_category_id']);
         }
 
         /** @var Session $session */

Listener.php

@@ -42,6 +42,12 @@ public static function appSetup($app)
         if (!empty($addOnCache['XFRM'])) {
             $extension->addClassExtension('Xfrocks\Api\Data\Modules', 'Xfrocks\Api\XFRM\Data\Modules');
         }
+
+        $addOnCache = $container['addon.cache'];
+        $extension = $app->extension();
+        if (!empty($addOnCache['XFMG'])) {
+            $extension->addClassExtension('Xfrocks\Api\Data\Modules', 'Xfrocks\Api\XFMG\Data\Modules');
+        }
     }
 
     /**

XFMG/Controller/AbstractController.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: datbth
+ * Date: 05/12/2018
+ * Time: 21:39
+ */
+
+namespace Xfrocks\Api\XFMG\Controller;
+
+abstract class AbstractController extends \Xfrocks\Api\Controller\AbstractController
+{
+    /**
+     * @param int $albumId
+     * @param array $extraWith
+     * @return \XFMG\Entity\Album
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableAlbum($albumId, array $extraWith = [])
+    {
+        /** @var \XFMG\Entity\Album $album */
+        $album = $this->assertRecordExists(
+            'XFMG:Album',
+            $albumId,
+            $extraWith,
+            'xfmg_requested_album_not_found'
+        );
+
+        if (!$album->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $album;
+    }
+
+    /**
+     * @param int $categoryId
+     * @param array $extraWith
+     * @return \XFMG\Entity\Category
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableCategory($categoryId, array $extraWith = [])
+    {
+        /** @var \XFMG\Entity\Category $category */
+        $category = $this->assertRecordExists(
+            'XFMG:Category',
+            $categoryId,
+            $extraWith,
+            'xfmg_requested_category_not_found'
+        );
+
+        if (!$category->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $category;
+    }
+
+    /**
+     * @param int $mediaId
+     * @param array $extraWith
+     * @return \XFMG\Entity\MediaItem
+     * @throws \XF\Mvc\Reply\Exception
+     */
+    protected function assertViewableMediaItem($mediaId, array $extraWith = [])
+    {
+        /** @var \XFMG\Entity\MediaItem $item */
+        $item = $this->assertRecordExists(
+            'XFMG:MediaItem',
+            $mediaId,
+            $extraWith,
+            'xfmg_requested_media_item_not_found'
+        );
+
+        if (!$item->canView($error)) {
+            throw $this->exception($this->noPermission($error));
+        }
+
+        return $item;
+    }
+}