WordPress.org
Get WordPress

Plugin Directory

Changeset 2000933


Ignore:
Timestamp:
12/24/2018 10:18:11 AM (7 years ago)
Author:
ryotsun
Message:

minor bug fixes

Location:
wp-slack-logbot/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • wp-slack-logbot/trunk/class-wp-slack-logbot.php

    r1995349 r2000933  
    88 * Text Domain:     wp-slack-logbot
    99 * Domain Path:     /languages
    10  * Version:         1.3
     10 * Version:         1.4
    1111 *
    1212 * @package         Wp_Slack_Logbot
    … …  
    4444     * @var string $slack_logbot_version
    4545     */
    46     var $slack_logbot_version = '1.1';
     46    var $slack_logbot_version = '1.4';
    4747
    4848    /**
    … …  
    7676        $table_name      = $wpdb->prefix . self::TABLE_NAME;
    7777        $charset_collate = $wpdb->get_charset_collate();
     78        $version         = get_option( 'slack_logbot_version', 0 );
     79        $has_table       = $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}slack_logbot'" );
     80
     81        if ( $has_table && $version < '1.4' ) {
     82            // Unique key has been changed since version 1.4.
     83            // Delete duplicated event_id rows except for min id.
     84            $wpdb->query( "DELETE FROM {$wpdb->prefix}slack_logbot WHERE {$wpdb->prefix}slack_logbot.id NOT IN (SELECT * FROM (SELECT MIN(id) FROM {$wpdb->prefix}slack_logbot GROUP BY event_id HAVING COUNT(event_id) > 1) sl1) AND {$wpdb->prefix}slack_logbot.event_id IN (SELECT * FROM (SELECT event_id FROM {$wpdb->prefix}slack_logbot GROUP BY event_id HAVING COUNT(event_id) > 1) sl2)" );
     85        }
    7886
    7987        $sql = "CREATE TABLE $table_name (
    … …  
    94102                PRIMARY KEY id (id),
    95103                KEY channel (team_id, event_channel),
    96                 UNIQUE KEY message (event_id, event_client_msg_id),
     104                UNIQUE KEY message (event_id),
    97105                KEY create_date (create_date),
    98106                KEY event_channel_type (event_channel_type)
    … …  
    102110        dbDelta( $sql );
    103111
    104         add_option( 'slack_logbot_version', $this->slack_logbot_version );
     112        update_option( 'slack_logbot_version', $this->slack_logbot_version );
    105113    }
    106114

  • wp-slack-logbot/trunk/includes/class-slack-api.php

    r1995344 r2000933  
    222222                if ( ! isset( $user_info_body['error'] ) ) {
    223223                    $user_name = $user_info_body['user']['profile']['display_name'];
     224
     225                    if ( '' == $user_name ) {
     226                        $user_name = $user_info_body['user']['profile']['real_name'];
     227                    }
    224228                }
    225229            }

  • wp-slack-logbot/trunk/includes/class-slack-logbot.php

    r1995344 r2000933  
    179179        $post_content .= '<ul>';
    180180        $post_content .= '<li class="time">' . get_date_from_gmt( $data['event_datetime'], get_option( 'time_format' ) ) . '</li>';
    181         $post_content .= '<li class="name">@' . $user_name . '</li>';
     181        $post_content .= '<li class="name">' . $user_name . '</li>';
    182182        $post_content .= '<li class="content">' . $this->replace_content( esc_html( $data['event_text'] ) ) . '</li>';
    183183        $post_content .= '</ul>';

  • wp-slack-logbot/trunk/readme.txt

    r1995344 r2000933  
    66Tested up to: 5.1-alpha-20181015.143023
    77Requires PHP: 5.3
    8 Stable tag: 1.3.0
     8Stable tag: 1.4.0
    99License: GPLv2 or later
    10 License URI: https://www.gnu.org/licenses/gpl-2.0.html
     10License URI: LICENSE
    1111
    1212Stores all messages of particular channels on slack. And able to see them.
    … …  
    7878== Changelog ==
    7979
     80= 1.4 =
     81* Minor bug fixes
     82
    8083= 1.3 =
    8184* Minor bug fixes
Note: See TracChangeset for help on using the changeset viewer.