Changeset 2526622

Timestamp:

05/05/2021 12:00:26 PM (5 years ago)

Author:

pressmate

Message:

Added Republish option and also improved the listing page functionality

Location:

makestories-helper/trunk

Files:

• api/publish.php (modified) (9 diffs)
• assets/css/ms-style.css (modified) (3 diffs)
• config.php (modified) (2 diffs)
• helpers.php (modified) (1 diff)
• pages/category-structure.php (modified) (3 diffs)
• templates/prepare-story-vars.php (modified) (1 diff)
• templates/single-story.php (modified) (1 diff)

makestories-helper/trunk/api/publish.php

@@ -59 +59 @@
         foreach ($parsed['media'] as $media) {
             $imageurl = $media['url'];
-            if(strpos($imageurl, "ss.makestories.io/get") > 0){
-                continue;
-            }
             $name = $imageurl;
             $nameExploded = explode("?",$imageurl);
@@ -76 +73 @@
             $attach_id = false;
             if( post_exists($atta_title) && !$forceUploadMedia ) {
-                $getAttachment = wp_get_attachment_by_post_name( $atta_title );
+                if(wp_validate_boolean(apply_filters("ms_check_for_duplicate_media", true))){
+                    $getAttachment = wp_get_attachment_by_post_name( $atta_title );
+                }
 
                 if($getAttachment) {
@@ -87 +86 @@
                         "into_else" => true,
                         "exists" => post_exists($atta_title),
-                        "i" => wp_get_attachment_by_post_name( $atta_title ),
                     ];
                 }
@@ -107 +105 @@
         }
 
-        if(ms_is_categories_enabled()){
+        if(ms_is_categories_enabled() && !isset($_REQUEST['is_republish'])){
             $category = ms_get_default_category();
             if(isset($_REQUEST['category']) && !empty($_REQUEST['category'])){
@@ -195 +193 @@
         $attach_id = false;
         $forceUploadMedia = ms_get_options()['forceUploadMedia'];
-        $getAttachment = wp_get_attachment_by_post_name( $atta_title );
+        if(wp_validate_boolean(apply_filters("ms_check_for_duplicate_media", true))){
+            $getAttachment = wp_get_attachment_by_post_name( $atta_title );
+        }
+        if(isset($_REQUEST['is_republish']) && wp_validate_boolean($_REQUEST['is_republish'])){
+            $forceUploadMedia = true;
+        }
         if( post_exists($atta_title) && !$forceUploadMedia && $getAttachment) {
             $attach_id = $getAttachment->ID;
         }else{
+
+            $wp_filetype = wp_check_filetype(basename($filename), null );
+            if(empty($wp_filetype['type'])){
+                $wp_filetype = ms_find_filetype($imageurl);
+            }
+
+            if(isset($wp_filetype['ext']) && !empty($wp_filetype['ext']) && !msEndsWith($filename, $wp_filetype['ext'])){
+                $filename = $filename.".".$wp_filetype['ext'];
+            }
+
             $uploaddir = wp_upload_dir();
             $uploadfile = $uploaddir['path'] . '/' . $filename;
@@ -206 +219 @@
             fclose($savefile);
 
-            $wp_filetype = wp_check_filetype(basename($filename), null );
             $attachment = array(
                 'post_mime_type' => $wp_filetype['type'],
@@ -214 +226 @@
             );
             $attach_id = wp_insert_attachment( $attachment, $uploadfile );
+            if($attach_id){
+                $attach_data = wp_generate_attachment_metadata($attach_id, $uploadfile);
+                wp_update_attachment_metadata($attach_id, $attach_data);
+            }
         }
 
@@ -552 +568 @@
             foreach (MS_DOMAINS as $domain){
                 if(strpos($imageUrl, $domain) !== false){
-                    $media[] = $imageUrl;
+                    $media[] = ms_replace_domains($imageUrl);
                     break;
                 }
@@ -559 +575 @@
     }
     header("Content-Type: application/json");
-    print_r(json_encode($media));
+    print_r(json_encode(array_unique($media)));
     die();
+}
+
+function ms_replace_domains($url){
+    $url = str_replace("storage.googleapis.com/makestories-202705.appspot.com",MS_CDN_LINK, $url);
+    $url = str_replace("storage.googleapis.com/cdn-storyasset-link",MS_CDN_LINK, $url);
+    return $url;
 }
 

makestories-helper/trunk/assets/css/ms-style.css

@@ -162 +162 @@
 
 .default-stories h3 {
-    margin-bottom: 40px;
+    margin-bottom: 10px;
+    margin-top: 15px;
+    font-size: 2rem;
+    text-overflow: unset;
+    white-space: normal;
+    -webkit-box-orient: vertical;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    max-height: 3em;
+    overflow: hidden;
+}
+.default-stories p{
+    margin-bottom: 0;
+    margin-top: 0;
+    font-size: 1.2rem;
+    text-decoration: none;
 }
 
 .story-thumb {
-    margin-bottom: 3%;
-    margin-right: 0;
+    margin: 0 15px;
+    margin-bottom: 15px;
     transition: transform 0.5s;
-    flex-basis: 17%;
+    flex-basis: 250px;
     border-radius: 6px;
-    box-shadow: 0 0 8px 0 rgb(53 53 53 / 18%);
+    box-shadow: 0 0 8px 0 rgba(53,53,53,0.18);
+    padding: 12px;
+}
+
+.story-thumb a{
+    text-decoration: none;
 }
 
 .story-thumb figure {
-    padding: 12px;
+    position: relative;
+    padding-bottom: 133%;
 }
 
@@ -185 +206 @@
 .story-thumb img {
     width: 100%;
-    border-radius: 6px;
+    border-radius: 4px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    object-fit: cover;
 }
 
@@ -211 +237 @@
 @media screen and (max-width: 995px) {
     .story-thumb {
-        flex-basis: 22%;
-        margin-right: 3.5%;
-        margin-bottom: 2rem;
-    }
-
-    .story-thumb:nth-child(6n) {
-        margin-right: 3.5%;
-    }
-
-    .story-thumb:nth-child(4n) {
-        margin-right: 0;
-    }
-
+        flex-basis: 225px;
+    }
+    .default-stories{
+        width: 90%;
+    }
 }
 
 @media screen and (max-width: 550px) {
     .story-thumb {
-        flex-basis: 45%;
-        margin-right: 8%;
-        margin-bottom: 2.5rem;
-    }
-    .story-thumb:nth-child(2n) {
-        margin-right: 0;
+        flex-basis: 40vw;
+    }
+    .default-stories{
+        width: 94%;
     }
 }

makestories-helper/trunk/config.php

@@ -10 +10 @@
 define("MS_CDN_URL", "https://api.makestories.io/wp/".MS_PLUGIN_VERSION."/");
 
-
+/**
+ * Base server url
+ */
+define("MS_BASE_SERVER_URL", "https://server.makestories.io/");
 
 /**
  * Url for viewing live preview of story being edited.
  */
-define("MS_PREVIEW_URL", "https://server.makestories.io/preview/");
+define("MS_PREVIEW_URL", MS_BASE_SERVER_URL."preview/");
 
 /**
@@ -72 +75 @@
 ]);
 
+define("MS_CDN_LINK", "cdn.storyasset.link");
+
 define("MS_DOMAINS", [
     "storage.googleapis.com/makestories",
+    "storage.googleapis.com/cdn-storyasset-link",
     "makestories.io",
     "images.unsplash.com",

makestories-helper/trunk/helpers.php

@@ -30 +30 @@
 }
 
+/**
+ * Function to get MIMETYPE of URL
+ * @param $imageurl string
+ * @return bool|string
+ */
+function ms_find_filetype($imageurl){
+    $c = curl_init(MS_BASE_SERVER_URL.'get-image-meta?url='.$imageurl);
+    curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+
+    $details = curl_exec($c);
+
+    if (curl_error($c)){
+        die(json_encode(["success" => false, "error" => "Error occurred while fetching image type."]));
+    }
+    // Get the status code
+    curl_close($c);
+    return json_decode($details, true);
+}
+
+function msEndsWith( $haystack, $needle ) {
+    $length = strlen( $needle );
+    if( !$length ) {
+        return true;
+    }
+    return substr( $haystack, -$length ) === $needle;
+}
 function ms_get_options(){
     $options = get_option('mscpt_makestories_settings');

makestories-helper/trunk/pages/category-structure.php

@@ -88 +88 @@
             </tr>
             <tr>
-                <th scope="row"><label>Update Story Media</label></th>
+                <th scope="row"><label></label></th>
                 <td>
                     <p class="submit">
@@ -112 +112 @@
                     <p class="submit">
                         <input type="submit" id="run-media-updates" name="submit" class="button button-primary" value="Run Updates"/>
+                    </p>
+                </td>
+            </tr>
+        </table>
+        <table class="form-table" role="presentation">
+            <tbody>
+            <tr>
+                <td colspan="2">
+                    <hr/>
+                </td>
+            </tr>
+            <tr>
+                <th scope="row"><label>Republish all stories</label></th>
+                <td>
+                    <p class="description">This button re-publishes all the stories on your wordpress site. Helpful for bulk changes and in case you have not yet migrated from your old image urls.</p>
+                    <p id="summary-republish"></p>
+                    <p class="submit">
+                        <input type="submit" id="run-story-updates" name="submit" class="button button-primary" value="Republish All"/>
                     </p>
                 </td>
@@ -213 +231 @@
 
             });
+
+            $("#run-story-updates").on("click", function(){
+                if(alreadyRunning){
+                    return false;
+                }
+                alreadyRunning = true;
+                let button = $(this);
+                let summary = $("#summary-republish");
+                $.ajax({
+                    url: baseApiUrl,
+                    data: {
+                        _wpnonce: nonce,
+                        action: "ms_get_published_posts_all",
+                    },
+                    success: function(data){
+                        if(data && data.posts){
+                            let numOfPosts = Object.keys(data.posts).length;
+                            let summaryPrepend = `Found ${numOfPosts} posts. Now fetching details and updating each post.`;
+                            summary.html(summaryPrepend);
+                            let chain = Promise.resolve();
+                            let index = 1;
+                            Object.values(data.posts).map(({ post_id, story_id, title }) => {
+                                chain = chain.then(() => republishStory(post_id, story_id, title, summaryPrepend+`<br>Publishing story ${index++} out of ${numOfPosts}`));
+                            });
+                            chain.then(() => {
+                                summary.html("All stories updated. Thank you!")
+                            });
+                        }
+                    },
+                    error: function(){
+                        button.html("Run Updates");
+                        summary.html("Some error occurred while fetching story details. Please try again in some time!");
+                    }
+                });
+
+                button.html("Running Updates...");
+                summary.html("Fetching story details. Please do not leave the page");
+
+
+                function republishStory(post_id, story, slug, summaryPrepend){
+                    return new Promise(resolve => {
+                        $.ajax({
+                            url: baseApiUrl,
+                            data: {
+                                _wpnonce: nonce,
+                                post_id,
+                                story,
+                                slug,
+                                is_republish: true,
+                                action: "ms_publish_post",
+                            },
+                            success: function(response){
+                                const { media } = response || {};
+                                if(media && Array.isArray(media) && media.length){
+                                    let chain = Promise.resolve();
+                                    let index = 1;
+                                    media.map((url) => {
+                                        chain = chain.then(() => {
+                                            summary.html(`${summaryPrepend}.<br/>Downloading media: ${index++} out of ${media.length}`);
+                                            return replaceMediaInStory(url.imageurl, post_id)
+                                        });
+                                    });
+                                    chain.then(resolve);
+                                }else{
+                                    resolve();
+                                }
+                            },
+                            error: (err) => {
+                                resolve();
+                            },
+                        });
+                    });
+                }
+
+                function replaceMediaInStory(imageurl, post_id){
+                    return new Promise(resolve => {
+                        $.ajax({
+                            url: baseApiUrl,
+                            data: {
+                                _wpnonce: nonce,
+                                action: "ms_upload_image_to_media_library",
+                                post_id,
+                                imageurl,
+                                is_republish: true,
+                            },
+                            success: resolve,
+                            error: (err) => {
+                                resolve();
+                            }
+                        });
+                    })
+                }
+
+            });
         })
     </script>

makestories-helper/trunk/templates/prepare-story-vars.php

@@ -10 +10 @@
 $logo = '';
 $title = get_the_title();
+$publishDate = get_the_date();
 try{
     if($publisherDetails && $parsedDetails = json_decode($publisherDetails, true)){
-        $posterPortrait = $parsedDetails['poster-portrait-src'];
-        $posterLandscape = $parsedDetails['poster-landscape-src'];
-        $posterSquare = $parsedDetails['poster-square-src'];
-        $logo = $parsedDetails['poster-square-src'];
         if($posterPortrait && !empty($posterPortrait)){
             $posterImage = $posterPortrait;
         }
+        $posterPortrait = isset($parsedDetails['poster-portrait-src']) ? $parsedDetails['poster-portrait-src'] : $posterImage;
+        $posterLandscape = isset($parsedDetails['poster-landscape-src']) ? $parsedDetails['poster-landscape-src'] : $posterImage;
+        $posterSquare = isset($parsedDetails['poster-square-src']) ? $parsedDetails['poster-square-src'] : $posterImage;
+        $logo = isset($parsedDetails['poster-square-src']) ? $parsedDetails['poster-square-src'] : '';
     }
 }catch (ErrorException $e){}

makestories-helper/trunk/templates/single-story.php

@@ -4 +4 @@
             <img src="<?php echo $posterImage ?>" />
         </figure>
+        <div class="bottom-text">
+            <h3><?php echo $title; ?></h3>
+            <p><?php echo $publishDate; ?></p>
+        </div>
     </a>
 </div>