Changeset 2793730

Timestamp:

10/03/2022 11:25:51 PM (3 years ago)

Author:

tanng

Message:

Version 1.1.0
Full release notes in README.txt

Location:

prixchat

Files:

• assets/screenshot-2.png (added)
• tags/1.1.0 (added)
• tags/1.1.0/LICENSE (added)
• tags/1.1.0/README.txt (added)
• tags/1.1.0/dist (added)
• tags/1.1.0/dist/index.css (added)
• tags/1.1.0/dist/index.html (added)
• tags/1.1.0/dist/index.js (added)
• tags/1.1.0/dist/vite.svg (added)
• tags/1.1.0/languages (added)
• tags/1.1.0/languages/prixchat.pot (added)
• tags/1.1.0/partials (added)
• tags/1.1.0/partials/settings.php (added)
• tags/1.1.0/prixchat.php (added)
• tags/1.1.0/src (added)
• tags/1.1.0/src/class-admin.php (added)
• tags/1.1.0/src/class-broadcast-service.php (added)
• tags/1.1.0/src/class-cache-service.php (added)
• tags/1.1.0/src/class-chat-service.php (added)
• tags/1.1.0/src/class-conversation.php (added)
• tags/1.1.0/src/class-loader.php (added)
• tags/1.1.0/src/class-message.php (added)
• tags/1.1.0/src/class-migration.php (added)
• tags/1.1.0/src/class-peer.php (added)
• tags/1.1.0/src/controllers (added)
• tags/1.1.0/src/controllers/class-base-controller.php (added)
• tags/1.1.0/src/controllers/class-conversations-controller.php (added)
• tags/1.1.0/src/controllers/class-messages-controller.php (added)
• tags/1.1.0/src/controllers/class-peers-controller.php (added)
• tags/1.1.0/src/controllers/class-sse-controller.php (added)
• tags/1.1.0/src/helpers.php (added)
• tags/1.1.0/uninstall.php (added)
• trunk/.gitignore (deleted)
• trunk/README.md (deleted)
• trunk/README.txt (modified) (2 diffs)
• trunk/dist (added)
• trunk/dist/index.css (added)
• trunk/dist/index.html (added)
• trunk/dist/index.js (added)
• trunk/dist/vite.svg (added)
• trunk/partials (added)
• trunk/partials/settings.php (added)
• trunk/prixchat.php (modified) (1 diff)
• trunk/react-ui (deleted)
• trunk/src/class-admin.php (modified) (4 diffs)
• trunk/src/class-message.php (modified) (2 diffs)
• trunk/src/helpers.php (modified) (1 diff)

prixchat/trunk/README.txt

@@ -1 +1 @@
 === PrixChat - Realtime Private & Group Chat Plugin  ===
-Contributors: tanng
-Tags: chat, private chat, group chat, inbox, realtime 
+Contributors: tanng, prixchat
+Tags: chat, group chat, member chat, live chat
 Requires at least: 5.0
 Tested up to: 6.0.2
-Stable tag: 1.0.0
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 == Description ==
-Just one click install and you have a truly real-time chat app. No third-party services, no ads, no complicated setup.
+Just one click install and you will have a truly real-time chat app. No third-party services, no complicated setup.
+
+[Home Page](https://prixchat.com) | [GitHub Project](https://github.com/PrixChat/wordpress/) 
 
 ### Key Features
 
-#### Truly Realtime with SSE
+#### ⚡ Truly Realtime with SSE
 Unlike other plugins which make AJAX requests periodically which consumes a lot of server’s resources or use WebSocket which requires a complicated setup and pricey, PrixChat core was built upon SSE which cost less resource than long-polling requests, and no need WS server setup.
 
-#### You Own Your Data
+#### 🪪 You Own Your Data
 Because no third party service required, all data stay at your own server. You truly own it! No risk, for free.
 
-#### Modern, Practical Design.
+#### 🏢 Modern, Practical Design.
 PrixChat frontend was built with React.js with the simple “boring” design that you have seen in other chat apps. No surprise, no need time to learn, just fast and responsive experience.
 
-#### Unlimited Private and Group Chat.
+#### ♾️ Unlimited Private and Group Chat.
 Create unlimited private user to user or group chat. Manage it easily. 
 
-#### Online status, Typing Indicator, Seen.
+#### 🔃 Online status, Typing Indicator, Seen.
 We support all major presence features that a chat system needs to level up user’s experience. 
 
-#### Reply, Reactions, Emoji support.
+#### 💞 Reply, Reactions, Emoji support.
 Emoji, peply a message and reaction to a message are included, for free.
 
-#### New Message Badges 
+#### 🔢 New Message Badges 
 Don’t miss any new messages, the new messages badges help people keep in touch with others.
 
-== Installation ==
+## Installation
 1. Upload the plugin files to the `/wp-content/plugins/prixchat` directory or install the plugin through the WordPress plugins screen directly.
 1. Activate the plugin through the 'Plugins' screen in WordPress.
 1. Go to PrixChat menu and start using it.
 
-== Frequently Asked Questions ==
+## Frequently Asked Questions
 **What makes PrixChat specials?**
 There are dozens of stuffs that makes PrixChat different with other plugins, but at its core, PrixChat uses Server Sent Events which is fast, no complicated setup like others which built on top of long-polling or WebSocket server. The frontend also uses React.js which WordPress already heavy using it. 
@@ -56 +58 @@
 If we found a serious bug, the minor patch will come within 24 hours.
 
-== Screenshots ==
+**Help, I have some issues!**
+Please raise a question in plugin's support forum or contact us via [email protected]
+
+## Screenshots
 1. Main App UI
+1. Settings Page
 
-== Changelog ==
+## Changelog 
 
-#### 1.0.0 (September 20th, 2022)
+#### 1.1.0 (October 04rd, 2022)
+- New: Settings page.
+- New: Custom reaction emoji.
+- New: Custom roles to use the chat.
+- New: Notification sound URL.
+- Fix: Sometimes, typing indicator stay even user offline.
+- Tweak: 40% smaller bundle size.
+
+#### 1.0.0 (September 06th, 2022)
 *Initial Release*

prixchat/trunk/prixchat.php

@@ -3 +3 @@
 Plugin Name: PrixChat
 Plugin URI: https://prixchat.com/
-Description: Realtime, effective chat solution for WordPress
-Version: 1.0.0
+Description: Self-hosted realtime group chat and private chat without any third party service.
+Version: 1.1.0
 Author: PrixChat
 License: GPLv2 or later

prixchat/trunk/src/class-admin.php

@@ -10 +10 @@
         // Register admin page scripts
         add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_scripts' ] );
+
+        // Admin page action handler
+        add_action( 'admin_init', [ $this, 'handle_admin_actions' ] );
+
+        add_filter( 'script_loader_tag', [ $this, 'add_type_attribute' ], 10, 3 );
     }
 
     public function add_admin_page() {
+        $allowed_roles = prixchat_get_settings( 'roles' );
+
+        if ( $allowed_roles === 'all' ) {
+            $capability = 'read';
+        } else {
+            $capability = 'use_prixchat';
+        }
+
         add_menu_page(
             __( 'PrixChat', 'prixchat' ),
             __( 'PrixChat', 'prixchat' ),
-            'read',
+            $capability,
             'prixchat',
             [ $this, 'render_admin_page' ],
             'dashicons-format-chat',
             3
+        );
+
+        // Add sub menu page
+        add_submenu_page(
+            'prixchat',
+            __( 'Settings', 'prixchat' ),
+            __( 'Settings', 'prixchat' ),
+            'manage_options',
+            'prixchat-settings',
+            [ $this, 'render_settings_page' ]
         );
     }
@@ -29 +52 @@
         }
 
-        wp_enqueue_style( 'prixchat-admin', PRIXCHAT_URL . '/react-ui/dist/index.css' );
-        wp_enqueue_script( 'prixchat-admin', PRIXCHAT_URL . '/react-ui/dist/index.js', [ 'wp-i18n' ], '1.0.0', true );
+        $version = defined( 'WP_DEBUG' ) ? time() : '1.1.0';
+
+        wp_enqueue_style( 'prixchat-admin', PRIXCHAT_URL . '/dist/index.css' );
+        wp_enqueue_script( 'prixchat-admin', PRIXCHAT_URL . '/dist/index.js', [ 'wp-i18n' ], $version, true );
         wp_set_script_translations( 'prixchat-admin', 'prixchat' );
 
@@ -47 +72 @@
         $users = Peer::get_all_users();
 
+        $available_emojis        = prixchat_get_settings( 'emojis' );
+        $incoming_messages_sound = prixchat_get_settings( 'incoming_messages_sound' );
+
         // Although we are using wp_set_script_translations for i18n, it's useful to use wp_localize_script
         // to pass data to the React app.
         wp_localize_script( 'prixchat-admin', 'prix', [
-            'apiUrl'        => home_url( '/wp-json/prixchat/v1/' ),
-            'nonce'         => wp_create_nonce( 'wp_rest' ),
-            'conversations' => $conversations,
-            'me'            => $me,
-            'users'         => $users,
+            'apiUrl'                => home_url( '/wp-json/prixchat/v1/' ),
+            'nonce'                 => wp_create_nonce( 'wp_rest' ),
+            'conversations'         => $conversations,
+            'me'                    => $me,
+            'users'                 => $users,
+            'availableEmojis'       => $available_emojis,
+            'incomingMessagesSound' => $incoming_messages_sound,
         ] );
+    }
+
+    public function add_type_attribute( $tag, $handle, $src ) {
+        if ( 'prixchat-admin' !== $handle ) {
+            return $tag;
+        }
+
+        return '<script type="module" src="' . esc_url( $src ) . '"></script>';
     }
 
@@ -65 +103 @@
         <?php
     }
+
+    public function handle_admin_actions() {
+        if ( ! isset( $_POST['prixchat'] ) ) {
+            return;
+        }
+
+        if ( ! wp_verify_nonce( $_POST['prixchat'], 'prixchat' ) ) {
+            return;
+        }
+
+        if ( ! current_user_can( 'manage_options' ) ) {
+            return;
+        }
+
+        $settings = [];
+
+        $settings['emojis']                  = isset( $_POST['emojis'] ) ? sanitize_text_field( $_POST['emojis'] ) : '';
+        $settings['incoming_messages_sound'] = isset( $_POST['incoming_messages_sound'] ) ? sanitize_text_field( $_POST['incoming_messages_sound'] ) : '';
+        $settings['roles']                   = isset( $_POST['roles'] ) ? serialize( $_POST['roles'] ) : 'all';
+
+        // Update capabilities
+        if ( isset( $_POST['roles'] ) && is_array( $_POST['roles'] ) && $_POST['roles'] !== 'all' ) {
+            $all_roles = wp_roles()->roles;
+            $all_roles = array_keys( $all_roles );
+
+            foreach ( $all_roles as $role ) {
+                $role = get_role( $role );
+
+                if ( in_array( $role->name, $_POST['roles'] ) ) {
+                    $role->add_cap( 'use_prixchat' );
+                } else {
+                    $role->remove_cap( 'use_prixchat' );
+                }
+            }
+        }
+
+        update_option( 'prixchat_settings', $settings );
+
+    }
+
+    public function render_settings_page() {
+        require_once PRIXCHAT_DIR . '/partials/settings.php';
+    }
 }

prixchat/trunk/src/class-message.php

@@ -66 +66 @@
         $me_inside = false;
         $me_peer   = null;
+
+        if ( ! $conversation ) {
+            return [];
+        }
+        
         foreach ( $conversation->peers as $peer ) {
             if ( $peer->user_id == get_current_user_id() ) {
@@ -124 +129 @@
                     return $peer;
                 }, $reaction );
-
-                return $reaction;
             }, $message->reactions );
         }

prixchat/trunk/src/helpers.php

@@ -20 +20 @@
     return $data;
 }
+
+function prixchat_default_settings()
+{
+    $settings = [
+        'emojis' => '😀,😂,😊,😉,😍,👍',
+        'roles' => 'all',
+        'incoming_messages_sound' => '',
+    ];
+
+    return $settings;
+}
+
+function prixchat_get_settings( $key = null, $default = false )
+{
+    $settings = get_option( 'prixchat_settings' );
+    
+    if ( ! $settings ) {
+        $settings = prixchat_default_settings();
+    }
+
+    if (is_null($key)) {
+        return $settings;
+    }
+
+    if ($key === 'emojis') {
+        $emojis = $settings[$key];
+        $emojis = explode(',', $emojis);
+        $emojis = array_unique($emojis);
+        return $emojis;
+    }
+
+    if ($key === 'roles') {
+        $roles = $settings[$key];
+        $roles = $roles !== 'all' ? unserialize($roles) : 'all';
+
+        return $roles;
+    }
+
+    if ( isset( $settings[$key] ) ) {
+        return $settings[$key];
+    }
+
+    return $default;
+}