Changeset 1861487

Timestamp:

04/20/2018 12:28:04 AM (8 years ago)

Author:

fotkin

Message:

Ver 0.6

Location:

fotki-media-bot

Files:

• tags/0.6 (added)
• tags/0.6/admin (added)
• tags/0.6/admin/css (added)
• tags/0.6/admin/css/fotki_media_bot.css (added)
• tags/0.6/admin/js (added)
• tags/0.6/admin/js/fotki_media_bot.js (added)
• tags/0.6/class.incoming-data.php (added)
• tags/0.6/class.list-table.php (added)
• tags/0.6/class.telegram.php (added)
• tags/0.6/fotki-media-bot.php (added)
• tags/0.6/index.php (added)
• tags/0.6/readme.txt (added)
• trunk/admin (added)
• trunk/admin/css (added)
• trunk/admin/css/fotki_media_bot.css (added)
• trunk/admin/js (added)
• trunk/admin/js/fotki_media_bot.js (added)
• trunk/class.incoming-data.php (modified) (7 diffs)
• trunk/class.list-table.php (modified) (4 diffs)
• trunk/class.telegram.php (modified) (3 diffs)
• trunk/fotki-media-bot.php (modified) (12 diffs)
• trunk/readme.txt (modified) (2 diffs)

fotki-media-bot/trunk/class.incoming-data.php

@@ -6 +6 @@
     class FotkiMediaBot_IncomingData
     {
-        public static function init_data() {
+        public static function init_data()
+        {
             $entityBody = file_get_contents('php://input');
 
@@ -36 +37 @@
             }
 
-            if (!empty($response['message']['photo'])) {
+            $is_store_photos = self::is_store_media_by_media_type('photos', $bot_token);
+            $is_store_videos = self::is_store_media_by_media_type('videos', $bot_token);
+
+            if (!empty($response['message']['photo']) && $is_store_photos) {
                 list($photo_string, $photo_data) = FotkiMediaBot_Telegram::get_telegram_photo($bot_token, $response);
-                self::savePhotoStringToMediaLibrary($photo_string, $photo_data);
+                self::saveMediaStringToMediaLibrary($photo_string, $photo_data);
             }
 
@@ -56 +60 @@
                 );
 
+                // if it's gif and option not store photos, then not store
+                if (!empty($response['message']['document']['file_name']) && strpos($response['message']['document']['file_name'],'.gif.') !== FALSE && !$is_store_photos) {
+                    return;
+                }
+
+                // if it's photo format and option not store photos, then not store
+                if (in_array($allowed_file_types, array('jpg', 'jpeg', 'png', 'gif'),true) && !$is_store_photos) {
+                    return;
+                }
+
+                // if it's video format and option not store videos, then not store
+                if (in_array($allowed_file_types, array('wmv', 'avi', 'mp4'),true) && !$is_store_videos) {
+                    return;
+                }
+
                 if ($allowed_file_types) {
                     list($photo_string, $photo_data) = FotkiMediaBot_Telegram::get_telegram_document($bot_token, $response);
@@ -61 +80 @@
                     $photo_data['api_file_name'] = $response['message']['document']['file_name'];
 
-                    self::savePhotoStringToMediaLibrary($photo_string, $photo_data);
-                }
-            }
-        }
-
-        public static function savePhotoStringToMediaLibrary($photo_string, $photo_data) {
+                    self::saveMediaStringToMediaLibrary($photo_string, $photo_data);
+                }
+            }
+        }
+
+        public static function saveMediaStringToMediaLibrary($photo_string, $photo_data)
+        {
             $imageurl = $photo_data['photo_path'];
             $imageurl = stripslashes($imageurl);
@@ -124 +144 @@
                 }
 
-                if (strpos($photo_data['api_file_name'], '.gif.') !== FALSE) {
-                    update_post_meta($attach_id, '_' . FotkiMediaBot::FOTKI_MEDIA_BOT_PREFIX . 'is_gif', 1);
+                if (!empty($photo_data['api_file_name']) && strpos($photo_data['api_file_name'], '.gif.') !== FALSE) {
+                    update_post_meta($attach_id, '_' . FotkiMediaBot::FOTKI_MEDIA_BOT_PREFIX . 'media_type', 'gif');
                 }
 
@@ -139 +159 @@
         }
 
-        public static function write_incoming_log($message) {
+        public static function is_store_media_by_media_type($media_type, $bot_token) {
+            $bots = get_option(FotkiMediaBot::FOTKI_MEDIA_BOT_PREFIX . 'bots');
+
+            if (!empty($bots)) {
+
+                $i = 0;
+
+                foreach ($bots as &$bot) {
+                    foreach ($bot as $key => $value) {
+                        if ($key === 'fmb_bot_token' && $value === $bot_token) {
+                            return (empty($bot['fmb_bot_not_save_media_types'][$media_type]) ? true : false);
+                        }
+                    }
+                    $i++;
+                }
+            }
+
+            return false;
+        }
+
+        public static function write_incoming_log($message)
+        {
             $wp_date_format = get_option('date_format');
-
-            $date = '';
 
             if ($wp_date_format) {
@@ -150 +189 @@
             }
 
-            $log_file = $wp_debug_log_file_path = plugin_dir_path(__FILE__).'incoming_data_from_bots.log';
+            $log_file = ABSPATH . '/wp-content/fotki-media-bot-' . get_option(FotkiMediaBot::FOTKI_MEDIA_BOT_PREFIX . 'callback_id') . '.log';
 
             if ($handle = fopen($log_file, 'a')) {

fotki-media-bot/trunk/class.list-table.php

@@ -24 +24 @@
                 case 'fmb_bot_token':
                     return esc_attr($item[$column_name]);
+                case 'fmb_bot_not_save_media_types':
+                    $not_save_photos = false;
+                    $not_save_videos = false;
+
+                    if (!empty($item[$column_name])) {
+                        foreach ($item[$column_name] as $key => $value) {
+                            if ($key === 'photos' && !empty($value) && $value === '1') {
+                                $not_save_photos = true;
+                            } elseif ($key === 'videos' && !empty($value) && $value === '1') {
+                                $not_save_videos = true;
+                            }
+                        }
+                    }
+
+                    $html = '<div class="fmb-bot-status-group"><label for="save_photos"><input type="checkbox" class="fmb-bot-status-checkbox" id="save_photos" value="' . $item['fmb_bot_token'] . '" autocomplete="off"' . ($not_save_photos ?  '' : ' checked') . '> Photos</label> <span class="fmb-bot-status-checkbox-message"></span></div>';
+                    $html .= '<div class="fmb-bot-status-group"><label for="save_videos"><input type="checkbox" class="fmb-bot-status-checkbox" id="save_videos" value="' . $item['fmb_bot_token'] . '" autocomplete="off"' . ($not_save_videos ?  '' : ' checked') . '> Videos</label> <span class="fmb-bot-status-checkbox-message"></span></div>';
+
+                    return $html;
                 default:
                     return print_r($item, true); //Show the whole array for troubleshooting purposes
@@ -35 +53 @@
                 'fmb_bot_name' => __('Name', 'fotki-media-bot'),
                 'fmb_bot_service' => __('Service', 'fotki-media-bot'),
-                'fmb_bot_token' => __('Token', 'fotki-media-bot')
+                'fmb_bot_token' => __('Token', 'fotki-media-bot'),
+                'fmb_bot_not_save_media_types' => __('Store media type', 'fotki-media-bot'),
             ];
 
@@ -43 +62 @@
         public function column_fmb_bot_name($item)
         {
-            $actions = [
-                //'edit'      => sprintf('<a href="?page=%s&action=%s&book=%s">Edit</a>',$_REQUEST['page'],'edit',$item['fmb_bot_token']),
-                'delete' => sprintf('<a href="?page=%s&action=%s&token=%s">Delete</a>', esc_attr($_REQUEST['page']), 'delete', esc_attr($item['fmb_bot_token'])),
-                'disable_webhook' => sprintf('<a href="?page=%s&action=%s&token=%s">Disable webhook</a>', esc_attr($_REQUEST['page']), 'disable_webhook', esc_attr($item['fmb_bot_token'])),
-                'enable_webhook' => sprintf('<a href="?page=%s&action=%s&token=%s">Enable webhook</a>', esc_attr($_REQUEST['page']), 'enable_webhook', esc_attr($item['fmb_bot_token'])),
-            ];
+            $is_bot_active = FotkiMediaBot_Telegram::is_webhook_enabled($item['fmb_bot_token']);
 
-            return sprintf('%1$s %2$s', esc_attr($item['fmb_bot_name']), $this->row_actions($actions));
+            $actions['delete'] = sprintf('<a href="?page=%s&action=%s&token=%s">Delete</a>', esc_attr($_REQUEST['page']), 'delete', esc_attr($item['fmb_bot_token']));
+
+            if ($is_bot_active) {
+                $actions['disable_webhook'] = sprintf('<a href="?page=%s&action=%s&token=%s">Disable webhook</a>', esc_attr($_REQUEST['page']), 'disable_webhook', esc_attr($item['fmb_bot_token']));
+            } else {
+                $actions['enable_webhook'] = sprintf('<a href="?page=%s&action=%s&token=%s">Enable webhook</a>', esc_attr($_REQUEST['page']), 'enable_webhook', esc_attr($item['fmb_bot_token']));
+            }
+
+            $status_html = '<span class="fmb-bot-status ' . ($is_bot_active ? 'enabled' : 'disabled') . '" title="' . ($is_bot_active ? __('Bot enabled', 'fotki-media-bot') : __('Bot disabled', 'fotki-media-bot')) . '">&nbsp;</span>';
+
+            return sprintf('%1$s %2$s', $status_html . " " . esc_attr($item['fmb_bot_name']), $this->row_actions($actions));
         }
 
@@ -63 +87 @@
             $bots = get_option(FotkiMediaBot::FOTKI_MEDIA_BOT_PREFIX . 'bots');
 
-            if (!empty($bots)) {
-                foreach ($bots as &$bot) {
-                    foreach ($bot as $key => $value) {
-                        $bot[$key] = esc_attr($value);
-                    }
-                }
-            }
-
             $this->items = $bots;
         }

fotki-media-bot/trunk/class.telegram.php

@@ -38 +38 @@
         }
 
+        public static function get_webhook_info($bot_token)
+        {
+            $url = 'https://' . self::TELEGRAM_API_URL . '/bot' . $bot_token . '/getWebhookInfo';
+
+            $response = wp_remote_get($url);
+            $result = wp_remote_retrieve_body($response);
+
+            if ($result) {
+                return json_decode($result, true);
+            }
+
+            return false;
+        }
+
+        public static function is_webhook_enabled($bot_token) {
+            $bot_webhook_info = self::get_webhook_info($bot_token);
+
+            if ($bot_webhook_info['ok']) {
+                return $bot_webhook_info['result']['url'];
+            }
+
+            return false;
+        }
+
         public static function get_telegram_photo($bot_token, $data)
         {
@@ -47 +71 @@
 
             $photo_data['chat_id'] = sanitize_text_field($data['message']['chat']['id']);
-            $photo_data['chat_title'] = sanitize_text_field($data['message']['chat']['title']);
+            $photo_data['chat_title'] = !empty($data['message']['chat']['title']) ? sanitize_text_field($data['message']['chat']['title']) : '';
 
             // get last photo element (last is most bigger photo)
@@ -74 +98 @@
 
             $photo_data['chat_id'] = sanitize_text_field($data['message']['chat']['id']);
-            $photo_data['chat_title'] = sanitize_text_field($data['message']['chat']['title']);
+            $photo_data['chat_title'] = !empty($data['message']['chat']['title']) ? sanitize_text_field($data['message']['chat']['title']) : '';
 
-            // get last photo element (last is most bigger photo)
             $document = $data['message']['document'];
             $file_id = $document['file_id'];

fotki-media-bot/trunk/fotki-media-bot.php

@@ -3 +3 @@
 Plugin Name: Fotki Media Bot
 Plugin URI: https://agency.fotki.com/wordpress-plugins/fotki-media-bot/
-Description: Fotki Media Bot allows saves your photos from your chats (currently we only support Telegram messenger) to WordPress. It also creates daily posts in your Posts and puts your photos there. This plugin is in beta, please report to us any issues, we will try to take care of them.
-Version: 0.5
+Description: Fotki Media Bot allows saves your media from your chats (currently we only support Telegram messenger) to WordPress. It also creates daily posts in your Posts and puts your media there. This plugin is in beta, please report to us any issues, we will try to take care of them.
+Version: 0.6
 Author: FotkiAgency
 Author URI: https://agency.fotki.com/
@@ -16 +16 @@
 
 if (!class_exists('FotkiMediaBot')) {
+    register_activation_hook(__FILE__, ['FotkiMediaBot', 'fmb_install']);
+    //register_deactivation_hook(__FILE__, ['FotkiMediaBot', 'on_deactivation']);
+    register_uninstall_hook(__FILE__, ['FotkiMediaBot', 'fmb_uninstall']);
+
     class FotkiMediaBot
     {
@@ -37 +41 @@
         public function __construct()
         {
-            if (is_admin()) {
-                register_activation_hook(__FILE__, [$this, 'fmb_install']);
-                register_uninstall_hook(__FILE__, 'fmb_uninstall');
-
-                add_action('admin_menu', [$this, 'fmb_page_links']);
-
-                add_filter('attachment_fields_to_edit', [$this, 'add_image_attachment_fields_to_edit'], 10, 2);
-            }
-
             add_filter('query_vars', [$this, 'fmb_query_vars']);
             add_action('parse_request', [$this, 'fmb_parse_request']);
 
             add_shortcode('fotki_media_bot', [$this, 'fmb_shortcode']);
-        }
-
-        public function fmb_install()
+
+            if (is_admin()) {
+                add_action('admin_menu', [$this, 'fmb_page_links']);
+
+                add_filter('attachment_fields_to_edit', [$this, 'add_image_attachment_fields_to_edit'], 10, 2);
+
+                add_action('admin_enqueue_scripts', [$this, 'register_plugin_js_and_styles']);
+            }
+
+            add_action('wp_ajax_fmb_store_media_type_options', [$this, 'store_media_type_options_ajax']);
+        }
+
+        public static function fmb_install()
         {
             global $wpdb;
@@ -81 +86 @@
                     dbDelta($sql);
 
-                    add_option('fotki_media_bot_db_version', self::FOTKI_MEDIA_BOT_DB_VERSION);
+                    add_option(self::FOTKI_MEDIA_BOT_PREFIX . 'db_version', self::FOTKI_MEDIA_BOT_DB_VERSION);
                 }
             }
@@ -94 +99 @@
         }
 
-        public function fmb_uninstall()
+        public static function fmb_uninstall()
         {
             global $wpdb;
 
+            // if we have some bots then need disable this bots that they not send to site anything
+            $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
+
+            if (!empty($bots)) {
+                foreach ($bots as &$bot) {
+                    foreach ($bot as $key => $value) {
+                        if ($key === 'fmb_bot_token') {
+                            FotkiMediaBot_Telegram::delete_webhook($value);
+                        }
+                    }
+                }
+            }
+
+            // drop table if exists
             $sql = 'DROP TABLE IF EXISTS ' . $wpdb->prefix . self::FOTKI_MEDIA_BOT_BOTS_TABLE_NAME;
             $wpdb->query($sql);
 
-            delete_option('fotki_media_bot_db_version');
-            delete_option(self::FOTKI_MEDIA_BOT_PREFIX . 'callback_id');
-            delete_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
+            // find all options created by plugin and remove them all
+            $all_options = wp_load_alloptions();
+
+            foreach ($all_options as $name => $value) {
+                if (stristr($name,self::FOTKI_MEDIA_BOT_PREFIX)) {
+                    delete_option($name);
+                }
+            }
         }
 
@@ -161 +185 @@
         }
 
+        public function register_plugin_js_and_styles() {
+            wp_register_style(self::FOTKI_MEDIA_BOT_SLUG.'-main-css',plugin_dir_url(__FILE__) . 'admin/css/fotki_media_bot.css');
+            wp_enqueue_style(self::FOTKI_MEDIA_BOT_SLUG.'-main-css');
+
+            wp_register_script(self::FOTKI_MEDIA_BOT_SLUG.'-main-js', plugin_dir_url(__FILE__) . 'admin/js/fotki_media_bot.js', ['jquery'], '', TRUE);
+            wp_localize_script(self::FOTKI_MEDIA_BOT_SLUG.'-main-js', 'fotki_media_bot_data', ['ajax_url' => admin_url('admin-ajax.php')]);
+            wp_enqueue_script(self::FOTKI_MEDIA_BOT_SLUG.'-main-js');
+        }
+
+        function store_media_type_options_ajax() {
+            $debug = [];
+            $success = 0;
+
+            $bot_token = !empty($_POST['bot_token']) ? sanitize_text_field($_POST['bot_token']) : '';
+            $media_type = !empty($_POST['media_type']) ? sanitize_text_field($_POST['media_type']) : '';
+            $status = !empty($_POST['status']) ? sanitize_text_field($_POST['status']) : '';
+
+            if (!empty($bot_token) && !empty($media_type)) {
+
+                if ($media_type === 'photos' || $media_type === 'videos') {
+
+                    $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
+
+                    if (!empty($bots)) {
+
+                        $i = 0;
+
+                        foreach ($bots as &$bot) {
+                            foreach ($bot as $key => $value) {
+                                if ($key === 'fmb_bot_token' && $value === $bot_token) {
+                                    $bots[$i]['fmb_bot_not_save_media_types'][$media_type] = $status;
+                                }
+                            }
+                            $i++;
+                        }
+
+                        if (update_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots', $bots)) {
+                            $success = 1;
+                        } else {
+                            $success = 0;
+                        }
+                    } else {
+                        $success = 0;
+                    }
+                }
+            } else {
+                $success = 0;
+            }
+
+            die(json_encode(['success' => $success, 'messages' => $debug]));
+        }
+
         public function fmb_main_page()
         {
@@ -170 +246 @@
             global $wpdb;
 
-            ?>
-            <div class="wrap">
-                <h1><?php echo get_admin_page_title(); ?></h1>
-                <?php
-//                echo '<div>Callback ID: ' . get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'callback_id') . '</div>';
-
-                if (isset($_POST['bot_submited'])) {
-                    $bot_name = sanitize_text_field($_POST['bot_name']);
-                    $bot_service = sanitize_text_field($_POST['bot_service']);
-                    $bot_token = sanitize_text_field($_POST['bot_token']);
-
-                    if ($bot_name && $bot_service && $bot_token) {
-                        $bot_options = [
-                            'fmb_bot_name' => $bot_name,
-                            'fmb_bot_service' => $bot_service,
-                            'fmb_bot_token' => $bot_token,
-                        ];
-                    }
-
-                    $set_webhook = FotkiMediaBot_Telegram::set_webhook($bot_token, $this->get_callback_url());
-
-                    if ($set_webhook['ok']) {
-                        if (update_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots', [$bot_options])) {
-                            ?>
-                            <div class="updated"><p><strong><?php _e("Bot added."); ?></strong></p>
-                            </div>
-                            <?php
-                        } else {
-                            ?>
-                            <div class="error"><p><strong><?php _e("Bot not saved."); ?></strong></p></div>
-                            <?php
-                        }
-                    } else {
-                        ?>
-                        <div class="error"><p>
-                                <strong><?php _e("Bot not saved. Message from API: \"" . $set_webhook["description"] . "\""); ?></strong>
-                            </p></div>
-                        <?php
-                    }
-
-                    $this->show_bots();
-                } elseif (isset($_GET['action']) && $_GET['action'] === 'delete') {
-
-                    if (isset($_GET['token'])) {
-                        $token = sanitize_text_field($_GET['token']);
-                    }
-
-                    if (!empty($token)) {
-                        $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
-
-                        if (!empty($bots)) {
-
-                            $i = 0;
-
-                            foreach ($bots as &$bot) {
-                                foreach ($bot as $key => $value) {
-                                    if ($key === 'fmb_bot_token' && $value === $token) {
-                                        unset($bots[$i]);
-                                    }
-                                }
-                                $i++;
-                            }
-
-                            if (update_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots', $bots)) {
+            if (!empty(get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'callback_id'))) {
+                ?>
+                <div class="wrap">
+                    <h1><?php echo get_admin_page_title(); ?></h1>
+                    <?php
+
+
+                    if (isset($_POST['bot_submited'])) {
+                        $bot_name = sanitize_text_field($_POST['bot_name']);
+                        $bot_service = sanitize_text_field($_POST['bot_service']);
+                        $bot_token = sanitize_text_field($_POST['bot_token']);
+
+                        if ($bot_name && $bot_service && $bot_token) {
+                            $bot_options = [
+                                'fmb_bot_name' => $bot_name,
+                                'fmb_bot_service' => $bot_service,
+                                'fmb_bot_token' => $bot_token,
+                            ];
+                        }
+
+                        $set_webhook = FotkiMediaBot_Telegram::set_webhook($bot_token, $this->get_callback_url());
+
+                        if ($set_webhook['ok']) {
+                            if (update_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots', [$bot_options])) {
                                 ?>
-                                <div class="updated"><p><strong><?php _e("Bot removed."); ?></strong></p>
+                                <div class="updated"><p><strong><?php _e("Bot added."); ?></strong></p>
                                 </div>
                                 <?php
                             } else {
                                 ?>
-                                <div class="error"><p><strong><?php _e("Bot not removed."); ?></strong></p></div>
+                                <div class="error"><p><strong><?php _e("Bot not saved."); ?></strong></p></div>
                                 <?php
                             }
-                        }
-                    }
-
-                    $this->show_default_main_page();
-                } elseif (isset($_GET['action']) && $_GET['action'] === 'disable_webhook') {
-
-                    if (isset($_GET['token'])) {
-                        $token = sanitize_text_field($_GET['token']);
-                    }
-
-                    if (!empty($token)) {
-                        $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
-
-                        if (!empty($bots)) {
-
-                            $i = 0;
-                            $hook_disabled = false;
-
-                            foreach ($bots as &$bot) {
-                                foreach ($bot as $key => $value) {
-                                    if ($key === 'fmb_bot_token' && $value === $token) {
-                                        if (FotkiMediaBot_Telegram::delete_webhook($token)) {
-                                            $hook_disabled = true;
+                        } else {
+                            ?>
+                            <div class="error"><p>
+                                    <strong><?php _e("Bot not saved. Message from API: \"" . $set_webhook["description"] . "\""); ?></strong>
+                                </p></div>
+                            <?php
+                        }
+
+                        $this->show_bots();
+                    } elseif (isset($_GET['action']) && $_GET['action'] === 'delete') {
+
+                        if (isset($_GET['token'])) {
+                            $token = sanitize_text_field($_GET['token']);
+                        }
+
+                        if (!empty($token)) {
+                            $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
+
+                            if (!empty($bots)) {
+
+                                $i = 0;
+
+                                foreach ($bots as &$bot) {
+                                    foreach ($bot as $key => $value) {
+                                        if ($key === 'fmb_bot_token' && $value === $token) {
+                                            unset($bots[$i]);
                                         }
                                     }
+                                    $i++;
                                 }
-                                $i++;
+
+                                if (update_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots', $bots)) {
+                                    ?>
+                                    <div class="updated"><p><strong><?php _e("Bot removed."); ?></strong></p>
+                                    </div>
+                                    <?php
+                                } else {
+                                    ?>
+                                    <div class="error"><p><strong><?php _e("Bot not removed."); ?></strong></p></div>
+                                    <?php
+                                }
                             }
-
-                            if ($hook_disabled) {
-                                ?>
-                                <div class="updated"><p><strong><?php _e("Weebhook disabled."); ?></strong></p>
-                                </div>
-                                <?php
-                            } else {
-                                ?>
-                                <div class="error"><p><strong><?php _e("Weebhook not disabled."); ?></strong></p></div>
-                                <?php
-                            }
-                        }
-                    }
-
-                    $this->show_default_main_page();
-                } elseif (isset($_GET['action']) && $_GET['action'] === 'enable_webhook') {
-
-                    if (isset($_GET['token'])) {
-                        $token = sanitize_text_field($_GET['token']);
-                    }
-
-                    if (!empty($token)) {
-                        $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
-
-                        if (!empty($bots)) {
-
-                            $i = 0;
-                            $hook_enabled = false;
-
-                            foreach ($bots as &$bot) {
-                                foreach ($bot as $key => $value) {
-                                    if ($key === 'fmb_bot_token' && $value === $token) {
-                                        $set_webhook = FotkiMediaBot_Telegram::set_webhook($token, $this->get_callback_url());
-
-                                        if ($set_webhook['ok']) {
-                                            $hook_enabled = true;
+                        }
+
+                        $this->show_default_main_page();
+                    } elseif (isset($_GET['action']) && $_GET['action'] === 'disable_webhook') {
+
+                        if (isset($_GET['token'])) {
+                            $token = sanitize_text_field($_GET['token']);
+                        }
+
+                        if (!empty($token)) {
+                            $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
+
+                            if (!empty($bots)) {
+
+                                $i = 0;
+                                $hook_disabled = false;
+
+                                foreach ($bots as &$bot) {
+                                    foreach ($bot as $key => $value) {
+                                        if ($key === 'fmb_bot_token' && $value === $token) {
+                                            if (FotkiMediaBot_Telegram::delete_webhook($token)) {
+                                                $hook_disabled = true;
+                                            }
                                         }
                                     }
+                                    $i++;
                                 }
-                                $i++;
+
+                                if ($hook_disabled) {
+                                    ?>
+                                    <div class="updated"><p><strong><?php _e("Weebhook disabled."); ?></strong></p>
+                                    </div>
+                                    <?php
+                                } else {
+                                    ?>
+                                    <div class="error"><p><strong><?php _e("Weebhook not disabled."); ?></strong></p>
+                                    </div>
+                                    <?php
+                                }
                             }
-
-                            if ($hook_enabled) {
-                                ?>
-                                <div class="updated"><p><strong><?php _e("Weebhook enabled."); ?></strong></p>
-                                </div>
-                                <?php
-                            } else {
-                                ?>
-                                <div class="error"><p><strong><?php _e("Weebhook not enabled."); ?></strong></p></div>
-                                <?php
+                        }
+
+                        $this->show_default_main_page();
+                    } elseif (isset($_GET['action']) && $_GET['action'] === 'enable_webhook') {
+
+                        if (isset($_GET['token'])) {
+                            $token = sanitize_text_field($_GET['token']);
+                        }
+
+                        if (!empty($token)) {
+                            $bots = get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'bots');
+
+                            if (!empty($bots)) {
+
+                                $i = 0;
+                                $hook_enabled = false;
+
+                                foreach ($bots as &$bot) {
+                                    foreach ($bot as $key => $value) {
+                                        if ($key === 'fmb_bot_token' && $value === $token) {
+                                            $set_webhook = FotkiMediaBot_Telegram::set_webhook($token, $this->get_callback_url());
+
+                                            if ($set_webhook['ok']) {
+                                                $hook_enabled = true;
+                                            }
+                                        }
+                                    }
+                                    $i++;
+                                }
+
+                                if ($hook_enabled) {
+                                    ?>
+                                    <div class="updated"><p><strong><?php _e("Weebhook enabled."); ?></strong></p>
+                                    </div>
+                                    <?php
+                                } else {
+                                    ?>
+                                    <div class="error"><p><strong><?php _e("Weebhook not enabled."); ?></strong></p>
+                                    </div>
+                                    <?php
+                                }
                             }
                         }
+
+                        $this->show_default_main_page();
+
+                    } else {
+                        $this->show_default_main_page();
                     }
-
-                    $this->show_default_main_page();
-
-                } else {
-                    $this->show_default_main_page();
-                }
-                ?>
-
-
-            </div>
-            <?php
+                    ?>
+
+
+                </div>
+                <?php
+            } else {
+                echo '<div class="wrap">There is no callback ID. Please try re-activate plugin and if problem still exist please contact us.</div>';
+            }
         }
 
@@ -351 +433 @@
             echo '<h1>' . get_admin_page_title() . '</h1>';
 
-            $wp_debug_log_file_path = plugin_dir_path(__FILE__).'incoming_data_from_bots.log';
+            $wp_debug_log_file_path = get_home_path() . 'wp-content/fotki-media-bot-' . get_option(self::FOTKI_MEDIA_BOT_PREFIX . 'callback_id') . '.log';
 
             if (file_exists($wp_debug_log_file_path)) {
@@ -401 +483 @@
 
             <p>
-                Now you can chat with your Bot in Telegram Messenger and send photos to it, and Bot will save these photos to your WordPress Media Library. Also, you can add your Bot to any of your group chats and Bot will save to WordPress Media Library all photos you send to each other on Telegram.
+                Now you can chat with your Bot in Telegram Messenger and send media to it, and Bot will save these media to your WordPress Media Library. Also, you can add your Bot to any of your group chats and Bot will save to WordPress Media Library all media you send to each other on Telegram.
             </p>
 
@@ -502 +584 @@
 
             # if title eq date forma, took date from title, if not - take date from post_date
-            # if user will create post with own date and with our shortocode, then he wanna show photos for this date
-            # but post date is today and will show only photos for post creation date
+            # if user will create post with own date and with our shortocode, then he wanna show media for this date
+            # but post date is today and will show only media for post creation date
             if ($post->post_title === $this->fmb_validate_date($post->post_title, $date_format)) {
                 $parsed_date = date_parse($post->post_title);
@@ -565 +647 @@
         {
 
-            $is_photo_by_fmb = get_post_meta($post->ID, '_' . self::FOTKI_MEDIA_BOT_PREFIX . 'uploaded_by_fmb', true);
-            if (!empty($is_photo_by_fmb)) {
+            $is_media_by_fmb = get_post_meta($post->ID, '_' . self::FOTKI_MEDIA_BOT_PREFIX . 'uploaded_by_fmb', true);
+            if (!empty($is_media_by_fmb)) {
                 $form_fields[self::FOTKI_MEDIA_BOT_PREFIX . 'uploaded_by_fmb'] = [
                     'label' => __("By"),
@@ -610 +692 @@
             }
 
-            $is_gif = get_post_meta($post->ID, '_' . self::FOTKI_MEDIA_BOT_PREFIX . 'is_gif', true);
-            if (!empty($is_gif)) {
-                $form_fields[self::FOTKI_MEDIA_BOT_PREFIX . 'is_gif'] = [
-                    'label' => __("Is GIF"),
+            $media_type = get_post_meta($post->ID, '_' . self::FOTKI_MEDIA_BOT_PREFIX . 'media_type', true);
+            if (!empty($media_type)) {
+                $form_fields[self::FOTKI_MEDIA_BOT_PREFIX . 'media_type'] = [
+                    'label' => __("Media type"),
                     'input' => 'html',
-                    'html' => '<input type="text" readonly="readonly" value="yes" />'
+                    'html' => '<input type="text" readonly="readonly" value="' . esc_attr($media_type) . '" />'
                 ];
             }

fotki-media-bot/trunk/readme.txt

@@ -3 +3 @@
 Tags: bot, telegram, api, media, archiving, fotki, chat, messenger, gallery, backup
 Requires at least: 4.0
-Tested up to: 4.9.4
-Stable tag: 0.5
+Tested up to: 4.9.5
+Stable tag: 0.6
 License: GPLv2 or later
 
-Fotki Media Bot saves your photos from your chats (currently we only support Telegram messenger) to WordPress.
+Fotki Media Bot saves your media from your chats (currently we only support Telegram messenger) to WordPress.
 
 == Description ==
-Fotki Media Bot saves your photos from your messenger chats or chat groups to WordPress Media Library.
+Fotki Media Bot saves your media from your messenger chats or chat groups to WordPress Media Library.
 Fotki Media Bot currently supports only [Telegram Messenger](https://telegram.org/).
-Also it creates daily posts in your Posts and puts your photos there from your photos which you send and receive on Telegram Messenger.
+Also it creates daily posts in your Posts and puts your media there from your media which you send and receive on Telegram Messenger.
 
 This plugin is in beta, please report to us any issues, we will try to take care of them.
@@ -24 +24 @@
 3) Send "/setprivacy" command to BotFather using a Telegram and disable privacy (without this step, Fotki Media Bot will not be able to get media from your chats).
 
-Now, you can send photos to your Telegram Bot, and all photos will be automatically saved into your WordPress. And you can add your Bot to your group chats as well!
+Now, you can send media to your Telegram Bot, and all media will be automatically saved into your WordPress. And you can add your Bot to your group chats as well!
 
 == Changelog ==
+
+= 0.6 =
+* fixed minor bugs
+* added possibility to save or not save some media types from bot, like photos or video
+* added small features that plugin was more friendly
 
 = 0.5 =