.gitignore

@@ -5,7 +5,6 @@ instance/
 /*.kdev4
 .git/
 ownchatbot/snippets/
-ownchatbot/static/Shunda.ttf
 
 __pycache__/
 *.py[cod]

TODO.md

@@ -1,3 +1,2 @@
 * Add a general chat celebration
 * Short video tutorials on configuring OwnchatBot
-* Add option to set up Kofi subscriber-only rewards

ownchatbot/defaults/kofi.py

@@ -3,6 +3,5 @@ KOFI_SETTINGS = {
     "donation_points": 100,  # How many points per dollar donated?
     "subs": False,  # Reward subscriptions with points
     "sub_points": 1000,  # How many points per month?
-    "kofi_url": "https://",  # What is the URL of your Kofi page?
-    "kofi_logo": "kofi_symbol.png"  # Which Kofi logo are we using in the viewer panel?
+    "kofi_url": "https://"  # What is the URL of your Kofi page?
 }

ownchatbot/templates/add.html

@@ -146,7 +146,11 @@
             {% endif %}
             <br><button class="button button2" type="submit">Create {{ reward_type }}</button><br>
         </form>
-        <a href="{{ url_for('web_panels.mgmt', activeTab='managerewards') }}">Cancel</a>
+	{% if reward_type == "category"%}
+        	<a href="{{ url_for('web_panels.mgmt', activeTab='categories') }}">Cancel</a>
+        {% else %}
+            <a href="{{ url_for('web_panels.mgmt', activeTab='managerewards') }}">Cancel</a>
+        {% endif %}
         <br><br>
     </div>
 </body>

ownchatbot/templates/edit.html

@@ -124,7 +124,11 @@
                 </table>
                 <br><button class="button button2" type="submit">Save Changes</button><br>
             </form>
-            <a href="{{ url_for('web_panels.mgmt', activeTab='managerewards') }}">Cancel</a>
+		{% if reward_data["type"] == "category"%}
+			<a href="{{ url_for('web_panels.mgmt', activeTab='categories') }}">Cancel</a>
+		{% else %}
+			<a href="{{ url_for('web_panels.mgmt', activeTab='managerewards') }}">Cancel</a>
+		{% endif %}
             <br><br>
         </body>
     </div>

ownchatbot/templates/mgmt.html

@@ -387,37 +387,10 @@
                                         </tbody>
                                     </table>
                                 </tr>
-                                <tr>
-                        <table>
-                        <h4> Logo </h4>
-                            <tbody>
-                                <tr style="border-bottom: none;">
-                                Which logo would you like to use?
-                                </tr>
-                            {% for kofi_logo in kofi_logos %}
-                                {% if loop.index0 % 8 == 0 %}
-                                    <tr style="border-bottom: none;">
-                                {% endif %}
-                                <td>
-                                    <label for="kofi_logo"><img src="/static/img/kofi/{{ kofi_logo }}"></label>
-                                    {% if kofi_logo == kofi_settings['kofi_logo'] %}
-                                        <input type="radio" name="kofi_logo" value="{{ kofi_logo }}" checked>
-                                    {% else %}
-                                        <input type="radio" name="kofi_logo" value="{{ kofi_logo }}">
-                                    {% endif %}
-                                </td>
-                                {% if loop.index0 % 8 == 7 or loop.last %}
-                                </tr> <!-- Close the row after 8 items or at the end -->
-                                {% endif %}
-                            {% endfor %}
-                            </tbody>
-                        </table>
-                    </tr>
                 </table>
                 <br><button class="button button2" type="submit">Save Changes</button><br>
             </form>
             <br><br>
-	    <i>Kofi subscription tier support coming soon.</i>
         </body>
     </div>
 

ownchatbot/templates/userpanel.html

@@ -36,7 +36,7 @@
         
         <hr>
         {% if kofi_integration %}
-            <h4>Kofi Integration <a href="{{ kofi_settings['kofi_url'] }}/donate" target="new"><img src="/static/img/kofi/{{ kofi_settings['kofi_logo'] }}"></a></h4>
+            <h4><a href="{{ kofi_settings['kofi_url'] }}/donate" target="new"><img src="/static/img/kofi_symbol.png"></a> Kofi Integration</h4>
             
             {% if kofi_settings['donations'] %}
                 {% set d_points_label = 'point' if donation_points == 1 else 'points' %}
@@ -47,7 +47,7 @@
                 {% set s_points_label = 'point' if sub_points == 1 else 'points' %}
                 Kofi subscribers get {{ kofi_settings['sub_points'] }} {{ s_points_label }} every month.<br>
             {% endif %}
-            <i>You must be authenticated with Owncast to take advantage of Kofi integration.</i><br>
+            <i>You must be authenticated with Owncast to earn points for Kofi donations.</i><br>
             
             {% for user in users %}
             
@@ -192,7 +192,7 @@
                         <td></td>
                         <td></td>
                         <td style="font-size: small;">
-                            (Mouse over flags for milestone details)
+                            {% if milestones %}(Mouse over flags for milestone details){% endif %}
                         </td>
                     </tr>
                 </tbody>

ownchatbot/web_panels.py

@@ -100,7 +100,6 @@ def mgmt():
     access_token = current_app.config['ACCESS_TOKEN']
     kofi_token = current_app.config['KOFI_TOKEN']
     kofi_integration = current_app.config['KOFI_INTEGRATION']
-    kofi_logos = kofi_pngs()
     announce_enable = current_app.config['ANNOUNCE_ENABLE']
     announce_interval = current_app.config['ANNOUNCE_INTERVAL']
     announcements = current_app.config['ANNOUNCEMENTS']
@@ -130,7 +129,6 @@ def mgmt():
                            prefix=current_app.config['PREFIX'],
                            kofi_settings=current_app.config['KOFI_SETTINGS'],
                            kofi_integration=kofi_integration,
-                           kofi_logos=kofi_logos,
                            announcements=announcements,
                            users=users,
                            utc_timezone=utc_timezone,
@@ -307,7 +305,10 @@ def edit(reward_name):
             reread_goals()
         if reward_data['type'] == 'vote':
             reread_votes()
-        return redirect(url_for('web_panels.mgmt', activeTab='managerewards'))
+        if reward_data['type'] == 'category':
+            return redirect(url_for('web_panels.mgmt', activeTab='categories'))
+        else:
+            return redirect(url_for('web_panels.mgmt', activeTab='managerewards'))
 
     return render_template('edit.html',
                            all_cats=all_cats,
@@ -374,13 +375,10 @@ def ksettings():
         enable_subs = 'enable_subs' in request.form
         sub_points = int(request.form['sub_points'])
         kofi_url = request.form['kofi_url']
-        kofi_logo = request.form.get('kofi_logo')
-
         kofi_settings_dict['donations'] = enable_donations
         kofi_settings_dict['subs'] = enable_subs
         kofi_settings_dict['sub_points'] = sub_points
         kofi_settings_dict['kofi_url'] = kofi_url
-        kofi_settings_dict['kofi_logo'] = kofi_logo
         if save_kofi_settings(kofi_settings_dict):
             current_app.logger.info(f'Saved Kofi settings')
 
@@ -467,6 +465,7 @@ def add(reward_type):
             inactive_categories = current_app.config['INACTIVE_CAT']
             inactive_categories.append(name)  # Add it to the INACTIVE_CAT variable
             reread_categories()  # Write it to categories.py
+            return redirect(url_for('web_panels.mgmt', activeTab='categories'))
         return redirect(url_for('web_panels.mgmt', activeTab='managerewards'))
 
     return render_template('add.html',
@@ -548,7 +547,7 @@ def rereadv():
 @requires_login
 def clearfulfilled():
     if clear_fulfilled_rewards():
-            current_app.logger.info('Cleared fulfilled rewards.')
+        current_app.logger.info('Cleared fulfilled rewards.')
     return redirect(url_for('web_panels.mgmtqueue'))
 
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ownchatbot"
-version = "1.1.1"
+version = "1.1.2"
 authors = [
     {name = "DeadTOm", email = "deadtom@deadtom.me"},
 ]

setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='ownchatbot',
-    version='1.1.1',
+    version='1.1.2',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[