Главная Обзор Помощь
Вход
deadtom
/
OwnchatBot
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Broke out the queue manager to a separate page, so it can auto-refresh.

deadtom 2 недель назад
Родитель
b4a35a65a9
Сommit
c3b3f12027
3 измененных файлов с 74 добавлено и 188 удалено
Единый вид Показать статистику Diff
  1. 1 1
      ownchatbot/static/mgmtpanel.js
  2. 45 179
      ownchatbot/templates/mgmt.html
  3. 28 8
      ownchatbot/web_panels.py

+ 1 - 1
ownchatbot/static/mgmtpanel.js
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-const defaultTab = "queue";
 
+const defaultTab = "managerewards";
 
 
 
 function openTab(event, tabName) {
 
 function openTab(event, tabName) {
 
     var i, tabcontent, tablinks;
 
     var i, tabcontent, tablinks;

+ 45 - 179
ownchatbot/templates/mgmt.html
Просмотреть файл 

@@ -9,10 +9,10 @@
 
     
     
     <div class="navbar">
 
     <div class="navbar">
 
         <div class="tab">
 
         <div class="tab">
 
-            <button class="tablinks" data-tab="queue" onclick="openTab(event, 'queue')">Queue</button>
 
-            <button class="tablinks" data-tab="accounts" onclick="openTab(event, 'accounts')">Manage Accounts</button>
 
+            <button class="tablinks" onclick="window.location.href='{{ url_for('web_panels.mgmtqueue') }}'">Rewards Queue Management</button>
 
             <button class="tablinks" data-tab="managerewards" onclick="openTab(event, 'managerewards')">Rewards</button>
 
             <button class="tablinks" data-tab="managerewards" onclick="openTab(event, 'managerewards')">Rewards</button>
 
             <button class="tablinks" data-tab="categories" onclick="openTab(event, 'categories')">Categories</button>
 
             <button class="tablinks" data-tab="categories" onclick="openTab(event, 'categories')">Categories</button>
 
+            <button class="tablinks" data-tab="accounts" onclick="openTab(event, 'accounts')">Manage Accounts</button>
 
             <button class="tablinks" data-tab="announcements" onclick="openTab(event, 'announcements')">Announcements</button>
 
             <button class="tablinks" data-tab="announcements" onclick="openTab(event, 'announcements')">Announcements</button>
 
             <button class="tablinks" data-tab="settings" onclick="openTab(event, 'settings')">Settings</button>
 
             <button class="tablinks" data-tab="settings" onclick="openTab(event, 'settings')">Settings</button>
 
             {% if kofi_integration %}
 
             {% if kofi_integration %}
 
@@ -21,181 +21,6 @@
 
         </div>
 
         </div>
 
         <img src="/static/img/ownchatbotwide.png">
 
         <img src="/static/img/ownchatbotwide.png">
 
     </div>
 
     </div>
 
-    
-    <div id='queue' class="tabcontent">
 
-        <body>
 
-            {% if votes %}
 
-            <table>
 
-                <thead>
 
-                    <tr>
 
-                        <th style="width: 20%;">Active Votes</th>
 
-                        <th style="width: 40%;">Description</th>
 
-                        <th style="width: 20%;">Price</th>
 
-                        <th style="width: 20%;">Current Tally</th>
 
-                        <th></th>
 
-                    </tr>
 
-                </thead>
 
-                <tbody>
 
-                {% for vote in votes %}
 
-                    <tr>
 
-                        <td> {{ prefix }}{{ vote[0] }} </td>
 
-                        <td> {{ vote[2] }} </td>
 
-                        
-                        {% set points_label = 'point' if rewards[vote[0]]["price"] == 1 else 'points' %}
 
-                        <td> {{ rewards[vote[0]]["price"] }} {{ points_label }}</td>
 
-                        
-                        {% set votes_label = 'vote' if vote[1] == 1 else 'votes' %}
 
-                        
-                        <td> {{ vote[1] }} {{ votes_label }}</td>
 
-                        <td></td>
 
-                    </tr>
 
-                {% endfor %}
 
-                </tbody>
 
-            </table>
 
-            {% else %}
 
-            <h3> You currently have no active votes. </h3>
 
-            {% endif %}
 
-            <br>
 
-            <hr>
 
-            {% if goals %}
 
-            <table>
 
-                <thead>
 
-                    <tr>
 
-                        <th style="width: 20%;">Active Goals</th>
 
-                        <th style="width: 40%;">Description</th>
 
-                        <th style="width: 25%;">Progress</th>
 
-                        <th></th>
 
-                    </tr>
 
-                </thead>
 
-                <tbody>
 
-                {% for goal in goals %}
 
-                    <tr>
 
-                        <td> {{ prefix }}{{ goal[0] }} </td>
 
-                        <td> {{ goal[3] }} </td>
 
-                        {% set progress = goal[1] / goal[2] * 100 %}
 
-                        <td>
 
-                            <div class="bar-light-grey bar-tiny bar-round" style="position: relative;">
 
-                                <div class="bar-round bar-blue" style="text-align: center; width:{{ progress }}%;">{{ '%0.0f'| format(progress| float) }}%
 
-                                </div>
 
-                                {% set milestones = rewards[goal[0]]["milestones"] %}
 
-                                {% for milestone_key, milestone in milestones.items() %}
 
-                                    {% if milestones[milestone_key][0] and milestones[milestone_key][1] %}
 
-                                        {% if milestones[milestone_key][1] < goal[2] %}
 
-                                            {% set milestone_progress = milestones[milestone_key][1] / goal[2] * 100 %}
 
-                                                <div class="milestone-marker" style="position: absolute; left: {{ milestone_progress }}%; transform: translateX(-50%);">
 
-                                                    <img src="/static/img/milestone.png" style="width: 16px; height: 16px;" title="{{ milestones[milestone_key][1] }} points. {{ milestones[milestone_key][0] }}">
 
-                                                </div>
 
-                                            {% endif %}
 
-                                        {% endif %}
 
-                                    {% endfor %}
 
-                            </div>
 
-                        </td>
 
-                        
-                        {% if goal[1] == goal[2] %}
 
-                        <td> {{ goal[1] }} / {{ goal[2] }} <img src=/static/img/tada.png style="width: 24px; height: 24px;"></td>
 
-                        {% else %}
 
-                        <td> {{ goal[1] }} / {{ goal[2] }} </td>
 
-                        {% endif %}
 
-                    </tr>
 
-                {% endfor %}
 
-                    <tr style="border-bottom: none;">
 
-                        <td>
 
-                        </td>
 
-                        <td>
 
-                        </td>
 
-                        <td style="font-size: small;">
 
-                            (Mouse over flags for milestone details)
 
-                        </td>
 
-                    </tr>
 
-                </tbody>
 
-            </table>
 
-            {% else %}
 
-            <h3> You currently have no active goals. </h3>
 
-            {% endif %}
 
-            <hr>
 
-            <h3>Redeems Queue</h3>
 
-            {% if queue %}
 
-            <a href="/mgmt/clearfulfilled"><button class="button button2" onclick="openTab(event, 'queue')">Clear Fullfilled Rewards</button></a>&nbsp;&nbsp;<a href="/mgmt/clearqueue"><button class="button button2" onclick="openTab(event, 'queue')">Clear All Rewards</button></a>
 
-            <table>
 
-                <thead>
 
-                    <tr>
 
-                        <th>Time</th>
 
-                        <th>Reward</th>
 
-                        <th>Description</th>
 
-                        <th>User</th>
 
-                        <th></th>
 
-                    </tr>
 
-                </thead>
 
-                <tbody>
 
-                {% for row in queue %}
 
-                    <tr>
 
-                        <td>{{ row[1].replace(tzinfo=utc_timezone).astimezone().strftime("%H:%M") }}</td>
 
-                        {% if row[4] %}
 
-                        <td><s>{{ row[2] }}</s></td>
 
-                        {% else %}
 
-                        <td>{{ row[2] }}</td>
 
-                        {% endif %}
 
-                        <td>{{ rewards[row[2]]["info"] }}</td>
 
-                        <td>{{ row[6] }}</td>
 
-                        {% if row[4] %}
 
-                        {% if row[5] %}
 
-                        <td>Refunded</td>
 
-                        {% else %}
 
-                        <td><a href="/mgmt/refund?reward={{ row[2] }}&username={{ row[6] }}&rewarder_id={{ row[3] }}&reward_id={{ row[0] }} "><button class="button button2" onclick="openTab(event, 'queue')">Refund</button></a></td>
 
-                        {% endif %}
 
-                        {% else %}
 
-                        <td><a href="/mgmt/fulfill?reward_id={{ row[0] }}&username={{ row[6] }}"><button class="button button2" onclick="openTab(event, 'queue')">Fulfill</button></a></td>
 
-                        {% endif %}
 
-                    </tr>
 
-                {% endfor %}
 
-                </tbody>
 
-            </table>
 
-            {% else %}
 
-            <p>There are currently no rewards waiting in the queue.</p>
 
-            {% endif %}
 
-        </body>
 
-    </div>
 
-
 
-    <div id='accounts' class="tabcontent">
 
-
 
-        <body>
 
-            <h3>Manage Viewer Accounts</h3>
 
-            {% if users %}
 
-            <table>
 
-                <thead>
 
-                    <tr>
 
-                        <th>User</th>
 
-                        <th>Points balance</th>
 
-                        <th>Email</th>
 
-                        <th>Authed</th>
 
-                        <th></th>
 
-                    </tr>
 
-                </thead>
 
-                <tbody>
 
-                {% for user in users %}
 
-                    <tr>
 
-                        <td> {{ user[1] }} </td>
 
-                        {% set points_label = 'point' if user[2] == 1 else 'points' %}
 
-                        
-                        <td>{{ user[2] }} {{ points_label }}</td>
 
-                        {% if user[4] %}
 
-                            <td>{{ user[4] }}</td>
 
-                        {% else %}
 
-                            <td>none</td>
 
-                        {% endif %}
 
-                        {% if user[3] %}
 
-                            <td>Yes</td>
 
-                        {% else %}
 
-                            <td>No</td>
 
-                        {% endif %}
 
-                        <td> <a href="/mgmt/edit_account/{{ user[0] }}?name={{ user[1] }}&points={{ user[2] }}&email={{ user[4] }}"><button class="button button2" onclick="openTab(event, 'panel')">Edit</button></a> </td>
 
-                    </tr>
 
-                {% endfor %}
 
-                </tbody>
 
-            </table>
 
-            {% endif %}
 
-        </body>
 
-    </div>
 
 
 
     <div id='managerewards' class="tabcontent">
 
     <div id='managerewards' class="tabcontent">
 
         <h3>Manage Rewards</h3>
 
         <h3>Manage Rewards</h3>
 
@@ -203,7 +28,7 @@
 
         <div>
 
         <div>
 
         <h4>Reward Types:</h4>
 
         <h4>Reward Types:</h4>
 
         <ul>
 
         <ul>
 
-            
+
 
             <li><u>Redeems</u> are standard stream point redeems. They get added to the queue for the streamer to fulfill.</li>
 
             <li><u>Redeems</u> are standard stream point redeems. They get added to the queue for the streamer to fulfill.</li>
 
             <li><u>Specials</u> are redeems, but they run system commands and scripts. This enables you to integrate a lot of other fun things, such as letting your viewers control lighting, activate devices, trigger webhooks, etc. Specials do not go into the queue, because they happen automagically.</li>
 
             <li><u>Specials</u> are redeems, but they run system commands and scripts. This enables you to integrate a lot of other fun things, such as letting your viewers control lighting, activate devices, trigger webhooks, etc. Specials do not go into the queue, because they happen automagically.</li>
 
               <ul>
 
               <ul>
 
@@ -285,7 +110,7 @@
 
                         <td>{{ reward_info["categories"] | join(', ') }}</td>
 
                         <td>{{ reward_info["categories"] | join(', ') }}</td>
 
                         <td>
 
                         <td>
 
                             <a href="{{ url_for('web_panels.edit', reward_name=reward) }}"><button class="button button2" onclick="openTab(event, 'managerewards')"><span style="color: green;">Edit</span></button></a>&nbsp
 
                             <a href="{{ url_for('web_panels.edit', reward_name=reward) }}"><button class="button button2" onclick="openTab(event, 'managerewards')"><span style="color: green;">Edit</span></button></a>&nbsp
 
-                            <a href="{{ url_for('web_panels.delete', reward_name=reward) }}"><button class="button button2" onclick="openTab(event, 'managerewards')"><span style="color: red;">Delete</span></button></a>&nbsp                            
+                            <a href="{{ url_for('web_panels.delete', reward_name=reward) }}"><button class="button button2" onclick="openTab(event, 'managerewards')"><span style="color: red;">Delete</span></button></a>&nbsp
 
                             {% if reward_info["type"] == "goal" or reward_info["type"] == "vote"  %}
 
                             {% if reward_info["type"] == "goal" or reward_info["type"] == "vote"  %}
 
                             <a href="{{ url_for('web_panels.reset', reward_name=reward, reward_type=reward_info["type"]) }}"><button class="button button2" onclick="openTab(event, 'managerewards')"><span style="color: orange;">Reset</span></button></a>
 
                             <a href="{{ url_for('web_panels.reset', reward_name=reward, reward_type=reward_info["type"]) }}"><button class="button button2" onclick="openTab(event, 'managerewards')"><span style="color: orange;">Reset</span></button></a>
 
                             {% endif %}
 
                             {% endif %}
 
@@ -297,6 +122,47 @@
 
             {% endif %}
 
             {% endif %}
 
         </body>
 
         </body>
 
     </div>
 
     </div>
 
+    
+    <div id='accounts' class="tabcontent">
 
+
 
+        <body>
 
+            <h3>Manage Viewer Accounts</h3>
 
+            {% if users %}
 
+            <table>
 
+                <thead>
 
+                    <tr>
 
+                        <th>User</th>
 
+                        <th>Points balance</th>
 
+                        <th>Email</th>
 
+                        <th>Authed</th>
 
+                        <th></th>
 
+                    </tr>
 
+                </thead>
 
+                <tbody>
 
+                {% for user in users %}
 
+                    <tr>
 
+                        <td> {{ user[1] }} </td>
 
+                        {% set points_label = 'point' if user[2] == 1 else 'points' %}
 
+                        
+                        <td>{{ user[2] }} {{ points_label }}</td>
 
+                        {% if user[4] %}
 
+                            <td>{{ user[4] }}</td>
 
+                        {% else %}
 
+                            <td>none</td>
 
+                        {% endif %}
 
+                        {% if user[3] %}
 
+                            <td>Yes</td>
 
+                        {% else %}
 
+                            <td>No</td>
 
+                        {% endif %}
 
+                        <td> <a href="/mgmt/edit_account/{{ user[0] }}?name={{ user[1] }}&points={{ user[2] }}&email={{ user[4] }}"><button class="button button2" onclick="openTab(event, 'panel')">Edit</button></a> </td>
 
+                    </tr>
 
+                {% endfor %}
 
+                </tbody>
 
+            </table>
 
+            {% endif %}
 
+        </body>
 
+    </div>
 
 
 
     <div id='categories' class="tabcontent">
 
     <div id='categories' class="tabcontent">
 
         <body>
 
         <body>

+ 28 - 8
ownchatbot/web_panels.py
Просмотреть файл 

@@ -133,6 +133,26 @@ def mgmt():
 
                            settings_info=settings_info)
 
                            settings_info=settings_info)
 
 
 
 
 
+@ocb.route('/mgmt_queue', methods=['GET'])  # The streamer's management panel
 
+@requires_login
 
+def mgmtqueue():
 
+    owncast_url = current_app.config['OWNCAST_URL']
 
+    db = get_db()
 
+    users = get_all_users(db)
 
+    utc_timezone = timezone.utc
 
+    rewards = current_app.config['REWARDS']
 
+    active_rewards = []
 
+    for each_reward in all_active_rewards():  # Get the name of all active rewards
 
+        active_rewards.append(each_reward)
 
+
 
+    return render_template('queue.html',
 
+                           queue=get_queue(db),
 
+                           votes=all_active_votes(db),
 
+                           goals=all_active_goals(db),
 
+                           rewards=rewards,
 
+                           utc_timezone=utc_timezone)
 
+
 
+
 
 @ocb.route('/userpanel', methods=['GET'])  # The viewers panel
 
 @ocb.route('/userpanel', methods=['GET'])  # The viewers panel
 
 def user_panel():
 
 def user_panel():
 
     db = get_db()
 
     db = get_db()
 
@@ -170,7 +190,7 @@ def fulfilled():
 
     reward_id = request.args.get('reward_id')
 
     reward_id = request.args.get('reward_id')
 
     username = request.args.get('username')
 
     username = request.args.get('username')
 
     fulfill_reward(db, reward_id)
 
     fulfill_reward(db, reward_id)
 
-    return redirect(url_for('web_panels.mgmt'))
 
+    return redirect(url_for('web_panels.mgmtqueue'))
 
 
 
 
 
 @ocb.route('/mgmt/refund', methods=['GET'])
 
 @ocb.route('/mgmt/refund', methods=['GET'])
 
@@ -185,7 +205,7 @@ def refund():
 
     user_id = request.args.get('rewarder_id')
 
     user_id = request.args.get('rewarder_id')
 
     refund_points(db, user_id, points)  # resets points
 
     refund_points(db, user_id, points)  # resets points
 
     refund_reward(db, reward_id)  # marks the reward as refunded
 
     refund_reward(db, reward_id)  # marks the reward as refunded
 
-    return redirect(url_for('web_panels.mgmt'))
 
+    return redirect(url_for('web_panels.mgmtqueue'))
 
 
 
 
 
 @ocb.route('/mgmt/edit_account/<user_id>', methods=['GET', 'POST'])  # Streamer manually edit user's account
 
 @ocb.route('/mgmt/edit_account/<user_id>', methods=['GET', 'POST'])  # Streamer manually edit user's account
 
@@ -239,7 +259,7 @@ def edit(reward_name):
 
     all_the_rewards = current_app.config['REWARDS']
 
     all_the_rewards = current_app.config['REWARDS']
 
     reward_data = all_the_rewards[reward_name]
 
     reward_data = all_the_rewards[reward_name]
 
     all_cats = current_app.config['ALL_CAT']
 
     all_cats = current_app.config['ALL_CAT']
 
-    
+
 
     if request.method == 'POST':
 
     if request.method == 'POST':
 
         reward_data['cooldown'] = int(request.form['cooldown'])
 
         reward_data['cooldown'] = int(request.form['cooldown'])
 
         reward_data['type'] = request.form['type']
 
         reward_data['type'] = request.form['type']
 
@@ -247,19 +267,19 @@ def edit(reward_name):
 
             reward_data['target'] = int(request.form['target'])
 
             reward_data['target'] = int(request.form['target'])
 
             if "milestones" not in reward_data:  # If using old rewards.py, and no milestones key exists, create one
 
             if "milestones" not in reward_data:  # If using old rewards.py, and no milestones key exists, create one
 
                 reward_data["milestones"] = {"milestone1": [], "milestone2": [], "milestone3": []}
 
                 reward_data["milestones"] = {"milestone1": [], "milestone2": [], "milestone3": []}
 
-            
+
 
             if request.form['milestone1_points'] == '':
 
             if request.form['milestone1_points'] == '':
 
                 reward_data['milestones']['milestone1'] = []
 
                 reward_data['milestones']['milestone1'] = []
 
             else:
 
             else:
 
                 milestone1_points = int(request.form['milestone1_points'])
 
                 milestone1_points = int(request.form['milestone1_points'])
 
                 reward_data['milestones']['milestone1'] = [request.form['milestone1_desc'], milestone1_points]
 
                 reward_data['milestones']['milestone1'] = [request.form['milestone1_desc'], milestone1_points]
 
-            
+
 
             if request.form['milestone2_points'] == '':
 
             if request.form['milestone2_points'] == '':
 
                 reward_data['milestones']['milestone2'] = []
 
                 reward_data['milestones']['milestone2'] = []
 
             else:
 
             else:
 
                 milestone2_points = int(request.form['milestone2_points'])
 
                 milestone2_points = int(request.form['milestone2_points'])
 
                 reward_data['milestones']['milestone2'] = [request.form['milestone2_desc'], milestone2_points]
 
                 reward_data['milestones']['milestone2'] = [request.form['milestone2_desc'], milestone2_points]
 
-            
+
 
             if request.form['milestone3_points'] == '':
 
             if request.form['milestone3_points'] == '':
 
                 reward_data['milestones']['milestone3'] = []
 
                 reward_data['milestones']['milestone3'] = []
 
             else:
 
             else:
 
@@ -279,7 +299,7 @@ def edit(reward_name):
 
         if reward_data['type'] == 'vote':
 
         if reward_data['type'] == 'vote':
 
             reread_votes()
 
             reread_votes()
 
         return redirect(url_for('web_panels.mgmt'))
 
         return redirect(url_for('web_panels.mgmt'))
 
-    
+
 
     return render_template('edit.html',
 
     return render_template('edit.html',
 
                            all_cats=all_cats,
 
                            all_cats=all_cats,
 
                            reward_name=reward_name,
 
                            reward_name=reward_name,
 
@@ -310,7 +330,7 @@ def settings():
 
         }
 
         }
 
     if save_config(config_dict):  # Save new config.py
 
     if save_config(config_dict):  # Save new config.py
 
         current_app.logger.info('Saved new config.')
 
         current_app.logger.info('Saved new config.')
 
-        
+
 
     return redirect(url_for('web_panels.mgmt'))
 
     return redirect(url_for('web_panels.mgmt'))