Merge pull request #47 from WaterWolfDev/dev.waterwolf.club

Moist Dog TV
WaterWolfDev · Jun 2, 2024 · 0a98994 · 0a98994
2 parents 27cff91 + 7226099
commit 0a98994
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 8 deletions.
diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
@@ -46,18 +46,20 @@ jobs:
             - name: Login to GitHub Container Registry
               uses: docker/login-action@v3
               with:
-                  registry: ghcr.io
-                  username: ${{ github.repository_owner }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
+                registry: ghcr.io
+                username: ${{ github.repository_owner }}
+                password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Build Docker Metadata
               id: meta
               uses: docker/metadata-action@v5
               with:
-                  images: |
-                      ghcr.io/waterwolfdev/waterwolf-site
-                  tags: |
-                      type=ref,event=branch
+                images: |
+                  ghcr.io/waterwolfdev/waterwolf-site
+                flavor: |
+                  latest=false
+                tags: |
+                  type=ref,event=branch
 
             - name: Debug Docker Metadata
               run: |

diff --git a/backend/templates/live.twig b/backend/templates/live.twig
@@ -16,10 +16,18 @@
                     if (twitchEmbed) {
                         twitchEmbed.pause();
                     }
+                    if (moistEmbed) {
+                        moistEmbed.pause();
+                    }
+
                     
                     $('#html5video')[0].play();
                 } else if (currentTab === '#twitch') {
                     $('#html5video')[0].pause();
+                    if (moistEmbed) {
+                        moistEmbed.pause();
+                    }
+
 
                     if (twitchEmbed) {
                         twitchEmbed.play();
@@ -31,6 +39,23 @@
                             autoplay: true
                         });
                     }
+                } else if (currentTab === '#moist-dog') {
+                    $('#html5video')[0].pause();
+
+                    if (twitchEmbed) {
+                        twitchEmbed.pause();
+                    }
+
+                    if (moistEmbed) {
+                        moistEmbed.play();
+                    } else {
+                        moistEmbed = new Twitch.Embed("moist-dog-embed", {
+                            width: "100%",
+                            height: 480,
+                            channel: "moistdogtv",
+                            autoplay: true
+                        });
+                    }
                 }
             });
         });
@@ -53,7 +78,13 @@
                 <li class="nav-item">
                     <button class="nav-link" data-bs-toggle="tab"
                             data-bs-target="#twitch" type="button"
-                            role="tab" aria-controls="twitch">Twitch Stream
+                            role="tab" aria-controls="twitch">WaterWolf Live
+                    </button>
+                </li>
+                <li class="nav-item">
+                    <button class="nav-link" data-bs-toggle="tab"
+                            data-bs-target="#moist-dog" type="button"
+                            role="tab" aria-controls="moist-dog">MoistDogTV
                     </button>
                 </li>
             </ul>
@@ -70,6 +101,9 @@
             <div id="twitch" class="container tab-pane fade">
                 <div id="twitch-embed"></div>
             </div>
+            <div id="moist-dog" class="container tab-pane fade">
+                <div id="moist-dog-embed"></div>
+            </div>
         </div>
     </div>
 </div>